diff options
Diffstat (limited to 'pkgs')
585 files changed, 13580 insertions, 3488 deletions
diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 8064c7607466..804aaf75febe 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "19zbz4v2n5ph4af721xls7ignmis2q2yqyd0m97g9b3njrgnfy3n"; + sha256 = "14svwrxqw15j6wjy3x8s28yyrafa31bm7d1ns5h6gvpndccwc1kw"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix new file mode 100644 index 000000000000..5c8c5e7c7bff --- /dev/null +++ b/pkgs/applications/audio/mympd/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, mpd_clientlib +, openssl +, lua5_3 +, libid3tag +, flac +, mongoose +}: + +stdenv.mkDerivation rec { + pname = "mympd"; + version = "6.8.1"; + + src = fetchFromGitHub { + owner = "jcorporation"; + repo = "myMPD"; + rev = "v${version}"; + sha256 = "dIGg2mLxN6XBDH3GFXtF7nB9a/zf/qMlPCvIulFRXn8="; + }; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + buildInputs = [ + mpd_clientlib + openssl + lua5_3 + libid3tag + flac + ]; + + cmakeFlags = [ + "-DENABLE_LUA=ON" + # Otherwise, it tries to parse $out/etc/mympd.conf on startup. + "-DCMAKE_INSTALL_SYSCONFDIR=/etc" + # similarly here + "-DCMAKE_INSTALL_LOCALSTATEDIR=/var/lib/mympd" + ]; + # See https://github.com/jcorporation/myMPD/issues/315 + hardeningDisable = [ "strictoverflow" ]; + + meta = { + homepage = "https://jcorporation.github.io/mympd"; + description = "A standalone and mobile friendly web mpd client with a tiny footprint and advanced features"; + maintainers = [ stdenv.lib.maintainers.doronbehar ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 4b931813bea5..bc89505a1fe2 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.25_fix"; + version = "1.26_fix"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "1slv8qjxsj67z6984nl67g53mq0sdls2cbikvfjmgmad1wkh98ma"; + sha256 = "1ikhgagniiq4irsy8i3g64m6cl61lnfvs163n8gs4hm426yckyb8"; }; nativeBuildInputs = [ cmake ]; 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/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 2e6419fd13d8..3992c7824851 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core }: stdenv.mkDerivation rec { pname = "exodus"; - version = "20.11.23"; + version = "20.12.4"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "0hcvgph2m4nbrarhw2cggc8q5jxwnibiz2mbkypgizphk5svdj9l"; + sha256 = "1j1iqmcbwfj72l7g83ah701bipas9cqwazyhh0af5hp2ckj9nmmf"; }; sourceRoot = "."; 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/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index 3ca62722f9ba..b8aa3de44dad 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2020.11.04"; + version = "2020.12.01"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "1iidj7cvpazk2v419l6k7h67rkx0mni3fcxfjpwrp0815fy1c2ri"; + sha256 = "0l1qj10vhfkrk66zihz8m24pnyj8jbb65a7amvphp07r199swy2a"; }; vendorSha256 = "16vawkky612zf45d8dhipjmhrprmi28z9wdcnjy07x3bxdyfbhfr"; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 51c7ebcc907f..d94ad070536a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,14 +14,14 @@ let sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os="; }; betaVersion = { - version = "4.1.0.18"; # "Android Studio 4.1 RC 3" - build = "201.6823847"; - sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88="; + version = "4.2.0.17"; # "Android Studio 4.2 Beta 1" + build = "202.6987402"; + sha256Hash = "07qr0b1zdzpc1nsi6593518dxp89dcjfp4lznb1d3id8vbqla4i7"; }; latestVersion = { # canary & dev - version = "4.2.0.16"; # "Android Studio 4.2 Canary 16" - build = "202.6939830"; - sha256Hash = "sha256-2Xh0GR4BHZI6ofdyMI2icrztI2BmiHWT+1bEZIZ58IE="; + version = "2020.3.1.2"; # "Android Studio Arctic Fox Canary 2" + build = "202.7006259"; + sha256Hash = "1d4brfx1fh1vlcjkb0x8hjj2qgz2dl5wbaiy8dj8w03vcf493nc5"; }; in { # Attributes are named by their corresponding release channels 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/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index fc87e98488b2..18437f5ff49e 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "1vn444ax5af1gbhkm9lz46jc7zi4grf16cb4wqyb6hvgj2gbl0iw"; + sha256 = "1hk8kmhvkwfimbxzhwbnb8qdpf4n36cdzl9wfvi574i9pps36hnz"; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index 911a30ccf611..dc46edc070fd 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.20.2"; + version = "1.22.0"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "1vibk3wmn54qr2mwz537hrr959y0r1zabp0gsijhzj2mk68g9pnb"; + sha256 = "00isb8xcbm419nvxx2ri0n8x5d403733h2whjqjcd3hmpx3x4q1h"; }; nativeBuildInputs = [ cmake pkgconfig ]; 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/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index ca1a87dd2dd9..d76cf9b106e7 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -16,6 +16,10 @@ buildGoModule rec { vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; + buildFlagsArray = '' + -ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version} + ''; + meta = with stdenv.lib; { description = "Query and update data structures from the command line"; longDescription = '' diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 40ecd61304f1..df6c99768e84 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -19,7 +19,7 @@ }: let - version = "4.0.5"; + version = "4.0.6"; # electrum is not compatible with dnspython 2.0.0 yet # use the latest 1.x release instead @@ -43,7 +43,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "0fdsgxzgsxvx6hhjag894nzzdfq989bx1d4anljzcz2ppy4ivpxg"; + sha256 = "0mdbg2sq56nv0hx0rrcbgrv1lv89nqc6cqigivgk665hhjm4v5kq"; extraPostFetch = '' mv $out ./all @@ -58,7 +58,7 @@ py.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "06ml9lwa5k2dp56sm5s7dsl6qirqmgim7rn853cqcq9n45z41437"; + sha256 = "0sp8p720g3rqnh52ddhaw2v4hjgpxcwbackw9qc1g9xac1q0942d"; }; postUnpack = '' 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/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 9aaeca14a209..fa0a47fdcb5e 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -17,10 +17,10 @@ let pname = "simplenote"; - version = "2.1.0"; + version = "2.2.0"; sha256 = { - x86_64-linux = "0lg48nq493anpnm20vw72y242nxa1g903bxzp4pngzxyi986jddz"; + x86_64-linux = "123b0fh14068s2z3k6s5mmh46xwlz02qfnpmj838zlm5hckjmifv"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index beccfe5477bb..bbe629ecb14f 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "1.0.1"; + version = "1.1.0"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "1dln5gh3p8nz9qmg07cw2s0lpzp3rfhyrwdhczj89g27bwk0lr4k"; + sha256 = "0nzkzx870hzil2kny1irp4w2kxz5gmpchr2qxb7q4f9cnih92n0j"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] 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/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 3832f8c032b3..6343dd4b2468 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,22 +18,22 @@ } }, "beta": { - "version": "87.0.4280.66", - "sha256": "0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19", - "sha256bin64": "15n01jia8sxv3a7vfbla40rq45x54pyksg0kg14bm0br6m3n65pz", + "version": "88.0.4324.27", + "sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc", + "sha256bin64": "0qf2j1j3p94s724rwh8fydpjn88cs9yxxhjf5axvqwi7q3h35cfx", "deps": { "gn": { - "version": "2020-09-09", + "version": "2020-11-05", "url": "https://gn.googlesource.com/gn", - "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", - "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", + "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" } } }, "dev": { - "version": "88.0.4324.27", - "sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc", - "sha256bin64": "0ax27j42167yyx90h5k6ra898kn626w5cvgmafm3al9kyfsx36m4", + "version": "89.0.4343.0", + "sha256": "0jmc1l0lysl5zax98fjhzsfq3c1sqh3n3xscidafflx362wcfpwa", + "sha256bin64": "1v6xik8kf531y0g5xj0c8szjmak0qvh77kwkw7p7hqxqmnwwp06d", "deps": { "gn": { "version": "2020-11-05", diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index f9b7f2bb8a2e..7f0b826f905e 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -41,7 +41,7 @@ let # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled , extraPolicies ? {} , firefoxLibName ? "firefox" # Important for tor package or the like - , extraExtensions ? [ ] + , nixExtensions ? null }: assert forceWayland -> (browser ? gtk3); # Can only use the wayland backend if gtk3 is being used @@ -100,19 +100,21 @@ let policiesJson = builtins.toFile "policies.json" (builtins.toJSON enterprisePolicies); + usesNixExtensions = nixExtensions != null; + extensions = builtins.map (a: if ! (builtins.hasAttr "extid" a) then - throw "extraExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" + throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" else a - ) extraExtensions; + ) (if usesNixExtensions then nixExtensions else []); enterprisePolicies = { - policies = { + policies = lib.optionalAttrs usesNixExtensions { DisableAppUpdate = true; } // - { + lib.optionalAttrs usesNixExtensions { ExtensionSettings = { "*" = { blocked_install_message = "You can't have manual extension mixed with nix extensions"; @@ -137,7 +139,7 @@ let // to be able to install addons that do not have an extid // Security is maintained because only user whitelisted addons // with a checksum can be installed - lockPref("xpinstall.signatures.required", false); + ${ lib.optionalString usesNixExtensions ''lockPref("xpinstall.signatures.required", false)'' }; ${extraPrefs} ''; 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/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 9b89634f0b3a..570fe463c5ae 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,10 +7,10 @@ in { pname = "discord"; binaryName = "Discord"; desktopName = "Discord"; - version = "0.0.12"; + version = "0.0.13"; src = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "0qrzvc8cp8azb1b2wb5i4jh9smjfw5rxiw08bfqm8p3v74ycvwk8"; + sha256 = "0d5z6cbj9dg3hjw84pyg75f8dwdvi2mqxb9ic8dfqzk064ssiv7y"; }; }; ptb = callPackage ./base.nix rec { diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 6b511d1a1a9c..a2489427b946 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "1j0yd33sm824dy4mhwfxqkywa46yhqy5hd5wq4lp7lgl6m6mypar"; + sha256 = "1v9cdpy6i3xl70g75zg33sqi4aqp20by0pyjhjg5iz24fxvfaw6c"; }; makeFlags = [ "PREFIX=$(out)"]; 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/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix new file mode 100644 index 000000000000..94305a8cfeea --- /dev/null +++ b/pkgs/applications/networking/n8n/default.nix @@ -0,0 +1,18 @@ +{ pkgs, nodejs, stdenv, lib, ... }: + +let + nodePackages = import ./node-composition.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; +in +nodePackages.n8n.override { + nativeBuildInputs = with pkgs.nodePackages; [ + node-pre-gyp + ]; + meta = with lib; { + description = "Free and open fair-code licensed node based Workflow Automation Tool"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/applications/networking/n8n/generate-dependencies.sh b/pkgs/applications/networking/n8n/generate-dependencies.sh new file mode 100755 index 000000000000..292811669184 --- /dev/null +++ b/pkgs/applications/networking/n8n/generate-dependencies.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix + +node2nix \ + --node-env node-env.nix \ + --input package.json \ + --output node-packages.nix \ + --composition node-composition.nix diff --git a/pkgs/applications/networking/n8n/node-composition.nix b/pkgs/applications/networking/n8n/node-composition.nix new file mode 100644 index 000000000000..c970861a86f0 --- /dev/null +++ b/pkgs/applications/networking/n8n/node-composition.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.8.0. Do not edit! + +{pkgs ? import <nixpkgs> { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +}
\ No newline at end of file diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix new file mode 100644 index 000000000000..e1abf5304935 --- /dev/null +++ b/pkgs/applications/networking/n8n/node-env.nix @@ -0,0 +1,542 @@ +# This file originates from node2nix + +{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: + +let + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <<EOF + #! ${stdenv.shell} -e + $(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore + EOF + + chmod +x $out/bin/tar + ''; + + # Function that generates a TGZ file from a NPM project + buildNodeSourceDist = + { name, version, src, ... }: + + stdenv.mkDerivation { + name = "node-tarball-${name}-${version}"; + inherit src; + buildInputs = [ nodejs ]; + buildPhase = '' + export HOME=$TMPDIR + tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) + ''; + installPhase = '' + mkdir -p $out/tarballs + mv $tgzFile $out/tarballs + mkdir -p $out/nix-support + echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + stdenv.lib.optionalString (dependencies != []) + (stdenv.lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${stdenv.lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(packageLock.lockfileVersion !== 1) { + process.stderr.write("Sorry, I only understand lock file version 1!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${stdenv.lib.optionalString bypassCache '' + ${stdenv.lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node_${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + + nodeDependencies = stdenv.mkDerivation ({ + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${stdenv.lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + in + stdenv.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell <<EOF + #! ${stdenv.shell} -e + $shellHook + exec ${stdenv.shell} + EOF + chmod +x $out/bin/shell + ''; + + # Provide the dependencies in a development shell through the NODE_PATH environment variable + inherit nodeDependencies; + shellHook = stdenv.lib.optionalString (dependencies != []) '' + export NODE_PATH=${nodeDependencies}/lib/node_modules + export PATH="${nodeDependencies}/bin:$PATH" + ''; + }; +in +{ + buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; + buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; + buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; +} diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix new file mode 100644 index 000000000000..7a77dcff11bb --- /dev/null +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -0,0 +1,6929 @@ +# This file has been generated by node2nix 1.8.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "@azure/ms-rest-azure-env-1.1.2" = { + name = "_at_azure_slash_ms-rest-azure-env"; + packageName = "@azure/ms-rest-azure-env"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/ms-rest-azure-env/-/ms-rest-azure-env-1.1.2.tgz"; + sha512 = "l7z0DPCi2Hp88w12JhDTtx5d0Y3+vhfE7JKJb9O7sEz71Cwp053N8piTtTnnk/tUor9oZHgEKi/p3tQQmLPjvA=="; + }; + }; + "@azure/ms-rest-js-1.9.0" = { + name = "_at_azure_slash_ms-rest-js"; + packageName = "@azure/ms-rest-js"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz"; + sha512 = "cB4Z2Mg7eBmet1rfbf0QSO1XbhfknRW7B+mX3IHJq0KGHaGJvCPoVTgdsJdCkazEMK1jtANFNEDDzSQacxyzbA=="; + }; + }; + "@azure/ms-rest-nodeauth-2.0.2" = { + name = "_at_azure_slash_ms-rest-nodeauth"; + packageName = "@azure/ms-rest-nodeauth"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-2.0.2.tgz"; + sha512 = "KmNNICOxt3EwViAJI3iu2VH8t8BQg5J2rSAyO4IUYLF9ZwlyYsP419pdvl4NBUhluAP2cgN7dfD2V6E6NOMZlQ=="; + }; + }; + "@icetee/ftp-0.3.15" = { + name = "_at_icetee_slash_ftp"; + packageName = "@icetee/ftp"; + version = "0.3.15"; + src = fetchurl { + url = "https://registry.npmjs.org/@icetee/ftp/-/ftp-0.3.15.tgz"; + sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; + }; + }; + "@nodelib/fs.scandir-2.1.3" = { + name = "_at_nodelib_slash_fs.scandir"; + packageName = "@nodelib/fs.scandir"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; + sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; + }; + }; + "@nodelib/fs.stat-2.0.3" = { + name = "_at_nodelib_slash_fs.stat"; + packageName = "@nodelib/fs.stat"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; + sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="; + }; + }; + "@nodelib/fs.walk-1.2.4" = { + name = "_at_nodelib_slash_fs.walk"; + packageName = "@nodelib/fs.walk"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; + sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; + }; + }; + "@oclif/command-1.8.0" = { + name = "_at_oclif_slash_command"; + packageName = "@oclif/command"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.0.tgz"; + sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; + }; + }; + "@oclif/config-1.17.0" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.17.0.tgz"; + sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; + }; + }; + "@oclif/errors-1.3.4" = { + name = "_at_oclif_slash_errors"; + packageName = "@oclif/errors"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.4.tgz"; + sha512 = "pJKXyEqwdfRTUdM8n5FIHiQQHg5ETM0Wlso8bF9GodczO40mF5Z3HufnYWJE7z8sGKxOeJCdbAVZbS8Y+d5GCw=="; + }; + }; + "@oclif/linewrap-1.0.0" = { + name = "_at_oclif_slash_linewrap"; + packageName = "@oclif/linewrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/linewrap/-/linewrap-1.0.0.tgz"; + sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; + }; + }; + "@oclif/parser-3.8.5" = { + name = "_at_oclif_slash_parser"; + packageName = "@oclif/parser"; + version = "3.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.5.tgz"; + sha512 = "yojzeEfmSxjjkAvMRj0KzspXlMjCfBzNRPkWw8ZwOSoNWoJn+OCS/m/S+yfV6BvAM4u2lTzX9Y5rCbrFIgkJLg=="; + }; + }; + "@oclif/plugin-help-3.2.0" = { + name = "_at_oclif_slash_plugin-help"; + packageName = "@oclif/plugin-help"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.0.tgz"; + sha512 = "7jxtpwVWAVbp1r46ZnTK/uF+FeZc6y4p1XcGaIUuPAp7wx6NJhIRN/iMT9UfNFX/Cz7mq+OyJz+E+i0zrik86g=="; + }; + }; + "@servie/events-1.0.0" = { + name = "_at_servie_slash_events"; + packageName = "@servie/events"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@servie/events/-/events-1.0.0.tgz"; + sha512 = "sBSO19KzdrJCM3gdx6eIxV8M9Gxfgg6iDQmH5TIAGaUu+X9VDdsINXJOnoiZ1Kx3TrHdH4bt5UVglkjsEGBcvw=="; + }; + }; + "@sqltools/formatter-1.2.2" = { + name = "_at_sqltools_slash_formatter"; + packageName = "@sqltools/formatter"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.2.tgz"; + sha512 = "/5O7Fq6Vnv8L6ucmPjaWbVG1XkP4FO+w5glqfkIsq3Xw4oyNAdJddbnYodNDAfjVUvo/rrSCTom4kAND7T1o5Q=="; + }; + }; + "@tokenizer/token-0.1.1" = { + name = "_at_tokenizer_slash_token"; + packageName = "@tokenizer/token"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@tokenizer/token/-/token-0.1.1.tgz"; + sha512 = "XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w=="; + }; + }; + "@types/bluebird-3.5.33" = { + name = "_at_types_slash_bluebird"; + packageName = "@types/bluebird"; + version = "3.5.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.33.tgz"; + sha512 = "ndEo1xvnYeHxm7I/5sF6tBvnsA4Tdi3zj1keRKRs12SP+2ye2A27NDJ1B6PqkfMbGAcT+mqQVqbZRIrhfOp5PQ=="; + }; + }; + "@types/body-parser-1.19.0" = { + name = "_at_types_slash_body-parser"; + packageName = "@types/body-parser"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; + }; + }; + "@types/connect-3.4.33" = { + name = "_at_types_slash_connect"; + packageName = "@types/connect"; + version = "3.4.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz"; + sha512 = "2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A=="; + }; + }; + "@types/debug-4.1.5" = { + name = "_at_types_slash_debug"; + packageName = "@types/debug"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz"; + sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="; + }; + }; + "@types/express-4.17.9" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.9.tgz"; + sha512 = "SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw=="; + }; + }; + "@types/express-jwt-0.0.42" = { + name = "_at_types_slash_express-jwt"; + packageName = "@types/express-jwt"; + version = "0.0.42"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-jwt/-/express-jwt-0.0.42.tgz"; + sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="; + }; + }; + "@types/express-serve-static-core-4.17.14" = { + name = "_at_types_slash_express-serve-static-core"; + packageName = "@types/express-serve-static-core"; + version = "4.17.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.14.tgz"; + sha512 = "uFTLwu94TfUFMToXNgRZikwPuZdOtDgs3syBtAIr/OXorL1kJqUJT9qCLnRZ5KBOWfZQikQ2xKgR2tnDj1OgDA=="; + }; + }; + "@types/express-unless-0.5.1" = { + name = "_at_types_slash_express-unless"; + packageName = "@types/express-unless"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.1.tgz"; + sha512 = "5fuvg7C69lemNgl0+v+CUxDYWVPSfXHhJPst4yTLcqi4zKJpORCxnDrnnilk3k0DTq/WrAUdvXFs01+vUqUZHw=="; + }; + }; + "@types/ftp-0.3.31" = { + name = "_at_types_slash_ftp"; + packageName = "@types/ftp"; + version = "0.3.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ftp/-/ftp-0.3.31.tgz"; + sha512 = "J30a1yD9avBsFahvmGoeumWUZ5YnGRj/7u0aKSa3dGxyaguU+14WkHmVzZYToK7vX0ADfyAXBUQlaQ20PTHhAA=="; + }; + }; + "@types/glob-7.1.3" = { + name = "_at_types_slash_glob"; + packageName = "@types/glob"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz"; + sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; + }; + }; + "@types/jsonwebtoken-8.5.0" = { + name = "_at_types_slash_jsonwebtoken"; + packageName = "@types/jsonwebtoken"; + version = "8.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz"; + sha512 = "9bVao7LvyorRGZCw0VmH/dr7Og+NdjYSsKAxB43OQoComFbBgsEpoR9JW6+qSq/ogwVBg8GI2MfAlk4SYI4OLg=="; + }; + }; + "@types/mime-2.0.3" = { + name = "_at_types_slash_mime"; + packageName = "@types/mime"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz"; + sha512 = "Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q=="; + }; + }; + "@types/minimatch-3.0.3" = { + name = "_at_types_slash_minimatch"; + packageName = "@types/minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + }; + }; + "@types/node-12.19.8" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "12.19.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-12.19.8.tgz"; + sha512 = "D4k2kNi0URNBxIRCb1khTnkWNHv8KSL1owPmS/K5e5t8B2GzMReY7AsJIY1BnP5KdlgC4rj9jk2IkDMasIE7xg=="; + }; + }; + "@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-8.10.66" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.66"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz"; + sha512 = "tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw=="; + }; + }; + "@types/promise-ftp-1.3.4" = { + name = "_at_types_slash_promise-ftp"; + packageName = "@types/promise-ftp"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/promise-ftp/-/promise-ftp-1.3.4.tgz"; + sha512 = "fCIX7I84e25RX6bZ+qiIv0Puu5axWhCj9+El+4Kz1gZZyO/NvwdGTNQ33y6jdrPuTn3Df3kg7nMi1HohjNQLog=="; + }; + }; + "@types/promise-ftp-common-1.1.0" = { + name = "_at_types_slash_promise-ftp-common"; + packageName = "@types/promise-ftp-common"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/promise-ftp-common/-/promise-ftp-common-1.1.0.tgz"; + sha512 = "mqo6D4qdiJdzeqlzFwEIchQQZk2hZacjssmjoAX7nClcREmRUUsnmgbWXEfA2qK986rwOPqepfRoSu7rsjAKag=="; + }; + }; + "@types/qs-6.9.5" = { + name = "_at_types_slash_qs"; + packageName = "@types/qs"; + version = "6.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz"; + sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="; + }; + }; + "@types/range-parser-1.2.3" = { + name = "_at_types_slash_range-parser"; + packageName = "@types/range-parser"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz"; + sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; + }; + }; + "@types/readable-stream-2.3.9" = { + name = "_at_types_slash_readable-stream"; + packageName = "@types/readable-stream"; + version = "2.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.9.tgz"; + sha512 = "sqsgQqFT7HmQz/V5jH1O0fvQQnXAJO46Gg9LRO/JPfjmVmGUlcx831TZZO3Y3HtWhIkzf3kTsNT0Z0kzIhIvZw=="; + }; + }; + "@types/serve-static-1.13.8" = { + name = "_at_types_slash_serve-static"; + packageName = "@types/serve-static"; + version = "1.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz"; + sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA=="; + }; + }; + "@types/tough-cookie-2.3.7" = { + name = "_at_types_slash_tough-cookie"; + packageName = "@types/tough-cookie"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.7.tgz"; + sha512 = "rMQbgMGxnLsdn8e9aPVyuN+zMQLrZ2QW8xlv7eWS1mydfGXN+tsTKffcIzd8rGCcLdmi3xvQw2MDaZI1bBNTaw=="; + }; + }; + "@types/tunnel-0.0.0" = { + name = "_at_types_slash_tunnel"; + packageName = "@types/tunnel"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.0.tgz"; + sha512 = "FGDp0iBRiBdPjOgjJmn1NH0KDLN+Z8fRmo+9J7XGBhubq1DPrGrbmG4UTlGzrpbCpesMqD0sWkzi27EYkOMHyg=="; + }; + }; + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; + "accepts-1.3.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + }; + "access-control-1.0.1" = { + name = "access-control"; + packageName = "access-control"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/access-control/-/access-control-1.0.1.tgz"; + sha512 = "H5aqjkogmFxfaOrfn/e42vyspHVXuJ8er63KuljJXpOyJ1ZO/U5CrHfO8BLKIy2w7mBM02L5quL0vbfQqrGQbA=="; + }; + }; + "adal-node-0.1.28" = { + name = "adal-node"; + packageName = "adal-node"; + version = "0.1.28"; + src = fetchurl { + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.28.tgz"; + sha1 = "468c4bb3ebbd96b1270669f4b9cba4e0065ea485"; + }; + }; + "adler-32-1.2.0" = { + name = "adler-32"; + packageName = "adler-32"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/adler-32/-/adler-32-1.2.0.tgz"; + sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25"; + }; + }; + "ajv-6.12.6" = { + name = "ajv"; + packageName = "ajv"; + version = "6.12.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; + }; + }; + "ansi-escapes-4.3.1" = { + name = "ansi-escapes"; + packageName = "ansi-escapes"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; + sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA=="; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "ansi-regex-3.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + }; + "ansi-regex-4.1.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + }; + }; + "ansi-regex-5.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "ansi-styles-3.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; + }; + }; + "ansi-styles-4.3.0" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; + }; + }; + "ansicolors-0.3.2" = { + name = "ansicolors"; + packageName = "ansicolors"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; + sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + }; + }; + "any-promise-1.3.0" = { + name = "any-promise"; + packageName = "any-promise"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + }; + }; + "app-root-path-3.0.0" = { + name = "app-root-path"; + packageName = "app-root-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz"; + sha512 = "qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw=="; + }; + }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "are-we-there-yet-1.1.5" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + }; + }; + "argparse-1.0.10" = { + name = "argparse"; + packageName = "argparse"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; + sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; + }; + }; + "array-flatten-1.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + }; + "array-parallel-0.1.3" = { + name = "array-parallel"; + packageName = "array-parallel"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz"; + sha1 = "8f785308926ed5aa478c47e64d1b334b6c0c947d"; + }; + }; + "array-series-0.1.5" = { + name = "array-series"; + packageName = "array-series"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz"; + sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; + }; + }; + "array-union-2.1.0" = { + name = "array-union"; + packageName = "array-union"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; + }; + }; + "asn1-0.2.4" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; + sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + }; + }; + "assert-options-0.6.2" = { + name = "assert-options"; + packageName = "assert-options"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz"; + sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw=="; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "async-3.2.0" = { + name = "async"; + packageName = "async"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; + sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "aws-sign2-0.7.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + }; + "aws4-1.11.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; + }; + }; + "axios-0.19.0" = { + name = "axios"; + packageName = "axios"; + version = "0.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz"; + sha512 = "1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ=="; + }; + }; + "axios-0.19.2" = { + name = "axios"; + packageName = "axios"; + version = "0.19.2"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz"; + sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "base64-js-1.5.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + }; + "basic-auth-2.0.1" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"; + sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; + }; + }; + "bcrypt-pbkdf-1.0.2" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + }; + "bcryptjs-2.4.3" = { + name = "bcryptjs"; + packageName = "bcryptjs"; + version = "2.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz"; + sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb"; + }; + }; + "bl-2.2.1" = { + name = "bl"; + packageName = "bl"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz"; + sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; + }; + }; + "bl-3.0.1" = { + name = "bl"; + packageName = "bl"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-3.0.1.tgz"; + sha512 = "jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ=="; + }; + }; + "bl-4.0.3" = { + name = "bl"; + packageName = "bl"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz"; + sha512 = "fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg=="; + }; + }; + "bluebird-2.11.0" = { + name = "bluebird"; + packageName = "bluebird"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz"; + sha1 = "534b9033c022c9579c56ba3b3e5a5caafbb650e1"; + }; + }; + "body-parser-1.19.0" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + }; + }; + "body-parser-xml-1.1.0" = { + name = "body-parser-xml"; + packageName = "body-parser-xml"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser-xml/-/body-parser-xml-1.1.0.tgz"; + sha1 = "7b56bef1cd7d266c13602b4c1daf4f511d26447c"; + }; + }; + "boolbase-1.0.0" = { + name = "boolbase"; + packageName = "boolbase"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"; + sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; + "bson-1.1.5" = { + name = "bson"; + packageName = "bson"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bson/-/bson-1.1.5.tgz"; + sha512 = "kDuEzldR21lHciPQAIulLs1LZlCXdLziXI6Mb/TDkwXhb//UORJNPXgcRs2CuO4H0DcMkpfT3/ySsP3unoZjBg=="; + }; + }; + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; + "buffer-equal-constant-time-1.0.1" = { + name = "buffer-equal-constant-time"; + packageName = "buffer-equal-constant-time"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; + sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; + }; + }; + "buffer-from-1.1.1" = { + name = "buffer-from"; + packageName = "buffer-from"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; + sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + }; + }; + "buffer-writer-2.0.0" = { + name = "buffer-writer"; + packageName = "buffer-writer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz"; + sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; + }; + }; + "byte-length-1.0.2" = { + name = "byte-length"; + packageName = "byte-length"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/byte-length/-/byte-length-1.0.2.tgz"; + sha512 = "ovBpjmsgd/teRmgcPh23d4gJvxDoXtAzEL9xTfMU8Yc2kqCDb7L9jAG0XHl1nzuGl+h3ebCIF1i62UFyA9V/2Q=="; + }; + }; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "bytes-3.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + }; + }; + "callback-stream-1.1.0" = { + name = "callback-stream"; + packageName = "callback-stream"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz"; + sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; + }; + }; + "camel-case-4.1.2" = { + name = "camel-case"; + packageName = "camel-case"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz"; + sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; + }; + }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + }; + "capital-case-1.0.4" = { + name = "capital-case"; + packageName = "capital-case"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz"; + sha512 = "ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A=="; + }; + }; + "cardinal-2.1.1" = { + name = "cardinal"; + packageName = "cardinal"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz"; + sha1 = "7cc1055d822d212954d07b085dea251cc7bc5505"; + }; + }; + "caseless-0.12.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + }; + "cfb-1.2.0" = { + name = "cfb"; + packageName = "cfb"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cfb/-/cfb-1.2.0.tgz"; + sha512 = "sXMvHsKCICVR3Naq+J556K+ExBo9n50iKl6LGarlnvuA2035uMlGA/qVrc0wQtow5P1vJEw9UyrKLCbtIKz+TQ=="; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "chalk-2.4.2" = { + name = "chalk"; + packageName = "chalk"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; + sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; + }; + }; + "chalk-4.1.0" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; + sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + }; + }; + "change-case-4.1.2" = { + name = "change-case"; + packageName = "change-case"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz"; + sha512 = "bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A=="; + }; + }; + "chardet-0.7.0" = { + name = "chardet"; + packageName = "chardet"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"; + sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; + }; + }; + "cheerio-1.0.0-rc.3" = { + name = "cheerio"; + packageName = "cheerio"; + version = "1.0.0-rc.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz"; + sha512 = "0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA=="; + }; + }; + "chownr-1.1.4" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"; + sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; + }; + }; + "clean-stack-3.0.1" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-3.0.1.tgz"; + sha512 = "lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg=="; + }; + }; + "cli-cursor-3.1.0" = { + name = "cli-cursor"; + packageName = "cli-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; + }; + }; + "cli-highlight-2.1.9" = { + name = "cli-highlight"; + packageName = "cli-highlight"; + version = "2.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.9.tgz"; + sha512 = "t8RNIZgiI24i/mslZ8XT8o660RUj5ZbUJpEZrZa/BNekTzdC2LfMRAnt0Y7sgzNM4FGW5tmWg/YnbTH8o1eIOQ=="; + }; + }; + "cli-width-3.0.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"; + sha512 = "FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="; + }; + }; + "client-oauth2-4.3.3" = { + name = "client-oauth2"; + packageName = "client-oauth2"; + version = "4.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/client-oauth2/-/client-oauth2-4.3.3.tgz"; + sha512 = "k8AvUYJon0vv75ufoVo4nALYb/qwFFicO3I0+39C6xEdflqVtr+f9cy+0ZxAduoVSTfhP5DX2tY2XICAd5hy6Q=="; + }; + }; + "cliui-5.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; + sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; + }; + }; + "cliui-6.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"; + sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; + }; + }; + "cliui-7.0.4" = { + name = "cliui"; + packageName = "cliui"; + version = "7.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"; + sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "codepage-1.14.0" = { + name = "codepage"; + packageName = "codepage"; + version = "1.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz"; + sha1 = "8cbe25481323559d7d307571b0fff91e7a1d2f99"; + }; + }; + "color-3.0.0" = { + name = "color"; + packageName = "color"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/color/-/color-3.0.0.tgz"; + sha512 = "jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w=="; + }; + }; + "color-convert-1.9.3" = { + name = "color-convert"; + packageName = "color-convert"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"; + sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; + }; + }; + "color-convert-2.0.1" = { + name = "color-convert"; + packageName = "color-convert"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"; + sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; + }; + }; + "color-name-1.1.3" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + }; + "color-name-1.1.4" = { + name = "color-name"; + packageName = "color-name"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"; + sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; + }; + }; + "color-string-1.5.4" = { + name = "color-string"; + packageName = "color-string"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz"; + sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw=="; + }; + }; + "colornames-1.1.1" = { + name = "colornames"; + packageName = "colornames"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz"; + sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; + }; + }; + "colorspace-1.1.2" = { + name = "colorspace"; + packageName = "colorspace"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz"; + sha512 = "vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ=="; + }; + }; + "combined-stream-1.0.8" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; + }; + }; + "commander-2.14.1" = { + name = "commander"; + packageName = "commander"; + version = "2.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; + sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="; + }; + }; + "commander-2.17.1" = { + name = "commander"; + packageName = "commander"; + version = "2.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"; + sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; + }; + }; + "commist-1.1.0" = { + name = "commist"; + packageName = "commist"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commist/-/commist-1.1.0.tgz"; + sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; + }; + }; + "compressible-2.0.18" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; + sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; + }; + }; + "compression-1.7.4" = { + name = "compression"; + packageName = "compression"; + version = "1.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; + sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + }; + }; + "concat-stream-2.0.0" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz"; + sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; + }; + }; + "connect-history-api-fallback-1.6.0" = { + name = "connect-history-api-fallback"; + packageName = "connect-history-api-fallback"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; + sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; + }; + }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; + "constant-case-3.0.4" = { + name = "constant-case"; + packageName = "constant-case"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz"; + sha512 = "I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ=="; + }; + }; + "content-disposition-0.5.3" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + }; + }; + "convict-5.2.0" = { + name = "convict"; + packageName = "convict"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/convict/-/convict-5.2.0.tgz"; + sha512 = "C3cdUwo47cCikZNzu5Vv8AL0MuXVVeg9t/Gyr9qyK5ZpCjOkMPmJ85KUF3CowNeSfj4UtztHxS+hoO9wGRh6kg=="; + }; + }; + "cookie-0.4.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + }; + }; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "crc-32-1.2.0" = { + name = "crc-32"; + packageName = "crc-32"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz"; + sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="; + }; + }; + "cron-1.8.2" = { + name = "cron"; + packageName = "cron"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz"; + sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="; + }; + }; + "cross-spawn-4.0.2" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; + sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; + }; + }; + "crypto-js-4.0.0" = { + name = "crypto-js"; + packageName = "crypto-js"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz"; + sha512 = "bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg=="; + }; + }; + "csrf-3.1.0" = { + name = "csrf"; + packageName = "csrf"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csrf/-/csrf-3.1.0.tgz"; + sha512 = "uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w=="; + }; + }; + "css-select-1.2.0" = { + name = "css-select"; + packageName = "css-select"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz"; + sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; + }; + }; + "css-what-2.1.3" = { + name = "css-what"; + packageName = "css-what"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz"; + sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; + }; + }; + "d-1.0.1" = { + name = "d"; + packageName = "d"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; + sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; + }; + }; + "dashdash-1.14.1" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + }; + "date-utils-1.2.21" = { + name = "date-utils"; + packageName = "date-utils"; + version = "1.2.21"; + src = fetchurl { + url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; + sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + }; + }; + "debug-3.2.7" = { + name = "debug"; + packageName = "debug"; + version = "3.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; + }; + }; + "debug-4.1.1" = { + name = "debug"; + packageName = "debug"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; + sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; + }; + }; + "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"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "denque-1.4.1" = { + name = "denque"; + packageName = "denque"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/denque/-/denque-1.4.1.tgz"; + sha512 = "OfzPuSZKGcgr96rf1oODnfjqBFmr1DVoc/TrItj3Ohe0Ah1C5WX5Baquw/9U9KovnQ88EqmJbD66rKYUQYN1tQ=="; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "depd-2.0.0" = { + name = "depd"; + packageName = "depd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + }; + "diagnostics-1.1.1" = { + name = "diagnostics"; + packageName = "diagnostics"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz"; + sha512 = "8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ=="; + }; + }; + "dir-glob-3.0.1" = { + name = "dir-glob"; + packageName = "dir-glob"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; + }; + }; + "dom-serializer-0.1.1" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz"; + sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA=="; + }; + }; + "domelementtype-1.3.1" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; + sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; + }; + }; + "domhandler-2.4.2" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; + sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; + }; + }; + "domutils-1.5.1" = { + name = "domutils"; + packageName = "domutils"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + }; + }; + "dot-case-3.0.4" = { + name = "dot-case"; + packageName = "dot-case"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz"; + sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; + }; + }; + "dotenv-8.2.0" = { + name = "dotenv"; + packageName = "dotenv"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz"; + sha512 = "8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="; + }; + }; + "double-ended-queue-2.1.0-0" = { + name = "double-ended-queue"; + packageName = "double-ended-queue"; + version = "2.1.0-0"; + src = fetchurl { + url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz"; + sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; + }; + }; + "duplexify-3.7.1" = { + name = "duplexify"; + packageName = "duplexify"; + version = "3.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"; + sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; + }; + }; + "ecc-jsbn-0.1.2" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + }; + "ecdsa-sig-formatter-1.0.11" = { + name = "ecdsa-sig-formatter"; + packageName = "ecdsa-sig-formatter"; + version = "1.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; + sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "emoji-regex-7.0.3" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; + }; + }; + "emoji-regex-8.0.0" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; + }; + }; + "enabled-1.0.2" = { + name = "enabled"; + packageName = "enabled"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz"; + sha1 = "965f6513d2c2d1c5f4652b64a2e3396467fc2f93"; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "encoding-japanese-1.0.30" = { + name = "encoding-japanese"; + packageName = "encoding-japanese"; + version = "1.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding-japanese/-/encoding-japanese-1.0.30.tgz"; + sha512 = "bd/DFLAoJetvv7ar/KIpE3CNO8wEuyrt9Xuw6nSMiZ+Vrz/Q21BPsMHvARL2Wz6IKHKXgb+DWZqtRg1vql9cBg=="; + }; + }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; + "entities-1.1.2" = { + name = "entities"; + packageName = "entities"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; + sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; + }; + }; + "entities-2.1.0" = { + name = "entities"; + packageName = "entities"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; + sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; + }; + }; + "env-variable-0.0.6" = { + name = "env-variable"; + packageName = "env-variable"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz"; + sha512 = "bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg=="; + }; + }; + "es5-ext-0.10.53" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.53"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; + sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; + }; + }; + "es6-iterator-2.0.3" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + }; + "es6-map-0.1.5" = { + name = "es6-map"; + packageName = "es6-map"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; + sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; + }; + }; + "es6-set-0.1.5" = { + name = "es6-set"; + packageName = "es6-set"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; + sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + }; + }; + "es6-symbol-3.1.1" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; + sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + }; + }; + "es6-symbol-3.1.3" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; + }; + }; + "escalade-3.1.1" = { + name = "escalade"; + packageName = "escalade"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; + sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "escape-string-regexp-4.0.0" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; + }; + }; + "eslint-config-riot-1.0.0" = { + name = "eslint-config-riot"; + packageName = "eslint-config-riot"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-config-riot/-/eslint-config-riot-1.0.0.tgz"; + sha1 = "fbd65386980b30fbcd0e1305d4c3fb8614ef2119"; + }; + }; + "esprima-4.0.1" = { + name = "esprima"; + packageName = "esprima"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"; + sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + }; + }; + "eventsource-1.0.7" = { + name = "eventsource"; + packageName = "eventsource"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"; + sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; + }; + }; + "exit-on-epipe-1.0.1" = { + name = "exit-on-epipe"; + packageName = "exit-on-epipe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; + sha512 = "h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="; + }; + }; + "express-4.17.1" = { + name = "express"; + packageName = "express"; + version = "4.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + }; + }; + "ext-1.4.0" = { + name = "ext"; + packageName = "ext"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; + sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; + }; + }; + "extend-3.0.2" = { + name = "extend"; + packageName = "extend"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; + }; + }; + "external-editor-3.1.0" = { + name = "external-editor"; + packageName = "external-editor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"; + sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; + }; + }; + "extsprintf-1.3.0" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + }; + "fast-deep-equal-3.1.3" = { + name = "fast-deep-equal"; + packageName = "fast-deep-equal"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; + }; + }; + "fast-glob-3.2.4" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; + sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; + }; + }; + "fast-json-stable-stringify-2.1.0" = { + name = "fast-json-stable-stringify"; + packageName = "fast-json-stable-stringify"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; + }; + }; + "fastq-1.9.0" = { + name = "fastq"; + packageName = "fastq"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz"; + sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w=="; + }; + }; + "fflate-0.3.11" = { + name = "fflate"; + packageName = "fflate"; + version = "0.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/fflate/-/fflate-0.3.11.tgz"; + sha512 = "Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A=="; + }; + }; + "figlet-1.5.0" = { + name = "figlet"; + packageName = "figlet"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz"; + sha512 = "ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww=="; + }; + }; + "figures-3.2.0" = { + name = "figures"; + packageName = "figures"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"; + sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; + }; + }; + "file-type-14.7.1" = { + name = "file-type"; + packageName = "file-type"; + version = "14.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-14.7.1.tgz"; + sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; + }; + }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; + "finalhandler-1.1.2" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + }; + }; + "find-up-3.0.0" = { + name = "find-up"; + packageName = "find-up"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; + sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; + }; + }; + "find-up-4.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; + }; + }; + "flatted-2.0.2" = { + name = "flatted"; + packageName = "flatted"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"; + sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; + }; + }; + "follow-redirects-1.5.10" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.5.10"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz"; + sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ=="; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-2.3.3" = { + name = "form-data"; + packageName = "form-data"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; + }; + }; + "formidable-1.2.2" = { + name = "formidable"; + packageName = "formidable"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz"; + sha512 = "V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q=="; + }; + }; + "forwarded-0.1.2" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + }; + "frac-1.1.2" = { + name = "frac"; + packageName = "frac"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz"; + sha512 = "w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "fs-extra-8.1.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"; + sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; + }; + }; + "fs-minipass-1.2.7" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; + sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; + "generate-function-2.3.1" = { + name = "generate-function"; + packageName = "generate-function"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz"; + sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="; + }; + }; + "get-caller-file-2.0.5" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; + }; + }; + "get-system-fonts-2.0.2" = { + name = "get-system-fonts"; + packageName = "get-system-fonts"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-system-fonts/-/get-system-fonts-2.0.2.tgz"; + sha512 = "zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ=="; + }; + }; + "getpass-0.1.7" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + }; + "glob-7.1.6" = { + name = "glob"; + packageName = "glob"; + version = "7.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + }; + }; + "glob-parent-3.1.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + }; + "glob-parent-5.1.1" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + }; + }; + "glob-promise-3.4.0" = { + name = "glob-promise"; + packageName = "glob-promise"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-promise/-/glob-promise-3.4.0.tgz"; + sha512 = "q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw=="; + }; + }; + "glob-stream-6.1.0" = { + name = "glob-stream"; + packageName = "glob-stream"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"; + sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; + }; + }; + "globby-11.0.1" = { + name = "globby"; + packageName = "globby"; + version = "11.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz"; + sha512 = "iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="; + }; + }; + "gm-1.23.1" = { + name = "gm"; + packageName = "gm"; + version = "1.23.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gm/-/gm-1.23.1.tgz"; + sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777"; + }; + }; + "google-timezones-json-1.0.2" = { + name = "google-timezones-json"; + packageName = "google-timezones-json"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/google-timezones-json/-/google-timezones-json-1.0.2.tgz"; + sha512 = "UWXQ7BpSCW8erDespU2I4cri22xsKgwOCyhsJal0OJhi2tFpwJpsYNJt4vCiFPL1p2HzCGiS713LKpNR25n9Kg=="; + }; + }; + "graceful-fs-4.2.4" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + }; + }; + "har-schema-2.0.0" = { + name = "har-schema"; + packageName = "har-schema"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + }; + "har-validator-5.1.5" = { + name = "har-validator"; + packageName = "har-validator"; + version = "5.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "has-flag-3.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + }; + "has-flag-4.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"; + sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "he-1.2.0" = { + name = "he"; + packageName = "he"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.2.0.tgz"; + sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; + }; + }; + "header-case-2.0.4" = { + name = "header-case"; + packageName = "header-case"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz"; + sha512 = "H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q=="; + }; + }; + "help-me-1.1.0" = { + name = "help-me"; + packageName = "help-me"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/help-me/-/help-me-1.1.0.tgz"; + sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; + }; + }; + "highlight.js-10.4.1" = { + name = "highlight.js"; + packageName = "highlight.js"; + version = "10.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz"; + sha512 = "yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg=="; + }; + }; + "html-to-text-5.1.1" = { + name = "html-to-text"; + packageName = "html-to-text"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-5.1.1.tgz"; + sha512 = "Bci6bD/JIfZSvG4s0gW/9mMKwBRoe/1RWLxUME/d6WUSZCdY7T60bssf/jFf7EYXRyqU4P5xdClVqiYU0/ypdA=="; + }; + }; + "htmlparser2-3.10.1" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; + sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; + }; + }; + "http-errors-1.7.2" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; + }; + }; + "http-signature-1.2.0" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "iconv-lite-0.5.0" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz"; + sha512 = "NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw=="; + }; + }; + "iconv-lite-0.5.2" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.2.tgz"; + sha512 = "kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag=="; + }; + }; + "iconv-lite-0.6.2" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz"; + sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ=="; + }; + }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; + "ignore-5.1.8" = { + name = "ignore"; + packageName = "ignore"; + version = "5.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; + sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + }; + }; + "ignore-walk-3.0.3" = { + name = "ignore-walk"; + packageName = "ignore-walk"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz"; + sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw=="; + }; + }; + "imap-0.8.19" = { + name = "imap"; + packageName = "imap"; + version = "0.8.19"; + src = fetchurl { + url = "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz"; + sha1 = "3678873934ab09cea6ba48741f284da2af59d8d5"; + }; + }; + "imap-simple-4.3.0" = { + name = "imap-simple"; + packageName = "imap-simple"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/imap-simple/-/imap-simple-4.3.0.tgz"; + sha512 = "SW3LtfEJFjlJKS/h2CmpX2IKpya2RXobR3ENJJW4iMQ3QYPxWxf5oeaz1K3P4eGUwfGEndkqt7uVDKnEyG9zeQ=="; + }; + }; + "indent-string-4.0.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"; + sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + }; + }; + "inquirer-7.3.3" = { + name = "inquirer"; + packageName = "inquirer"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz"; + sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; + }; + }; + "ip-regex-2.1.0" = { + name = "ip-regex"; + packageName = "ip-regex"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + }; + "ipaddr.js-1.9.1" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; + }; + }; + "is-absolute-1.0.0" = { + name = "is-absolute"; + packageName = "is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"; + sha512 = "dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA=="; + }; + }; + "is-arrayish-0.3.2" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; + sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; + }; + }; + "is-buffer-2.0.5" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz"; + sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; + }; + }; + "is-docker-2.1.1" = { + name = "is-docker"; + packageName = "is-docker"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz"; + sha512 = "ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="; + }; + }; + "is-extglob-2.1.1" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "is-fullwidth-code-point-2.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + }; + "is-fullwidth-code-point-3.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; + }; + }; + "is-glob-3.1.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; + "is-negated-glob-1.0.0" = { + name = "is-negated-glob"; + packageName = "is-negated-glob"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; + sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; + }; + }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; + "is-promise-1.0.1" = { + name = "is-promise"; + packageName = "is-promise"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; + sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5"; + }; + }; + "is-property-1.0.2" = { + name = "is-property"; + packageName = "is-property"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + }; + }; + "is-relative-1.0.0" = { + name = "is-relative"; + packageName = "is-relative"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"; + sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "is-unc-path-1.0.0" = { + name = "is-unc-path"; + packageName = "is-unc-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"; + sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; + }; + }; + "is-windows-1.0.2" = { + name = "is-windows"; + packageName = "is-windows"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; + sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; + }; + }; + "is-wsl-2.2.0" = { + name = "is-wsl"; + packageName = "is-wsl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "isexe-2.0.0" = { + name = "isexe"; + packageName = "isexe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + }; + "iso-639-1-2.1.4" = { + name = "iso-639-1"; + packageName = "iso-639-1"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.4.tgz"; + sha512 = "pwJRHnpz1sCR5saQ+Hm1E2YESw2eLGKP5TzsYKXuQ7SIfvKWMRb9CHhptqunYpCIcRCpq3LgLuhYG5hiLPRbFQ=="; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "js-yaml-3.14.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; + sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; + }; + }; + "jsbi-3.1.4" = { + name = "jsbi"; + packageName = "jsbi"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbi/-/jsbi-3.1.4.tgz"; + sha512 = "52QRRFSsi9impURE8ZUbzAMCLjPm4THO7H2fcuIvaaeFTbSysvkodbQQXIVsNgq/ypDbq6dJiuGKL0vZ/i9hUg=="; + }; + }; + "jsbn-0.1.1" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "json-schema-traverse-0.4.1" = { + name = "json-schema-traverse"; + packageName = "json-schema-traverse"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; + }; + }; + "json-stable-stringify-without-jsonify-1.0.1" = { + name = "json-stable-stringify-without-jsonify"; + packageName = "json-stable-stringify-without-jsonify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "json5-2.1.0" = { + name = "json5"; + packageName = "json5"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz"; + sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ=="; + }; + }; + "jsonfile-4.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + }; + "jsonwebtoken-8.5.1" = { + name = "jsonwebtoken"; + packageName = "jsonwebtoken"; + version = "8.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz"; + sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; + }; + }; + "jsprim-1.4.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + }; + "jwa-1.4.1" = { + name = "jwa"; + packageName = "jwa"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz"; + sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA=="; + }; + }; + "jwks-rsa-1.9.0" = { + name = "jwks-rsa"; + packageName = "jwks-rsa"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-1.9.0.tgz"; + sha512 = "UPCfQQg0s2kF2Ju6UFJrQH73f7MaVN/hKBnYBYOp+X9KN4y6TLChhLtaXS5nRKbZqshwVdrZ9OY63m/Q9CLqcg=="; + }; + }; + "jws-3.2.2" = { + name = "jws"; + packageName = "jws"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz"; + sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; + }; + }; + "kafkajs-1.15.0" = { + name = "kafkajs"; + packageName = "kafkajs"; + version = "1.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/kafkajs/-/kafkajs-1.15.0.tgz"; + sha512 = "yjPyEnQCkPxAuQLIJnY5dI+xnmmgXmhuOQ1GVxClG5KTOV/rJcW1qA3UfvyEJKTp/RTSqQnUR3HJsKFvHyTpNg=="; + }; + }; + "kuler-1.0.1" = { + name = "kuler"; + packageName = "kuler"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz"; + sha512 = "J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ=="; + }; + }; + "leven-2.1.0" = { + name = "leven"; + packageName = "leven"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz"; + sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; + }; + }; + "libbase64-1.2.1" = { + name = "libbase64"; + packageName = "libbase64"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/libbase64/-/libbase64-1.2.1.tgz"; + sha512 = "l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew=="; + }; + }; + "libmime-4.2.1" = { + name = "libmime"; + packageName = "libmime"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/libmime/-/libmime-4.2.1.tgz"; + sha512 = "09y7zjSc5im1aNsq815zgo4/G3DnIzym3aDOHsGq4Ee5vrX4PdgQRybAsztz9Rv0NhO+J5C0llEUloa3sUmjmA=="; + }; + }; + "libmime-5.0.0" = { + name = "libmime"; + packageName = "libmime"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libmime/-/libmime-5.0.0.tgz"; + sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg=="; + }; + }; + "libqp-1.1.0" = { + name = "libqp"; + packageName = "libqp"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz"; + sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"; + }; + }; + "limiter-1.1.5" = { + name = "limiter"; + packageName = "limiter"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz"; + sha512 = "FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="; + }; + }; + "linkify-it-3.0.2" = { + name = "linkify-it"; + packageName = "linkify-it"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.2.tgz"; + sha512 = "gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ=="; + }; + }; + "localtunnel-2.0.0" = { + name = "localtunnel"; + packageName = "localtunnel"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.0.tgz"; + sha512 = "g6E0aLgYYDvQDxIjIXkgJo2+pHj3sGg4Wz/XP3h2KtZnRsWPbOQY+hw1H8Z91jep998fkcVE9l+kghO+97vllg=="; + }; + }; + "locate-path-3.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; + sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; + }; + }; + "locate-path-5.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + }; + "lodash-4.17.20" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.20"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; + sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; + }; + }; + "lodash._reinterpolate-3.0.0" = { + name = "lodash._reinterpolate"; + packageName = "lodash._reinterpolate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; + sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; + }; + }; + "lodash.clonedeep-4.5.0" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + }; + "lodash.get-4.4.2" = { + name = "lodash.get"; + packageName = "lodash.get"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + }; + "lodash.includes-4.3.0" = { + name = "lodash.includes"; + packageName = "lodash.includes"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"; + sha1 = "60bb98a87cb923c68ca1e51325483314849f553f"; + }; + }; + "lodash.isboolean-3.0.3" = { + name = "lodash.isboolean"; + packageName = "lodash.isboolean"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; + sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6"; + }; + }; + "lodash.isinteger-4.0.4" = { + name = "lodash.isinteger"; + packageName = "lodash.isinteger"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; + sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343"; + }; + }; + "lodash.isnumber-3.0.3" = { + name = "lodash.isnumber"; + packageName = "lodash.isnumber"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; + sha1 = "3ce76810c5928d03352301ac287317f11c0b1ffc"; + }; + }; + "lodash.isplainobject-4.0.6" = { + name = "lodash.isplainobject"; + packageName = "lodash.isplainobject"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + }; + }; + "lodash.isstring-4.0.1" = { + name = "lodash.isstring"; + packageName = "lodash.isstring"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; + sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; + }; + }; + "lodash.once-4.1.1" = { + name = "lodash.once"; + packageName = "lodash.once"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; + sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; + }; + }; + "lodash.set-4.3.2" = { + name = "lodash.set"; + packageName = "lodash.set"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz"; + sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; + }; + }; + "lodash.template-4.5.0" = { + name = "lodash.template"; + packageName = "lodash.template"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"; + sha512 = "84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A=="; + }; + }; + "lodash.templatesettings-4.2.0" = { + name = "lodash.templatesettings"; + packageName = "lodash.templatesettings"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"; + sha512 = "stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ=="; + }; + }; + "lodash.unset-4.5.2" = { + name = "lodash.unset"; + packageName = "lodash.unset"; + version = "4.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.unset/-/lodash.unset-4.5.2.tgz"; + sha1 = "370d1d3e85b72a7e1b0cdf2d272121306f23e4ed"; + }; + }; + "long-4.0.0" = { + name = "long"; + packageName = "long"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz"; + sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; + }; + }; + "lower-case-2.0.2" = { + name = "lower-case"; + packageName = "lower-case"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz"; + sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; + }; + }; + "lru-cache-4.0.2" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"; + sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; + }; + }; + "lru-cache-4.1.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; + }; + }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; + "lru-cache-6.0.0" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; + }; + }; + "lru-memoizer-2.1.2" = { + name = "lru-memoizer"; + packageName = "lru-memoizer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-memoizer/-/lru-memoizer-2.1.2.tgz"; + sha512 = "N5L5xlnVcbIinNn/TJ17vHBZwBMt9t7aJDz2n97moWubjNl6VO9Ao2XuAGBBddkYdjrwR9HfzXbT6NfMZXAZ/A=="; + }; + }; + "mailparser-2.8.1" = { + name = "mailparser"; + packageName = "mailparser"; + version = "2.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mailparser/-/mailparser-2.8.1.tgz"; + sha512 = "H/CYAO9dsw6SFNbEGGpZsejVSWDcFlyHjb1OkHUWg0wggUekva1tNc28trB155nSqM8rhtbwTKt//orX0AmJxQ=="; + }; + }; + "mailsplit-5.0.0" = { + name = "mailsplit"; + packageName = "mailsplit"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.0.0.tgz"; + sha512 = "HeXA0eyCKBtZqbr7uoeb3Nn2L7VV8Vm27x6/YBb0ZiNzRzLoNS2PqRgGYADwh0cBzLYtqddq40bSSirqLO2LGw=="; + }; + }; + "make-error-1.3.6" = { + name = "make-error"; + packageName = "make-error"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; + sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; + }; + }; + "make-error-cause-2.3.0" = { + name = "make-error-cause"; + packageName = "make-error-cause"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-error-cause/-/make-error-cause-2.3.0.tgz"; + sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg=="; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "memory-pager-1.5.0" = { + name = "memory-pager"; + packageName = "memory-pager"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz"; + sha512 = "ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="; + }; + }; + "merge-descriptors-1.0.1" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + }; + "merge2-1.4.1" = { + name = "merge2"; + packageName = "merge2"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "micromatch-4.0.2" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; + sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + }; + }; + "millisecond-0.1.2" = { + name = "millisecond"; + packageName = "millisecond"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/millisecond/-/millisecond-0.1.2.tgz"; + sha1 = "6cc5ad386241cab8e78aff964f87028eec92dac5"; + }; + }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + }; + }; + "mime-db-1.44.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.44.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; + }; + }; + "mime-types-2.1.27" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.27"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; + }; + }; + "mimic-fn-2.1.0" = { + name = "mimic-fn"; + packageName = "mimic-fn"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-1.2.5" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; + sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + }; + }; + "minipass-2.9.0" = { + name = "minipass"; + packageName = "minipass"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; + sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; + }; + }; + "minizlib-1.3.3" = { + name = "minizlib"; + packageName = "minizlib"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; + sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; + }; + }; + "mkdirp-0.5.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + }; + }; + "mkdirp-1.0.4" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; + sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; + }; + }; + "moment-2.24.0" = { + name = "moment"; + packageName = "moment"; + version = "2.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; + sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; + }; + }; + "moment-2.28.0" = { + name = "moment"; + packageName = "moment"; + version = "2.28.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.28.0.tgz"; + sha512 = "Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw=="; + }; + }; + "moment-timezone-0.5.32" = { + name = "moment-timezone"; + packageName = "moment-timezone"; + version = "0.5.32"; + src = fetchurl { + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.32.tgz"; + sha512 = "Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA=="; + }; + }; + "mongodb-3.6.3" = { + name = "mongodb"; + packageName = "mongodb"; + version = "3.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb/-/mongodb-3.6.3.tgz"; + sha512 = "rOZuR0QkodZiM+UbQE5kDsJykBqWi0CL4Ec2i1nrGrUI3KO11r6Fbxskqmq3JK2NH7aW4dcccBuUujAP0ERl5w=="; + }; + }; + "mqtt-4.2.1" = { + name = "mqtt"; + packageName = "mqtt"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.1.tgz"; + sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg=="; + }; + }; + "mqtt-packet-6.6.0" = { + name = "mqtt-packet"; + packageName = "mqtt-packet"; + version = "6.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.6.0.tgz"; + sha512 = "LvghnKMFC70hKWMVykmhJarlO5e7lT3t9s9A2qPCUx+lazL3Mq55U+eCV0eLi7/nRRQYvEUWo/2tTo89EjnCJQ=="; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "mssql-6.2.3" = { + name = "mssql"; + packageName = "mssql"; + version = "6.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mssql/-/mssql-6.2.3.tgz"; + sha512 = "4TW/fA9UgzmVTNgjl65r6ISr6aL5QHnlptEt1A3jIpdzkNbFPIkRbUNz90324HIdE+5pKc3VqikOImcTrhd4og=="; + }; + }; + "mute-stream-0.0.8" = { + name = "mute-stream"; + packageName = "mute-stream"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"; + sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; + }; + }; + "mysql2-2.1.0" = { + name = "mysql2"; + packageName = "mysql2"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mysql2/-/mysql2-2.1.0.tgz"; + sha512 = "9kGVyi930rG2KaHrz3sHwtc6K+GY9d8wWk1XRSYxQiunvGcn4DwuZxOwmK11ftuhhwrYDwGx9Ta4VBwznJn36A=="; + }; + }; + "mz-2.7.0" = { + name = "mz"; + packageName = "mz"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; + sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; + }; + }; + "n8n-core-0.54.0" = { + name = "n8n-core"; + packageName = "n8n-core"; + version = "0.54.0"; + src = fetchurl { + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.54.0.tgz"; + sha512 = "07Fts2MSm5acbsFPEVU7RXx38K5ryGVy6OE1g+Nbr8B0LuQiTEhCzC7x+AIfFDQlt/cQQEiPejaBGDZZm0kdpA=="; + }; + }; + "n8n-editor-ui-0.66.0" = { + name = "n8n-editor-ui"; + packageName = "n8n-editor-ui"; + version = "0.66.0"; + src = fetchurl { + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.66.0.tgz"; + sha512 = "BZTaiYffZ2+dbPOp0JjV+pZ4S7iD7r2oYTylwFbNRpEbIc4a0l8JbU0HRqHESdPR3yYDdUTmVXqk1fWfc8IgYw=="; + }; + }; + "n8n-nodes-base-0.91.0" = { + name = "n8n-nodes-base"; + packageName = "n8n-nodes-base"; + version = "0.91.0"; + src = fetchurl { + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.91.0.tgz"; + sha512 = "75DVfQS/AkZBB6lIAAWHhM4wRkhHXCNf/30Fi0Cc+cihw7GW3O4bdXNhZKFwDTf70DYNATM0kBBEbSHvQusuCw=="; + }; + }; + "n8n-workflow-0.47.0" = { + name = "n8n-workflow"; + packageName = "n8n-workflow"; + version = "0.47.0"; + src = fetchurl { + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.47.0.tgz"; + sha512 = "1CbSOvVSf1KNM5izOEVsuMMEkuwiqezVH4hWS1Ts7pSdgSi8TrFCi4CE1J8qA0KBmWq5APh3vEJGFyvkLX6BOg=="; + }; + }; + "named-placeholders-1.1.2" = { + name = "named-placeholders"; + packageName = "named-placeholders"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.2.tgz"; + sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA=="; + }; + }; + "nan-2.14.2" = { + name = "nan"; + packageName = "nan"; + version = "2.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz"; + sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; + }; + }; + "native-duplexpair-1.0.0" = { + name = "native-duplexpair"; + packageName = "native-duplexpair"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/native-duplexpair/-/native-duplexpair-1.0.0.tgz"; + sha1 = "7899078e64bf3c8a3d732601b3d40ff05db58fa0"; + }; + }; + "needle-2.5.2" = { + name = "needle"; + packageName = "needle"; + version = "2.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz"; + sha512 = "LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ=="; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "next-tick-1.0.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + }; + "no-case-3.0.4" = { + name = "no-case"; + packageName = "no-case"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz"; + sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; + }; + }; + "node-ensure-0.0.0" = { + name = "node-ensure"; + packageName = "node-ensure"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-ensure/-/node-ensure-0.0.0.tgz"; + sha1 = "ecae764150de99861ec5c810fd5d096b183932a7"; + }; + }; + "node-pre-gyp-0.11.0" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz"; + sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; + }; + }; + "nodeify-1.0.1" = { + name = "nodeify"; + packageName = "nodeify"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz"; + sha1 = "64ab69a7bdbaf03ce107b4f0335c87c0b9e91b1d"; + }; + }; + "nodemailer-6.4.11" = { + name = "nodemailer"; + packageName = "nodemailer"; + version = "6.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.11.tgz"; + sha512 = "BVZBDi+aJV4O38rxsUh164Dk1NCqgh6Cm0rQSb9SK/DHGll/DrCMnycVDD7msJgZCnmVa8ASo8EZzR7jsgTukQ=="; + }; + }; + "nodemailer-6.4.16" = { + name = "nodemailer"; + packageName = "nodemailer"; + version = "6.4.16"; + src = fetchurl { + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.16.tgz"; + sha512 = "68K0LgZ6hmZ7PVmwL78gzNdjpj5viqBdFqKrTtr9bZbJYj6BRj5W6WGkxXrEnUl3Co3CBXi3CZBUlpV/foGnOQ=="; + }; + }; + "nopt-4.0.3" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz"; + sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; + }; + }; + "npm-bundled-1.1.1" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz"; + sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; + }; + }; + "npm-normalize-package-bin-1.0.1" = { + name = "npm-normalize-package-bin"; + packageName = "npm-normalize-package-bin"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; + sha512 = "EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="; + }; + }; + "npm-packlist-1.4.8" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "1.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz"; + sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; + }; + }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "nth-check-1.0.2" = { + name = "nth-check"; + packageName = "nth-check"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz"; + sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "oauth-1.0a-2.2.6" = { + name = "oauth-1.0a"; + packageName = "oauth-1.0a"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-1.0a/-/oauth-1.0a-2.2.6.tgz"; + sha512 = "6bkxv3N4Gu5lty4viIcIAnq5GbxECviMBeKR3WX/q87SPQ8E8aursPZUtsXDnxCs787af09WPRBLqYrf/lwoYQ=="; + }; + }; + "oauth-sign-0.9.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "on-headers-1.0.2" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "onetime-5.1.2" = { + name = "onetime"; + packageName = "onetime"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; + }; + }; + "open-7.3.0" = { + name = "open"; + packageName = "open"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.3.0.tgz"; + sha512 = "mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw=="; + }; + }; + "openurl-1.1.1" = { + name = "openurl"; + packageName = "openurl"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz"; + sha1 = "3875b4b0ef7a52c156f0db41d4609dbb0f94b387"; + }; + }; + "ordered-read-streams-1.0.1" = { + name = "ordered-read-streams"; + packageName = "ordered-read-streams"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"; + sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; + }; + }; + "original-1.0.2" = { + name = "original"; + packageName = "original"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/original/-/original-1.0.2.tgz"; + sha512 = "hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg=="; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + }; + }; + "p-cancelable-2.0.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz"; + sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="; + }; + }; + "p-limit-2.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + }; + }; + "p-locate-3.0.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; + sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; + }; + }; + "p-locate-4.1.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; + }; + }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; + "packet-reader-1.0.0" = { + name = "packet-reader"; + packageName = "packet-reader"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/packet-reader/-/packet-reader-1.0.0.tgz"; + sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; + }; + }; + "param-case-3.0.4" = { + name = "param-case"; + packageName = "param-case"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz"; + sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; + }; + }; + "parent-require-1.0.0" = { + name = "parent-require"; + packageName = "parent-require"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz"; + sha1 = "746a167638083a860b0eef6732cb27ed46c32977"; + }; + }; + "parse5-3.0.3" = { + name = "parse5"; + packageName = "parse5"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz"; + sha512 = "rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA=="; + }; + }; + "parse5-5.1.1" = { + name = "parse5"; + packageName = "parse5"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"; + sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; + }; + }; + "parse5-6.0.1" = { + name = "parse5"; + packageName = "parse5"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"; + sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; + }; + }; + "parse5-htmlparser2-tree-adapter-6.0.1" = { + name = "parse5-htmlparser2-tree-adapter"; + packageName = "parse5-htmlparser2-tree-adapter"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"; + sha512 = "qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA=="; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; + "pascal-case-3.1.2" = { + name = "pascal-case"; + packageName = "pascal-case"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz"; + sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; + }; + }; + "path-case-3.0.4" = { + name = "path-case"; + packageName = "path-case"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz"; + sha512 = "qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg=="; + }; + }; + "path-dirname-1.0.2" = { + name = "path-dirname"; + packageName = "path-dirname"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + }; + "path-exists-3.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-to-regexp-0.1.7" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + }; + "path-type-4.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; + }; + }; + "pdf-parse-1.1.1" = { + name = "pdf-parse"; + packageName = "pdf-parse"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pdf-parse/-/pdf-parse-1.1.1.tgz"; + sha512 = "v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A=="; + }; + }; + "peek-readable-3.1.0" = { + name = "peek-readable"; + packageName = "peek-readable"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.0.tgz"; + sha512 = "KGuODSTV6hcgdZvDrIDBUkN0utcAVj1LL7FfGbM0viKTtCHmtZcuEJ+lGqsp0fTFkGqesdtemV2yUSMeyy3ddA=="; + }; + }; + "performance-now-2.1.0" = { + name = "performance-now"; + packageName = "performance-now"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + }; + "pg-8.5.1" = { + name = "pg"; + packageName = "pg"; + version = "8.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz"; + sha512 = "9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw=="; + }; + }; + "pg-connection-string-2.4.0" = { + name = "pg-connection-string"; + packageName = "pg-connection-string"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz"; + sha512 = "3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ=="; + }; + }; + "pg-int8-1.0.1" = { + name = "pg-int8"; + packageName = "pg-int8"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz"; + sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; + }; + }; + "pg-minify-1.6.1" = { + name = "pg-minify"; + packageName = "pg-minify"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.6.1.tgz"; + sha512 = "ujanxJJB9CSDUvlAOshtjdKAywOPR2vY0a7D+vvgk5rbrYcthZA7TjpN+Z+UwZsz/G/bUexYDT6huE33vYVN0g=="; + }; + }; + "pg-pool-3.2.2" = { + name = "pg-pool"; + packageName = "pg-pool"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz"; + sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="; + }; + }; + "pg-promise-10.8.1" = { + name = "pg-promise"; + packageName = "pg-promise"; + version = "10.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.8.1.tgz"; + sha512 = "xRW3PBopAAPlSmOutfpxwrd0i1wfiVoJjkRC2xYzwk0PwWGLEOVKoDEHX4VoqjfIJ+SEEiILy5B5nUVvXpFFVA=="; + }; + }; + "pg-protocol-1.4.0" = { + name = "pg-protocol"; + packageName = "pg-protocol"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz"; + sha512 = "El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA=="; + }; + }; + "pg-types-2.2.0" = { + name = "pg-types"; + packageName = "pg-types"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz"; + sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; + }; + }; + "pgpass-1.0.4" = { + name = "pgpass"; + packageName = "pgpass"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz"; + sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; + }; + }; + "picomatch-2.2.2" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + }; + }; + "popsicle-12.1.0" = { + name = "popsicle"; + packageName = "popsicle"; + version = "12.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/popsicle/-/popsicle-12.1.0.tgz"; + sha512 = "muNC/cIrWhfR6HqqhHazkxjob3eyECBe8uZYSQ/N5vixNAgssacVleerXnE8Are5fspR0a+d2qWaBR1g7RYlmw=="; + }; + }; + "popsicle-content-encoding-1.0.0" = { + name = "popsicle-content-encoding"; + packageName = "popsicle-content-encoding"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/popsicle-content-encoding/-/popsicle-content-encoding-1.0.0.tgz"; + sha512 = "4Df+vTfM8wCCJVTzPujiI6eOl3SiWQkcZg0AMrOkD1enMXsF3glIkFUZGvour1Sj7jOWCsNSEhBxpbbhclHhzw=="; + }; + }; + "popsicle-cookie-jar-1.0.0" = { + name = "popsicle-cookie-jar"; + packageName = "popsicle-cookie-jar"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/popsicle-cookie-jar/-/popsicle-cookie-jar-1.0.0.tgz"; + sha512 = "vrlOGvNVELko0+J8NpGC5lHWDGrk8LQJq9nwAMIVEVBfN1Lib3BLxAaLRGDTuUnvl45j5N9dT2H85PULz6IjjQ=="; + }; + }; + "popsicle-redirects-1.1.0" = { + name = "popsicle-redirects"; + packageName = "popsicle-redirects"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/popsicle-redirects/-/popsicle-redirects-1.1.0.tgz"; + sha512 = "XCpzVjVk7tty+IJnSdqWevmOr1n8HNDhL86v7mZ6T1JIIf2KGybxUk9mm7ZFOhWMkGB0e8XkacHip7BV8AQWQA=="; + }; + }; + "popsicle-transport-http-1.0.9" = { + name = "popsicle-transport-http"; + packageName = "popsicle-transport-http"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/popsicle-transport-http/-/popsicle-transport-http-1.0.9.tgz"; + sha512 = "55Os0JdCs35FI8cAsgMoKG6XXKR4Wh8qZIbL3rY5+IZqqjMIo3/3q3wSE98mUhHyLgjg9HQ6ep5wNfhbYCI7GQ=="; + }; + }; + "popsicle-transport-xhr-2.0.0" = { + name = "popsicle-transport-xhr"; + packageName = "popsicle-transport-xhr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/popsicle-transport-xhr/-/popsicle-transport-xhr-2.0.0.tgz"; + sha512 = "5Sbud4Widngf1dodJE5cjEYXkzEUIl8CzyYRYR57t6vpy9a9KPGQX6KBKdPjmBZlR5A06pOBXuJnVr23l27rtA=="; + }; + }; + "popsicle-user-agent-1.0.0" = { + name = "popsicle-user-agent"; + packageName = "popsicle-user-agent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/popsicle-user-agent/-/popsicle-user-agent-1.0.0.tgz"; + sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA=="; + }; + }; + "postgres-array-2.0.0" = { + name = "postgres-array"; + packageName = "postgres-array"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz"; + sha512 = "VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA=="; + }; + }; + "postgres-bytea-1.0.0" = { + name = "postgres-bytea"; + packageName = "postgres-bytea"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; + sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; + }; + }; + "postgres-date-1.0.7" = { + name = "postgres-date"; + packageName = "postgres-date"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz"; + sha512 = "suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q=="; + }; + }; + "postgres-interval-1.2.0" = { + name = "postgres-interval"; + packageName = "postgres-interval"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz"; + sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; + }; + }; + "printj-1.1.2" = { + name = "printj"; + packageName = "printj"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/printj/-/printj-1.1.2.tgz"; + sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "promise-1.3.0" = { + name = "promise"; + packageName = "promise"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz"; + sha1 = "e5cc9a4c8278e4664ffedc01c7da84842b040175"; + }; + }; + "promise-ftp-1.3.5" = { + name = "promise-ftp"; + packageName = "promise-ftp"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-ftp/-/promise-ftp-1.3.5.tgz"; + sha512 = "v368jPSqzmjjKDIyggulC+dRFcpAOEX7aFdEWkFYQp8Ao3P2N4Y6XnFFdKgK7PtkylwvGQkZR/65HZuzmq0V7A=="; + }; + }; + "promise-ftp-common-1.1.5" = { + name = "promise-ftp-common"; + packageName = "promise-ftp-common"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-ftp-common/-/promise-ftp-common-1.1.5.tgz"; + sha1 = "b4f8082a74035647703506763edb14230d9865da"; + }; + }; + "proxy-addr-2.0.6" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; + sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "psl-1.8.0" = { + name = "psl"; + packageName = "psl"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + }; + }; + "pump-2.0.1" = { + name = "pump"; + packageName = "pump"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"; + sha512 = "ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA=="; + }; + }; + "pump-3.0.0" = { + name = "pump"; + packageName = "pump"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"; + sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; + }; + }; + "pumpify-1.5.1" = { + name = "pumpify"; + packageName = "pumpify"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"; + sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; + }; + }; + "punycode-2.1.1" = { + name = "punycode"; + packageName = "punycode"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"; + sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; + }; + }; + "qs-6.5.2" = { + name = "qs"; + packageName = "qs"; + version = "6.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; + sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + }; + }; + "qs-6.7.0" = { + name = "qs"; + packageName = "qs"; + version = "6.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + }; + }; + "querystringify-2.2.0" = { + name = "querystringify"; + packageName = "querystringify"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"; + sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; + }; + }; + "quoted-printable-1.0.1" = { + name = "quoted-printable"; + packageName = "quoted-printable"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/quoted-printable/-/quoted-printable-1.0.1.tgz"; + sha1 = "9eebf5eb3d11eef022b264fd2d2b6b2bb3b84cc3"; + }; + }; + "random-bytes-1.0.0" = { + name = "random-bytes"; + packageName = "random-bytes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; + sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; + }; + }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; + "raw-body-2.4.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; + }; + }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "readable-stream-2.3.7" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + }; + }; + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; + "readable-web-to-node-stream-2.0.0" = { + name = "readable-web-to-node-stream"; + packageName = "readable-web-to-node-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-2.0.0.tgz"; + sha512 = "+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA=="; + }; + }; + "redeyed-2.1.1" = { + name = "redeyed"; + packageName = "redeyed"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz"; + sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; + }; + }; + "redis-2.8.0" = { + name = "redis"; + packageName = "redis"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; + sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; + }; + }; + "redis-commands-1.6.0" = { + name = "redis-commands"; + packageName = "redis-commands"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.6.0.tgz"; + sha512 = "2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ=="; + }; + }; + "redis-parser-2.6.0" = { + name = "redis-parser"; + packageName = "redis-parser"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"; + sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; + }; + }; + "reflect-metadata-0.1.13" = { + name = "reflect-metadata"; + packageName = "reflect-metadata"; + version = "0.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz"; + sha512 = "Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="; + }; + }; + "reinterval-1.1.0" = { + name = "reinterval"; + packageName = "reinterval"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz"; + sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; + }; + }; + "remove-trailing-separator-1.1.0" = { + name = "remove-trailing-separator"; + packageName = "remove-trailing-separator"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + }; + "request-2.88.2" = { + name = "request"; + packageName = "request"; + version = "2.88.2"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.88.2.tgz"; + sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; + }; + }; + "request-promise-core-1.1.4" = { + name = "request-promise-core"; + packageName = "request-promise-core"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw=="; + }; + }; + "request-promise-native-1.0.9" = { + name = "request-promise-native"; + packageName = "request-promise-native"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; + }; + }; + "require-directory-2.1.1" = { + name = "require-directory"; + packageName = "require-directory"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; + }; + }; + "require_optional-1.0.1" = { + name = "require_optional"; + packageName = "require_optional"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz"; + sha512 = "qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g=="; + }; + }; + "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-from-2.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"; + sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; + }; + }; + "restore-cursor-3.1.0" = { + name = "restore-cursor"; + packageName = "restore-cursor"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; + }; + }; + "retry-0.12.0" = { + name = "retry"; + packageName = "retry"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + }; + "reusify-1.0.4" = { + name = "reusify"; + packageName = "reusify"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; + sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; + }; + }; + "rhea-1.0.24" = { + name = "rhea"; + packageName = "rhea"; + version = "1.0.24"; + src = fetchurl { + url = "https://registry.npmjs.org/rhea/-/rhea-1.0.24.tgz"; + sha512 = "PEl62U2EhxCO5wMUZ2/bCBcXAVKN9AdMSNQOrp3+R5b77TEaOSiy16MQ0sIOmzj/iqsgIAgPs1mt3FYfu1vIXA=="; + }; + }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; + "rimraf-3.0.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; + sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; + }; + }; + "riot-tmpl-3.0.8" = { + name = "riot-tmpl"; + packageName = "riot-tmpl"; + version = "3.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/riot-tmpl/-/riot-tmpl-3.0.8.tgz"; + sha1 = "dd654e72a3a1520cb009cbef70c73856ded584a6"; + }; + }; + "rndm-1.2.0" = { + name = "rndm"; + packageName = "rndm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; + sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; + }; + }; + "rss-parser-3.9.0" = { + name = "rss-parser"; + packageName = "rss-parser"; + version = "3.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.9.0.tgz"; + sha512 = "wlRSfGrotOXuWo19Dtl2KmQt7o9i5zzCExUrxpechE0O54BAx7JD+xhWyGumPPqiJj771ndflV3sE3bTHen0HQ=="; + }; + }; + "run-async-2.4.1" = { + name = "run-async"; + packageName = "run-async"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; + }; + }; + "run-parallel-1.1.10" = { + name = "run-parallel"; + packageName = "run-parallel"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; + sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; + }; + }; + "rxjs-6.6.3" = { + name = "rxjs"; + packageName = "rxjs"; + version = "6.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz"; + sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safe-buffer-5.2.1" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "saslprep-1.0.3" = { + name = "saslprep"; + packageName = "saslprep"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz"; + sha512 = "/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag=="; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + }; + "semver-5.7.1" = { + name = "semver"; + packageName = "semver"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; + sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; + }; + }; + "semver-7.3.4" = { + name = "semver"; + packageName = "semver"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; + sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; + }; + }; + "send-0.17.1" = { + name = "send"; + packageName = "send"; + version = "0.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + }; + }; + "sentence-case-3.0.4" = { + name = "sentence-case"; + packageName = "sentence-case"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz"; + sha512 = "8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg=="; + }; + }; + "seq-queue-0.0.5" = { + name = "seq-queue"; + packageName = "seq-queue"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz"; + sha1 = "d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"; + }; + }; + "serve-static-1.14.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + }; + }; + "servie-4.3.3" = { + name = "servie"; + packageName = "servie"; + version = "4.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/servie/-/servie-4.3.3.tgz"; + sha512 = "b0IrY3b1gVMsWvJppCf19g1p3JSnS0hQi6xu4Hi40CIhf0Lx8pQHcvBL+xunShpmOiQzg1NOia812NAWdSaShw=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "setheader-1.0.2" = { + name = "setheader"; + packageName = "setheader"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/setheader/-/setheader-1.0.2.tgz"; + sha512 = "A704nIwzqGed0CnJZIqDE+0udMPS839ocgf1R9OJ8aq8vw4U980HWeNaD9ec8VnmBni9lyGEWDedOWXT/C5kxA=="; + }; + }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; + "sha.js-2.4.11" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; + sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; + }; + }; + "signal-exit-3.0.3" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; + sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + }; + }; + "simple-swizzle-0.2.2" = { + name = "simple-swizzle"; + packageName = "simple-swizzle"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; + sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + }; + }; + "slash-3.0.0" = { + name = "slash"; + packageName = "slash"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; + }; + }; + "snake-case-3.0.4" = { + name = "snake-case"; + packageName = "snake-case"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz"; + sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; + }; + }; + "sparse-bitfield-3.0.3" = { + name = "sparse-bitfield"; + packageName = "sparse-bitfield"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz"; + sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; + }; + }; + "spex-3.0.2" = { + name = "spex"; + packageName = "spex"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spex/-/spex-3.0.2.tgz"; + sha512 = "ZNCrOso+oNv5P01HCO4wuxV9Og5rS6ms7gGAqugfBPjx1QwfNXJI3T02ldfaap1O0dlT1sB0Rk+mhDqxt3Z27w=="; + }; + }; + "split2-3.2.2" = { + name = "split2"; + packageName = "split2"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"; + sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; + }; + }; + "sprintf-js-1.0.3" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + }; + "sprintf-js-1.1.2" = { + name = "sprintf-js"; + packageName = "sprintf-js"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz"; + sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; + }; + }; + "sqlite3-4.2.0" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz"; + sha512 = "roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg=="; + }; + }; + "sqlstring-2.3.2" = { + name = "sqlstring"; + packageName = "sqlstring"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.2.tgz"; + sha512 = "vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg=="; + }; + }; + "sse-channel-3.1.1" = { + name = "sse-channel"; + packageName = "sse-channel"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sse-channel/-/sse-channel-3.1.1.tgz"; + sha512 = "vgf4QFh60vlAMX0vGJpn6S+7gTO3ckRn7xq4DOgQGcgDs7ULBkaQFQxy4b3vj/umyk0ydhGu7i4A1nHQc5HcYw=="; + }; + }; + "ssf-0.11.2" = { + name = "ssf"; + packageName = "ssf"; + version = "0.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz"; + sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; + }; + }; + "ssh2-0.8.9" = { + name = "ssh2"; + packageName = "ssh2"; + version = "0.8.9"; + src = fetchurl { + url = "https://registry.npmjs.org/ssh2/-/ssh2-0.8.9.tgz"; + sha512 = "GmoNPxWDMkVpMFa9LVVzQZHF6EW3WKmBwL+4/GeILf2hFmix5Isxm7Amamo8o7bHiU0tC+wXsGcUXOxp8ChPaw=="; + }; + }; + "ssh2-sftp-client-5.3.2" = { + name = "ssh2-sftp-client"; + packageName = "ssh2-sftp-client"; + version = "5.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-5.3.2.tgz"; + sha512 = "YD38WQKleuapAZyvqRJq7PN8pC6GnzWdWcnZN4vsPXMHtZpjcg/ipBcFGtDsC5rkHp5qXgRu56WPcDUkM87FiA=="; + }; + }; + "ssh2-streams-0.4.10" = { + name = "ssh2-streams"; + packageName = "ssh2-streams"; + version = "0.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.4.10.tgz"; + sha512 = "8pnlMjvnIZJvmTzUIIA5nT4jr2ZWNNVHwyXfMGdRJbug9TpI3kd99ffglgfSWqujVv/0gxwMsDn9j9RVst8yhQ=="; + }; + }; + "sshpk-1.16.1" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.16.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; + sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + }; + }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; + "stealthy-require-1.1.1" = { + name = "stealthy-require"; + packageName = "stealthy-require"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + }; + "stream-shift-1.0.1" = { + name = "stream-shift"; + packageName = "stream-shift"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"; + sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; + }; + }; + "streamsearch-0.1.2" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; + sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string-width-2.1.1" = { + name = "string-width"; + packageName = "string-width"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; + sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + }; + }; + "string-width-3.1.0" = { + name = "string-width"; + packageName = "string-width"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; + sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; + }; + }; + "string-width-4.2.0" = { + name = "string-width"; + packageName = "string-width"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; + sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-ansi-4.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + }; + "strip-ansi-5.2.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; + }; + }; + "strip-ansi-6.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + }; + }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; + "strtok3-6.0.4" = { + name = "strtok3"; + packageName = "strtok3"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.4.tgz"; + sha512 = "rqWMKwsbN9APU47bQTMEYTPcwdpKDtmf1jVhHzNW2cL1WqAxaM9iBb9t5P2fj+RV2YsErUWgQzHD5JwV0uCTEQ=="; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "supports-color-5.5.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "5.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; + sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; + }; + }; + "supports-color-7.2.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"; + sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; + }; + }; + "tar-4.4.13" = { + name = "tar"; + packageName = "tar"; + version = "4.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; + sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; + }; + }; + "tarn-1.1.5" = { + name = "tarn"; + packageName = "tarn"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tarn/-/tarn-1.1.5.tgz"; + sha512 = "PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g=="; + }; + }; + "tedious-6.7.0" = { + name = "tedious"; + packageName = "tedious"; + version = "6.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tedious/-/tedious-6.7.0.tgz"; + sha512 = "8qr7+sB0h4SZVQBRWUgHmYuOEflAOl2eihvxk0fVNvpvGJV4V5UC/YmSvebyfgyfwWcPO22/AnSbYVZZqf9wuQ=="; + }; + }; + "text-hex-1.0.0" = { + name = "text-hex"; + packageName = "text-hex"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz"; + sha512 = "uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="; + }; + }; + "thenify-3.3.1" = { + name = "thenify"; + packageName = "thenify"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; + sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; + }; + }; + "thenify-all-1.6.0" = { + name = "thenify-all"; + packageName = "thenify-all"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; + sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "through2-2.0.5" = { + name = "through2"; + packageName = "through2"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"; + sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; + }; + }; + "through2-filter-3.0.0" = { + name = "through2-filter"; + packageName = "through2-filter"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz"; + sha512 = "jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA=="; + }; + }; + "throwback-4.1.0" = { + name = "throwback"; + packageName = "throwback"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/throwback/-/throwback-4.1.0.tgz"; + sha512 = "dLFe8bU8SeH0xeqeKL7BNo8XoPC/o91nz9/ooeplZPiso+DZukhoyZcSz9TFnUNScm+cA9qjU1m1853M6sPOng=="; + }; + }; + "tlds-1.208.0" = { + name = "tlds"; + packageName = "tlds"; + version = "1.208.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tlds/-/tlds-1.208.0.tgz"; + sha512 = "6kbY7GJpRQXwBddSOAbVUZXjObbCGFXliWWN+kOSEoRWIOyRWLB6zdeKC/Tguwwenl/KsUx016XR50EdHYsxZw=="; + }; + }; + "tmp-0.0.33" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"; + sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; + }; + }; + "tmp-0.2.1" = { + name = "tmp"; + packageName = "tmp"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"; + sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; + }; + }; + "tmp-promise-3.0.2" = { + name = "tmp-promise"; + packageName = "tmp-promise"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.2.tgz"; + sha512 = "OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA=="; + }; + }; + "to-absolute-glob-2.0.2" = { + name = "to-absolute-glob"; + packageName = "to-absolute-glob"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"; + sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b"; + }; + }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; + "token-types-2.0.0" = { + name = "token-types"; + packageName = "token-types"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/token-types/-/token-types-2.0.0.tgz"; + sha512 = "WWvu8sGK8/ZmGusekZJJ5NM6rRVTTDO7/bahz4NGiSDb/XsmdYBn6a1N/bymUHuWYTWeuLUg98wUzvE4jPdCZw=="; + }; + }; + "tough-cookie-2.5.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; + }; + }; + "tough-cookie-3.0.1" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz"; + sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; + }; + }; + "ts-expect-1.1.0" = { + name = "ts-expect"; + packageName = "ts-expect"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-expect/-/ts-expect-1.1.0.tgz"; + sha512 = "cKoBZ47X85x/Qh7taf30m3BhOJOhtNbb7KFHz9CCuWeRSAh0wzprnmiN9TSOQ0FWp3+qDWS5f2FDnxkY93Kdfw=="; + }; + }; + "tslib-1.11.2" = { + name = "tslib"; + packageName = "tslib"; + version = "1.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.11.2.tgz"; + sha512 = "tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg=="; + }; + }; + "tslib-1.14.1" = { + name = "tslib"; + packageName = "tslib"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; + }; + }; + "tslib-2.0.3" = { + name = "tslib"; + packageName = "tslib"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz"; + sha512 = "uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="; + }; + }; + "tsscmp-1.0.6" = { + name = "tsscmp"; + packageName = "tsscmp"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz"; + sha512 = "LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA=="; + }; + }; + "tunnel-0.0.6" = { + name = "tunnel"; + packageName = "tunnel"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz"; + sha512 = "1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="; + }; + }; + "tunnel-agent-0.6.0" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + }; + "tweetnacl-0.14.5" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + }; + "type-1.2.0" = { + name = "type"; + packageName = "type"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; + sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; + }; + }; + "type-2.1.0" = { + name = "type"; + packageName = "type"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type/-/type-2.1.0.tgz"; + sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="; + }; + }; + "type-fest-0.11.0" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz"; + sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; + }; + }; + "type-is-1.6.18" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.18"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "typedarray-to-buffer-3.1.5" = { + name = "typedarray-to-buffer"; + packageName = "typedarray-to-buffer"; + version = "3.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; + }; + }; + "typeorm-0.2.29" = { + name = "typeorm"; + packageName = "typeorm"; + version = "0.2.29"; + src = fetchurl { + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.2.29.tgz"; + sha512 = "ih1vrTe3gEAGKRcWlcsTRxTL7gNjacQE498wVGuJ3ZRujtMqPZlbAWuC7xDzWCRjQnkZYNwZQeG9UgKfxSHB5g=="; + }; + }; + "uc.micro-1.0.6" = { + name = "uc.micro"; + packageName = "uc.micro"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz"; + sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; + }; + }; + "uid-safe-2.1.5" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz"; + sha512 = "KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA=="; + }; + }; + "unc-path-regex-0.1.2" = { + name = "unc-path-regex"; + packageName = "unc-path-regex"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; + sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; + }; + }; + "underscore-1.12.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz"; + sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ=="; + }; + }; + "unique-stream-2.3.1" = { + name = "unique-stream"; + packageName = "unique-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz"; + sha512 = "2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A=="; + }; + }; + "universalify-0.1.2" = { + name = "universalify"; + packageName = "universalify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"; + sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "upper-case-2.0.2" = { + name = "upper-case"; + packageName = "upper-case"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz"; + sha512 = "KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg=="; + }; + }; + "upper-case-first-2.0.2" = { + name = "upper-case-first"; + packageName = "upper-case-first"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz"; + sha512 = "514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg=="; + }; + }; + "uri-js-4.4.0" = { + name = "uri-js"; + packageName = "uri-js"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz"; + sha512 = "B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g=="; + }; + }; + "url-parse-1.4.7" = { + name = "url-parse"; + packageName = "url-parse"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz"; + sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg=="; + }; + }; + "utf7-1.0.2" = { + name = "utf7"; + packageName = "utf7"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz"; + sha1 = "955f490aae653ba220b9456a0a8776c199360991"; + }; + }; + "utf8-2.1.2" = { + name = "utf8"; + packageName = "utf8"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz"; + sha1 = "1fa0d9270e9be850d9b05027f63519bf46457d96"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "uuencode-0.0.4" = { + name = "uuencode"; + packageName = "uuencode"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/uuencode/-/uuencode-0.0.4.tgz"; + sha1 = "c8d50370885663879385ab37e333c7e8e3b0218c"; + }; + }; + "uuid-3.4.0" = { + name = "uuid"; + packageName = "uuid"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; + }; + }; + "validator-11.1.0" = { + name = "validator"; + packageName = "validator"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-11.1.0.tgz"; + sha512 = "qiQ5ktdO7CD6C/5/mYV4jku/7qnqzjrxb3C/Q5wR3vGGinHTgJZN/TdFT3ZX4vXhX2R1PXx42fB1cn5W+uJ4lg=="; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "verror-1.10.0" = { + name = "verror"; + packageName = "verror"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + }; + "vm2-3.9.2" = { + name = "vm2"; + packageName = "vm2"; + version = "3.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.2.tgz"; + sha512 = "nzyFmHdy2FMg7mYraRytc2jr4QBaUY3TEGe3q3bK8EgS9WC98wxn2jrPxS/ruWm+JGzrEIIeufKweQzVoQEd+Q=="; + }; + }; + "which-1.3.1" = { + name = "which"; + packageName = "which"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.3.1.tgz"; + sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; + }; + }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; + "widest-line-3.1.0" = { + name = "widest-line"; + packageName = "widest-line"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz"; + sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; + }; + }; + "wmf-1.0.2" = { + name = "wmf"; + packageName = "wmf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz"; + sha512 = "/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="; + }; + }; + "word-0.3.0" = { + name = "word"; + packageName = "word"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/word/-/word-0.3.0.tgz"; + sha512 = "OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA=="; + }; + }; + "wrap-ansi-4.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz"; + sha512 = "uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg=="; + }; + }; + "wrap-ansi-5.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; + }; + }; + "wrap-ansi-6.2.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; + }; + }; + "wrap-ansi-7.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "ws-7.4.1" = { + name = "ws"; + packageName = "ws"; + version = "7.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz"; + sha512 = "pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ=="; + }; + }; + "xlsx-0.16.9" = { + name = "xlsx"; + packageName = "xlsx"; + version = "0.16.9"; + src = fetchurl { + url = "https://registry.npmjs.org/xlsx/-/xlsx-0.16.9.tgz"; + sha512 = "gxi1I3EasYvgCX1vN9pGyq920Ron4NO8PNfhuoA3Hpq6Y8f0ECXiy4OLrK4QZBnj1jx3QD+8Fq5YZ/3mPZ5iXw=="; + }; + }; + "xml2js-0.4.23" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.4.23"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz"; + sha512 = "ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug=="; + }; + }; + "xmlbuilder-11.0.1" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "11.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz"; + sha512 = "fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="; + }; + }; + "xmldom-0.4.0" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.4.0.tgz"; + sha512 = "2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA=="; + }; + }; + "xpath.js-1.1.0" = { + name = "xpath.js"; + packageName = "xpath.js"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz"; + sha512 = "jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ=="; + }; + }; + "xregexp-2.0.0" = { + name = "xregexp"; + packageName = "xregexp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz"; + sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; + }; + }; + "xtend-4.0.2" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"; + sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; + }; + }; + "y18n-4.0.1" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; + sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; + }; + }; + "y18n-5.0.5" = { + name = "y18n"; + packageName = "y18n"; + version = "5.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz"; + sha512 = "hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg=="; + }; + }; + "yallist-2.1.2" = { + name = "yallist"; + packageName = "yallist"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + }; + "yallist-3.1.1" = { + name = "yallist"; + packageName = "yallist"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + }; + "yallist-4.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + }; + }; + "yargonaut-1.1.4" = { + name = "yargonaut"; + packageName = "yargonaut"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz"; + sha512 = "rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA=="; + }; + }; + "yargs-13.3.0" = { + name = "yargs"; + packageName = "yargs"; + version = "13.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz"; + sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; + }; + }; + "yargs-15.4.1" = { + name = "yargs"; + packageName = "yargs"; + version = "15.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"; + sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; + }; + }; + "yargs-16.1.1" = { + name = "yargs"; + packageName = "yargs"; + version = "16.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-16.1.1.tgz"; + sha512 = "hAD1RcFP/wfgfxgMVswPE+z3tlPFtxG8/yWUrG2i17sTWGCGqWnxKcLTF4cUKDUK8fzokwsmO9H0TDkRbMHy8w=="; + }; + }; + "yargs-parser-13.0.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz"; + sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw=="; + }; + }; + "yargs-parser-13.1.2" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "13.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; + }; + }; + "yargs-parser-18.1.3" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "18.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; + }; + }; + "yargs-parser-20.2.4" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz"; + sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA=="; + }; + }; + }; +in +{ + n8n = nodeEnv.buildNodePackage { + name = "n8n"; + packageName = "n8n"; + version = "0.96.0"; + src = fetchurl { + url = "https://registry.npmjs.org/n8n/-/n8n-0.96.0.tgz"; + sha512 = "HllfTHaD5g98YeGRsGQEeOg1WUUxQr5jnYEWD1qjIWkTVYqVrtEWaEdOxDxnko3Fw7sh2XqtWk1HZHNCRSTQuA=="; + }; + dependencies = [ + sources."@azure/ms-rest-azure-env-1.1.2" + (sources."@azure/ms-rest-js-1.9.0" // { + dependencies = [ + sources."tough-cookie-2.5.0" + ]; + }) + sources."@azure/ms-rest-nodeauth-2.0.2" + (sources."@icetee/ftp-0.3.15" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" + sources."@oclif/command-1.8.0" + (sources."@oclif/config-1.17.0" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + (sources."@oclif/errors-1.3.4" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-7.0.0" + ]; + }) + sources."@oclif/linewrap-1.0.0" + sources."@oclif/parser-3.8.5" + sources."@oclif/plugin-help-3.2.0" + sources."@servie/events-1.0.0" + sources."@sqltools/formatter-1.2.2" + sources."@tokenizer/token-0.1.1" + sources."@types/bluebird-3.5.33" + sources."@types/body-parser-1.19.0" + sources."@types/connect-3.4.33" + sources."@types/debug-4.1.5" + sources."@types/express-4.17.9" + sources."@types/express-jwt-0.0.42" + sources."@types/express-serve-static-core-4.17.14" + sources."@types/express-unless-0.5.1" + sources."@types/ftp-0.3.31" + sources."@types/glob-7.1.3" + sources."@types/jsonwebtoken-8.5.0" + sources."@types/mime-2.0.3" + sources."@types/minimatch-3.0.3" + sources."@types/node-14.14.10" + sources."@types/promise-ftp-1.3.4" + sources."@types/promise-ftp-common-1.1.0" + sources."@types/qs-6.9.5" + sources."@types/range-parser-1.2.3" + sources."@types/readable-stream-2.3.9" + sources."@types/serve-static-1.13.8" + sources."@types/tough-cookie-2.3.7" + sources."@types/tunnel-0.0.0" + sources."abbrev-1.1.1" + sources."accepts-1.3.7" + sources."access-control-1.0.1" + (sources."adal-node-0.1.28" // { + dependencies = [ + sources."@types/node-8.10.66" + ]; + }) + sources."adler-32-1.2.0" + sources."ajv-6.12.6" + sources."ansi-escapes-4.3.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" + sources."ansicolors-0.3.2" + sources."any-promise-1.3.0" + sources."app-root-path-3.0.0" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + (sources."argparse-1.0.10" // { + dependencies = [ + sources."sprintf-js-1.0.3" + ]; + }) + sources."array-flatten-1.1.1" + sources."array-parallel-0.1.3" + sources."array-series-0.1.5" + sources."array-union-2.1.0" + sources."asn1-0.2.4" + sources."assert-options-0.6.2" + sources."assert-plus-1.0.0" + sources."async-3.2.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."axios-0.19.2" + sources."balanced-match-1.0.0" + sources."base64-js-1.5.1" + sources."basic-auth-2.0.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bcryptjs-2.4.3" + sources."bl-2.2.1" + sources."bluebird-2.11.0" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."body-parser-xml-1.1.0" + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."bson-1.1.5" + sources."buffer-5.7.1" + sources."buffer-equal-constant-time-1.0.1" + sources."buffer-from-1.1.1" + sources."buffer-writer-2.0.0" + sources."byte-length-1.0.2" + sources."bytes-3.1.0" + sources."callback-stream-1.1.0" + (sources."camel-case-4.1.2" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."camelcase-5.3.1" + (sources."capital-case-1.0.4" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."cardinal-2.1.1" + sources."caseless-0.12.0" + sources."cfb-1.2.0" + sources."chalk-2.4.2" + (sources."change-case-4.1.2" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."chardet-0.7.0" + sources."cheerio-1.0.0-rc.3" + sources."chownr-1.1.4" + (sources."clean-stack-3.0.1" // { + dependencies = [ + sources."escape-string-regexp-4.0.0" + ]; + }) + sources."cli-cursor-3.1.0" + (sources."cli-highlight-2.1.9" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."cliui-6.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."find-up-4.1.0" + sources."has-flag-4.0.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."parse5-5.1.1" + sources."path-exists-4.0.0" + sources."supports-color-7.2.0" + sources."wrap-ansi-6.2.0" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" + ]; + }) + sources."cli-width-3.0.0" + (sources."client-oauth2-4.3.3" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."wrap-ansi-5.1.0" + ]; + }) + sources."code-point-at-1.1.0" + (sources."codepage-1.14.0" // { + dependencies = [ + sources."commander-2.14.1" + ]; + }) + sources."color-3.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."color-string-1.5.4" + sources."colornames-1.1.1" + sources."colorspace-1.1.2" + sources."combined-stream-1.0.8" + sources."commander-2.17.1" + sources."commist-1.1.0" + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."bytes-3.0.0" + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."connect-history-api-fallback-1.6.0" + sources."console-control-strings-1.1.0" + (sources."constant-case-3.0.4" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."convict-5.2.0" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.2" + sources."crc-32-1.2.0" + sources."cron-1.8.2" + (sources."cross-spawn-4.0.2" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) + sources."crypto-js-4.0.0" + sources."csrf-3.1.0" + sources."css-select-1.2.0" + sources."css-what-2.1.3" + sources."d-1.0.1" + sources."dashdash-1.14.1" + sources."date-utils-1.2.21" + sources."debug-4.3.1" + sources."decamelize-1.2.0" + sources."deep-extend-0.6.0" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" + sources."denque-1.4.1" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."detect-libc-1.0.3" + sources."diagnostics-1.1.1" + sources."dir-glob-3.0.1" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.5.1" + (sources."dot-case-3.0.4" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."dotenv-8.2.0" + sources."double-ended-queue-2.1.0-0" + sources."duplexify-3.7.1" + sources."ecc-jsbn-0.1.2" + sources."ecdsa-sig-formatter-1.0.11" + sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" + sources."enabled-1.0.2" + sources."encodeurl-1.0.2" + sources."encoding-japanese-1.0.30" + sources."end-of-stream-1.4.4" + sources."entities-1.1.2" + sources."env-variable-0.0.6" + sources."es5-ext-0.10.53" + sources."es6-iterator-2.0.3" + sources."es6-map-0.1.5" + (sources."es6-set-0.1.5" // { + dependencies = [ + sources."es6-symbol-3.1.1" + ]; + }) + sources."es6-symbol-3.1.3" + sources."escalade-3.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."eslint-config-riot-1.0.0" + sources."esprima-4.0.1" + sources."etag-1.8.1" + sources."event-emitter-0.3.5" + sources."eventsource-1.0.7" + sources."exit-on-epipe-1.0.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + (sources."ext-1.4.0" // { + dependencies = [ + sources."type-2.1.0" + ]; + }) + sources."extend-3.0.2" + sources."external-editor-3.1.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.4" + sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.9.0" + sources."fflate-0.3.11" + sources."figlet-1.5.0" + sources."figures-3.2.0" + sources."file-type-14.7.1" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) + sources."find-up-3.0.0" + sources."flatted-2.0.2" + (sources."follow-redirects-1.5.10" // { + dependencies = [ + sources."debug-3.1.0" + sources."ms-2.0.0" + ]; + }) + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."formidable-1.2.2" + sources."forwarded-0.1.2" + sources."frac-1.1.2" + sources."fresh-0.5.2" + sources."fs-extra-8.1.0" + sources."fs-minipass-1.2.7" + sources."fs.realpath-1.0.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."generate-function-2.3.1" + sources."get-caller-file-2.0.5" + sources."get-system-fonts-2.0.2" + sources."getpass-0.1.7" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + sources."glob-promise-3.4.0" + (sources."glob-stream-6.1.0" // { + dependencies = [ + sources."glob-parent-3.1.0" + sources."is-glob-3.1.0" + ]; + }) + sources."globby-11.0.1" + (sources."gm-1.23.1" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."google-timezones-json-1.0.2" + sources."graceful-fs-4.2.4" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-flag-3.0.0" + sources."has-unicode-2.0.1" + sources."he-1.2.0" + (sources."header-case-2.0.4" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."help-me-1.1.0" + sources."highlight.js-10.4.1" + sources."html-to-text-5.1.1" + (sources."htmlparser2-3.10.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."http-errors-1.7.2" + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" + sources."ignore-5.1.8" + sources."ignore-walk-3.0.3" + (sources."imap-0.8.19" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + sources."imap-simple-4.3.0" + sources."indent-string-4.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + (sources."inquirer-7.3.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."supports-color-7.2.0" + ]; + }) + sources."ip-regex-2.1.0" + sources."ipaddr.js-1.9.1" + sources."is-absolute-1.0.0" + sources."is-arrayish-0.3.2" + sources."is-buffer-2.0.5" + sources."is-docker-2.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-negated-glob-1.0.0" + sources."is-number-7.0.0" + sources."is-promise-1.0.1" + sources."is-property-1.0.2" + sources."is-relative-1.0.0" + sources."is-typedarray-1.0.0" + sources."is-unc-path-1.0.0" + sources."is-windows-1.0.2" + sources."is-wsl-2.2.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."iso-639-1-2.1.4" + sources."isstream-0.1.2" + sources."js-yaml-3.14.0" + sources."jsbi-3.1.4" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."json-stringify-safe-5.0.1" + sources."json5-2.1.0" + sources."jsonfile-4.0.0" + (sources."jsonwebtoken-8.5.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."jsprim-1.4.1" + sources."jwa-1.4.1" + sources."jwks-rsa-1.9.0" + sources."jws-3.2.2" + sources."kafkajs-1.15.0" + sources."kuler-1.0.1" + sources."leven-2.1.0" + sources."libbase64-1.2.1" + (sources."libmime-5.0.0" // { + dependencies = [ + sources."iconv-lite-0.6.2" + ]; + }) + sources."libqp-1.1.0" + sources."limiter-1.1.5" + sources."linkify-it-3.0.2" + (sources."localtunnel-2.0.0" // { + dependencies = [ + sources."axios-0.19.0" + sources."debug-4.1.1" + ]; + }) + sources."locate-path-3.0.0" + sources."lodash-4.17.20" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.get-4.4.2" + sources."lodash.includes-4.3.0" + sources."lodash.isboolean-3.0.3" + sources."lodash.isinteger-4.0.4" + sources."lodash.isnumber-3.0.3" + sources."lodash.isplainobject-4.0.6" + sources."lodash.isstring-4.0.1" + sources."lodash.once-4.1.1" + sources."lodash.set-4.3.2" + sources."lodash.template-4.5.0" + sources."lodash.templatesettings-4.2.0" + sources."lodash.unset-4.5.2" + sources."long-4.0.0" + (sources."lower-case-2.0.2" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."lru-cache-6.0.0" + (sources."lru-memoizer-2.1.2" // { + dependencies = [ + sources."lru-cache-4.0.2" + sources."yallist-2.1.2" + ]; + }) + (sources."mailparser-2.8.1" // { + dependencies = [ + sources."iconv-lite-0.6.2" + sources."nodemailer-6.4.11" + ]; + }) + (sources."mailsplit-5.0.0" // { + dependencies = [ + sources."iconv-lite-0.5.0" + sources."libmime-4.2.1" + ]; + }) + sources."make-error-1.3.6" + sources."make-error-cause-2.3.0" + sources."media-typer-0.3.0" + sources."memory-pager-1.5.0" + sources."merge-descriptors-1.0.1" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."micromatch-4.0.2" + sources."millisecond-0.1.2" + sources."mime-1.6.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-fn-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + (sources."minipass-2.9.0" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) + sources."minizlib-1.3.3" + sources."mkdirp-0.5.5" + sources."moment-2.24.0" + sources."moment-timezone-0.5.32" + sources."mongodb-3.6.3" + sources."mqtt-4.2.1" + (sources."mqtt-packet-6.6.0" // { + dependencies = [ + sources."bl-4.0.3" + sources."inherits-2.0.4" + sources."readable-stream-3.6.0" + ]; + }) + sources."ms-2.1.2" + sources."mssql-6.2.3" + sources."mute-stream-0.0.8" + (sources."mysql2-2.1.0" // { + dependencies = [ + sources."iconv-lite-0.5.2" + sources."lru-cache-5.1.1" + sources."yallist-3.1.1" + ]; + }) + sources."mz-2.7.0" + sources."n8n-core-0.54.0" + sources."n8n-editor-ui-0.66.0" + (sources."n8n-nodes-base-0.91.0" // { + dependencies = [ + sources."moment-2.28.0" + ]; + }) + sources."n8n-workflow-0.47.0" + (sources."named-placeholders-1.1.2" // { + dependencies = [ + sources."lru-cache-4.1.5" + sources."yallist-2.1.2" + ]; + }) + sources."nan-2.14.2" + sources."native-duplexpair-1.0.0" + (sources."needle-2.5.2" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."negotiator-0.6.2" + sources."next-tick-1.0.0" + (sources."no-case-3.0.4" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."node-ensure-0.0.0" + (sources."node-pre-gyp-0.11.0" // { + dependencies = [ + sources."rimraf-2.7.1" + sources."semver-5.7.1" + ]; + }) + sources."nodeify-1.0.1" + sources."nodemailer-6.4.16" + sources."nopt-4.0.3" + sources."npm-bundled-1.1.1" + sources."npm-normalize-package-bin-1.0.1" + sources."npm-packlist-1.4.8" + sources."npmlog-4.1.2" + sources."nth-check-1.0.2" + sources."number-is-nan-1.0.1" + sources."oauth-1.0a-2.2.6" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."open-7.3.0" + sources."openurl-1.1.1" + sources."ordered-read-streams-1.0.1" + sources."original-1.0.2" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-cancelable-2.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."packet-reader-1.0.0" + (sources."param-case-3.0.4" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."parent-require-1.0.0" + sources."parse5-3.0.3" + (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { + dependencies = [ + sources."parse5-6.0.1" + ]; + }) + sources."parseurl-1.3.3" + (sources."pascal-case-3.1.2" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + (sources."path-case-3.0.4" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" + (sources."pdf-parse-1.1.1" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."peek-readable-3.1.0" + sources."performance-now-2.1.0" + sources."pg-8.5.1" + sources."pg-connection-string-2.4.0" + sources."pg-int8-1.0.1" + sources."pg-minify-1.6.1" + sources."pg-pool-3.2.2" + sources."pg-promise-10.8.1" + sources."pg-protocol-1.4.0" + sources."pg-types-2.2.0" + sources."pgpass-1.0.4" + sources."picomatch-2.2.2" + sources."popsicle-12.1.0" + sources."popsicle-content-encoding-1.0.0" + sources."popsicle-cookie-jar-1.0.0" + sources."popsicle-redirects-1.1.0" + sources."popsicle-transport-http-1.0.9" + sources."popsicle-transport-xhr-2.0.0" + sources."popsicle-user-agent-1.0.0" + sources."postgres-array-2.0.0" + sources."postgres-bytea-1.0.0" + sources."postgres-date-1.0.7" + sources."postgres-interval-1.2.0" + sources."printj-1.1.2" + sources."process-nextick-args-2.0.1" + sources."promise-1.3.0" + sources."promise-ftp-1.3.5" + sources."promise-ftp-common-1.1.5" + sources."proxy-addr-2.0.6" + sources."pseudomap-1.0.2" + sources."psl-1.8.0" + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."qs-6.7.0" + sources."querystringify-2.2.0" + sources."quoted-printable-1.0.1" + sources."random-bytes-1.0.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."rc-1.2.8" + sources."readable-stream-2.3.7" + sources."readable-web-to-node-stream-2.0.0" + sources."redeyed-2.1.1" + sources."redis-2.8.0" + sources."redis-commands-1.6.0" + sources."redis-parser-2.6.0" + sources."reflect-metadata-0.1.13" + sources."reinterval-1.1.0" + sources."remove-trailing-separator-1.1.0" + (sources."request-2.88.2" // { + dependencies = [ + sources."qs-6.5.2" + sources."tough-cookie-2.5.0" + ]; + }) + sources."request-promise-core-1.1.4" + (sources."request-promise-native-1.0.9" // { + dependencies = [ + sources."tough-cookie-2.5.0" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + (sources."require_optional-1.0.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."requires-port-1.0.0" + sources."resolve-from-2.0.0" + sources."restore-cursor-3.1.0" + sources."retry-0.12.0" + sources."reusify-1.0.4" + (sources."rhea-1.0.24" // { + dependencies = [ + sources."debug-3.2.7" + ]; + }) + sources."rimraf-3.0.2" + sources."riot-tmpl-3.0.8" + sources."rndm-1.2.0" + (sources."rss-parser-3.9.0" // { + dependencies = [ + sources."entities-2.1.0" + ]; + }) + sources."run-async-2.4.1" + sources."run-parallel-1.1.10" + sources."rxjs-6.6.3" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."saslprep-1.0.3" + sources."sax-1.2.4" + sources."semver-7.3.4" + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + (sources."sentence-case-3.0.4" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."seq-queue-0.0.5" + sources."serve-static-1.14.1" + sources."servie-4.3.3" + sources."set-blocking-2.0.0" + sources."setheader-1.0.2" + sources."setprototypeof-1.1.1" + sources."sha.js-2.4.11" + sources."signal-exit-3.0.3" + sources."simple-swizzle-0.2.2" + sources."slash-3.0.0" + (sources."snake-case-3.0.4" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."sparse-bitfield-3.0.3" + sources."spex-3.0.2" + (sources."split2-3.2.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."sprintf-js-1.1.2" + sources."sqlite3-4.2.0" + sources."sqlstring-2.3.2" + sources."sse-channel-3.1.1" + sources."ssf-0.11.2" + sources."ssh2-0.8.9" + (sources."ssh2-sftp-client-5.3.2" // { + dependencies = [ + sources."concat-stream-2.0.0" + sources."readable-stream-3.6.0" + ]; + }) + sources."ssh2-streams-0.4.10" + sources."sshpk-1.16.1" + sources."statuses-1.5.0" + sources."stealthy-require-1.1.1" + sources."stream-shift-1.0.1" + sources."streamsearch-0.1.2" + sources."string-width-4.2.0" + sources."string_decoder-1.1.1" + sources."strip-ansi-6.0.0" + sources."strip-json-comments-2.0.1" + sources."strtok3-6.0.4" + sources."supports-color-5.5.0" + (sources."tar-4.4.13" // { + dependencies = [ + sources."yallist-3.1.1" + ]; + }) + sources."tarn-1.1.5" + (sources."tedious-6.7.0" // { + dependencies = [ + sources."@types/node-12.19.8" + sources."bl-3.0.1" + sources."depd-2.0.0" + sources."iconv-lite-0.5.2" + sources."readable-stream-3.6.0" + ]; + }) + sources."text-hex-1.0.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."through-2.3.8" + sources."through2-2.0.5" + sources."through2-filter-3.0.0" + sources."throwback-4.1.0" + sources."tlds-1.208.0" + sources."tmp-0.0.33" + (sources."tmp-promise-3.0.2" // { + dependencies = [ + sources."tmp-0.2.1" + ]; + }) + sources."to-absolute-glob-2.0.2" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" + sources."token-types-2.0.0" + sources."tough-cookie-3.0.1" + sources."ts-expect-1.1.0" + sources."tslib-1.11.2" + sources."tsscmp-1.0.6" + sources."tunnel-0.0.6" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-1.2.0" + sources."type-fest-0.11.0" + sources."type-is-1.6.18" + sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" + (sources."typeorm-0.2.29" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."mkdirp-1.0.4" + sources."supports-color-7.2.0" + sources."tslib-1.14.1" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.5" + sources."yargs-16.1.1" + sources."yargs-parser-20.2.4" + ]; + }) + sources."uc.micro-1.0.6" + sources."uid-safe-2.1.5" + sources."unc-path-regex-0.1.2" + sources."underscore-1.12.0" + sources."unique-stream-2.3.1" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + (sources."upper-case-2.0.2" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + (sources."upper-case-first-2.0.2" // { + dependencies = [ + sources."tslib-2.0.3" + ]; + }) + sources."uri-js-4.4.0" + sources."url-parse-1.4.7" + (sources."utf7-1.0.2" // { + dependencies = [ + sources."semver-5.3.0" + ]; + }) + sources."utf8-2.1.2" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuencode-0.0.4" + sources."uuid-3.4.0" + sources."validator-11.1.0" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."vm2-3.9.2" + sources."which-1.3.1" + sources."which-module-2.0.0" + (sources."wide-align-1.1.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."widest-line-3.1.0" + sources."wmf-1.0.2" + sources."word-0.3.0" + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."wrappy-1.0.2" + sources."ws-7.4.1" + sources."xlsx-0.16.9" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" + sources."xmldom-0.4.0" + sources."xpath.js-1.1.0" + sources."xregexp-2.0.0" + sources."xtend-4.0.2" + sources."y18n-4.0.1" + sources."yallist-4.0.0" + (sources."yargonaut-1.1.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + (sources."yargs-13.3.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + sources."yargs-parser-13.1.2" + ]; + }) + sources."yargs-parser-13.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "n8n Workflow Automation Tool"; + homepage = https://n8n.io/; + license = "SEE LICENSE IN LICENSE.md"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +}
\ No newline at end of file diff --git a/pkgs/applications/networking/n8n/package.json b/pkgs/applications/networking/n8n/package.json new file mode 100644 index 000000000000..ac8d49dfaa41 --- /dev/null +++ b/pkgs/applications/networking/n8n/package.json @@ -0,0 +1,3 @@ +[ + "n8n" +] diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 3eb7f4f57d02..1c536458369d 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -10,11 +10,11 @@ let in buildPythonApplication rec { pname = "todoman"; - version = "3.8.0"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "1aq7f63bhs9dnwzp15nfr07f2ki6s3lnqfap3b09rhchn6lfznwb"; + sha256 = "e7e5cab13ecce0562b1f13f46ab8cbc079caed4b462f2371929f8a4abff2bcbe"; }; nativeBuildInputs = [ 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/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 5f7ee88a029b..07e9647f2c3f 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.16"; + version = "4.1.17"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1dfkvhs0ri5kbyskk730ik8ix5z138qys26b31p6kixd8jjkw3k4"; + sha256 = "1gzff60sn3h05279f9mdi1rkdws52m28shcil16911lvlq6ki13m"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index d7c4b0359662..322f2eb9a3b9 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.52"; + version = "1.3.53"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "18c154080vl25cy4l5amh96abm6kzm7mzld9h58pabc28yqq8zl8"; + sha256 = "1m0fa891scpaf719002w9gpg1famx84kpzav1mw1fafmbzyvjw1i"; }; buildInputs = [ diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index cc89ffb4f870..d7e2d44c75ce 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { orc pkgconfig pythonPackages.Mako + pythonPackages.six # UHD support is optional, but gnuradio is built with it, so there's # nothing to be gained by leaving it out. diff --git a/pkgs/applications/radio/gnuradio/3.7.nix b/pkgs/applications/radio/gnuradio/3.7.nix new file mode 100644 index 000000000000..54fb0d7d66cd --- /dev/null +++ b/pkgs/applications/radio/gnuradio/3.7.nix @@ -0,0 +1,295 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +# Remove gcc and python references +, removeReferencesTo +, pkgconfig +, cppunit +, swig +, orc +, boost +, log4cpp +, mpir +, doxygen +, python +, codec2 +, gsm +, fftwFloat +, alsaLib +, libjack2 +, CoreAudio +, uhd +, comedilib +, libusb1 +, SDL +, gsl +, cppzmq +, zeromq +# GUI related +, gtk2 +, pango +, cairo +, qt4 +, qwt6_qt4 +# Features available to override, the list of them is in featuresInfo. They +# are all turned on by default +, features ? {} +# If one wishes to use a different src or name for a very custom build +, overrideSrc ? {} +, pname ? "gnuradio" +, versionAttr ? { + major = "3.7"; + minor = "14"; + patch = "0"; +} +, fetchSubmodules ? true +}: + +let + sourceSha256 = "1nh4f9dmygprlbqybd3j1byg9fsr6065n140mvc4b0v8qqygmhrc"; + featuresInfo = { + # Needed always + basic = { + native = [ + cmake + pkgconfig + orc + ]; + runtime = [ boost log4cpp mpir ]; + pythonNative = with python.pkgs; [ Mako six ]; + }; + volk = { + cmakeEnableFlag = "VOLK"; + }; + doxygen = { + native = [ doxygen ]; + cmakeEnableFlag = "DOXYGEN"; + }; + sphinx = { + pythonNative = with python.pkgs; [ sphinx ]; + cmakeEnableFlag = "SPHINX"; + }; + python-support = { + pythonRuntime = [ python.pkgs.six ]; + native = [ + swig + python + ]; + cmakeEnableFlag = "PYTHON"; + }; + testing-support = { + native = [ cppunit ]; + cmakeEnableFlag = "TESTING"; + }; + gnuradio-runtime = { + cmakeEnableFlag = "GNURADIO_RUNTIME"; + }; + gr-ctrlport = { + cmakeEnableFlag = "GR_CTRLPORT"; + native = [ + swig + ]; + }; + gnuradio-companion = { + pythonRuntime = with python.pkgs; [ + pyyaml + cheetah + lxml + pygtk + numpy + # propagated by pygtk, but since wrapping is done externally, it help + # the wrapper if it's here + pycairo + pygobject2 + ]; + runtime = [ + gtk2 + pango + cairo + ]; + cmakeEnableFlag = "GRC"; + }; + gr-blocks = { + cmakeEnableFlag = "GR_BLOCKS"; + }; + gr-fec = { + cmakeEnableFlag = "GR_FEC"; + }; + gr-fft = { + runtime = [ fftwFloat ]; + cmakeEnableFlag = "GR_FFT"; + }; + gr-filter = { + runtime = [ fftwFloat ]; + cmakeEnableFlag = "GR_FILTER"; + }; + gr-analog = { + cmakeEnableFlag = "GR_ANALOG"; + }; + gr-digital = { + cmakeEnableFlag = "GR_DIGITAL"; + }; + gr-dtv = { + cmakeEnableFlag = "GR_DTV"; + }; + gr-atsc = { + cmakeEnableFlag = "GR_ATSC"; + }; + gr-audio = { + runtime = [] + ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ] + ; + cmakeEnableFlag = "GR_AUDIO"; + }; + gr-comedi = { + runtime = [ comedilib ]; + cmakeEnableFlag = "GR_COMEDI"; + }; + gr-channels = { + cmakeEnableFlag = "GR_CHANNELS"; + }; + gr-noaa = { + cmakeEnableFlag = "GR_NOAA"; + }; + gr-pager = { + cmakeEnableFlag = "GR_PAGER"; + }; + gr-qtgui = { + runtime = [ qt4 qwt6_qt4 ]; + pythonRuntime = [ python.pkgs.pyqt4 ]; + cmakeEnableFlag = "GR_QTGUI"; + }; + gr-trellis = { + cmakeEnableFlag = "GR_TRELLIS"; + }; + gr-uhd = { + runtime = [ uhd ]; + cmakeEnableFlag = "GR_UHD"; + }; + gr-utils = { + cmakeEnableFlag = "GR_UTILS"; + }; + gr-video-sdl = { + runtime = [ SDL ]; + cmakeEnableFlag = "GR_VIDEO_SDL"; + }; + gr-vocoder = { + runtime = [ codec2 gsm ]; + cmakeEnableFlag = "GR_VOCODER"; + }; + gr-fcd = { + runtime = [ libusb1 ]; + cmakeEnableFlag = "GR_FCD"; + }; + gr-wavelet = { + cmakeEnableFlag = "GR_WAVELET"; + runtime = [ gsl ]; + }; + gr-zeromq = { + runtime = [ cppzmq zeromq ]; + cmakeEnableFlag = "GR_ZEROMQ"; + }; + gr-wxgui = { + pythonRuntime = with python.pkgs; [ numpy wxPython ]; + cmakeEnableFlag = "GR_WXGUI"; + }; + }; + shared = (import ./shared.nix { + inherit + stdenv + python + removeReferencesTo + featuresInfo + features + versionAttr + sourceSha256 + overrideSrc + fetchFromGitHub + fetchSubmodules + ; + qt = qt4; + gtk = gtk2; + }); + inherit (shared) + version + src + hasFeature # function + nativeBuildInputs + buildInputs + disallowedReferences + postInstall + passthru + doCheck + dontWrapPythonPrograms + meta + ; + cmakeFlags = shared.cmakeFlags + # From some reason, if these are not set, libcodec2 and gsm are + # not detected properly (slightly different then what's in + # ./default.nix). + ++ stdenv.lib.optionals (hasFeature "gr-vocoder" features) [ + "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" + "-DLIBCODEC2_INCLUDE_DIR=${codec2}/include" + "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" + "-DLIBGSM_INCLUDE_DIR=${gsm}/include/gsm" + ] + ; + stripDebugList = shared.stripDebugList + # gr-fcd feature was dropped in 3.8 + ++ stdenv.lib.optionals (hasFeature "gr-fcd" features) [ "share/gnuradio/examples/fcd" ] + ; + preConfigure = '' + '' + # wxgui and pygtk are not looked up properly, so we force them to be + # detected as found, if they are requested by the `features` attrset. + + stdenv.lib.optionalString (hasFeature "gr-wxgui" features) '' + sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt + '' + + stdenv.lib.optionalString (hasFeature "gnuradio-companion" features) '' + sed -i 's/.*pygtk_version.*/set(PYGTK_FOUND TRUE)/g' grc/CMakeLists.txt + '' + # If python-support is disabled, don't install volk's (git submodule) + # volk_modtool - it references python. + # + # NOTE: The same is done for 3.8, but we don't put this string in + # ./shared.nix since on the next release of 3.8 it won't be needed there, + # but it will be needed for 3.7, probably for ever. + + stdenv.lib.optionalString (!hasFeature "python-support" features) '' + sed -i -e "/python\/volk_modtool/d" volk/CMakeLists.txt + '' + ; + patches = [ + # Don't install python referencing files if python support is disabled. + # See: https://github.com/gnuradio/gnuradio/pull/3856 + (fetchpatch { + url = "https://github.com/gnuradio/gnuradio/commit/acef55433d15c231661fa44751f9a2d90a4baa4b.diff"; + sha256 = "2CEX44Ll8frfLXTIWjdDhKl7aXcjiAWsezVdwrynelE="; + }) + (fetchpatch { + url = "https://github.com/gnuradio/gnuradio/commit/a2681edcfaabcb1ecf878ae861161b6a6bf8459d.diff"; + sha256 = "2Pitgu8accs16B5X5+/q51hr+IY9DMsA15f56gAtBs8="; + }) + ]; +in + +stdenv.mkDerivation rec { + inherit + pname + version + src + nativeBuildInputs + buildInputs + cmakeFlags + preConfigure + # disallowedReferences + stripDebugList + patches + postInstall + passthru + doCheck + dontWrapPythonPrograms + meta + ; +} diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index 30c2638a72f8..46d46d1c3255 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio -, makeWrapper, cppunit, gr-osmosdr +, makeWrapper, cppunit, gr-osmosdr, log4cpp , pythonSupport ? true, python, swig }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost gnuradio makeWrapper cppunit gr-osmosdr + cmake boost gnuradio makeWrapper cppunit gr-osmosdr log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index dec968cd32d7..811eb37f4f31 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -1,165 +1,288 @@ { stdenv , fetchFromGitHub -, makeWrapper -, writeText -# Dependencies documented @ https://gnuradio.org/doc/doxygen/build_guide.html -# => core dependencies +, fetchpatch , cmake +# Remove gcc and python references +, removeReferencesTo , pkgconfig -, git -, boost , cppunit -, fftw -# => python wrappers -# May be able to upgrade to swig3 +, swig +, orc +, boost +, log4cpp +, mpir +, doxygen , python -, swig2 -, numpy -, scipy -, matplotlib -# => grc - the gnu radio companion -, Mako -, cheetah -, pygtk # Note: GR is migrating to Mako. Cheetah should be removed for GR3.8 -# => gr-wavelet: collection of wavelet blocks -, gsl -# => gr-qtgui: the Qt-based GUI -, qt4 -, qwt -, pyqt4 -# => gr-wxgui: the Wx-based GUI -, wxPython -, lxml -# => gr-audio: audio subsystems (system/OS dependent) -, alsaLib # linux 'audio-alsa' -, CoreAudio # darwin 'audio-osx' -# => uhd: the Ettus USRP Hardware Driver Interface +, codec2 +, gsm +, fftwFloat +, alsaLib +, libjack2 +, CoreAudio , uhd -# => gr-video-sdl: PAL and NTSC display , SDL -# Other -, libusb1 -, orc -, pyopengl +, gsl +, cppzmq +, zeromq +# GUI related +, gtk3 +, pango +, gobject-introspection +, cairo +, qt5 +, libsForQt5 +# Features available to override, the list of them is in featuresInfo. They +# are all turned on by default. +, features ? {} +# If one wishes to use a different src or name for a very custom build +, overrideSrc ? {} +, pname ? "gnuradio" +, versionAttr ? { + major = "3.8"; + minor = "2"; + patch = "0"; +} +# Should be false on the release after 3.8.2.0 +, fetchSubmodules ? true }: -stdenv.mkDerivation rec { - pname = "gnuradio"; - version = "3.7.14.0"; - - src = fetchFromGitHub { - owner = "gnuradio"; - repo = "gnuradio"; - rev = "v${version}"; - sha256 = "1nh4f9dmygprlbqybd3j1byg9fsr6065n140mvc4b0v8qqygmhrc"; - fetchSubmodules = true; +let + sourceSha256 = "1mnfwdy7w3160vi6110x2qkyq8l78qi8771zwak9n72bl7lhhpnf"; + featuresInfo = { + # Needed always + basic = { + native = [ + cmake + pkgconfig + orc + ]; + runtime = [ + boost + log4cpp + mpir + ]; + pythonNative = with python.pkgs; [ + Mako + six + ]; + }; + # NOTE: Should be removed on the release after 3.8.2.0, see: + # https://github.com/gnuradio/gnuradio/commit/80c04479d + volk = { + cmakeEnableFlag = "VOLK"; + }; + doxygen = { + native = [ doxygen ]; + cmakeEnableFlag = "DOXYGEN"; + }; + sphinx = { + pythonNative = with python.pkgs; [ sphinx ]; + cmakeEnableFlag = "SPHINX"; + }; + python-support = { + pythonRuntime = [ python.pkgs.six ]; + native = [ + swig + python + ]; + cmakeEnableFlag = "PYTHON"; + }; + testing-support = { + native = [ cppunit ]; + cmakeEnableFlag = "TESTING"; + }; + gnuradio-runtime = { + cmakeEnableFlag = "GNURADIO_RUNTIME"; + }; + gr-ctrlport = { + # Thrift support is not really working well, and even the patch they + # recommend applying on 0.9.2 won't apply. See: + # https://github.com/gnuradio/gnuradio/blob/v3.8.2.0/gnuradio-runtime/lib/controlport/thrift/README + cmakeEnableFlag = "GR_CTRLPORT"; + native = [ + swig + ]; + }; + gnuradio-companion = { + pythonRuntime = with python.pkgs; [ + pyyaml + Mako + numpy + pygobject3 + ]; + runtime = [ + gtk3 + pango + gobject-introspection + cairo + ]; + cmakeEnableFlag = "GRC"; + }; + gr-blocks = { + cmakeEnableFlag = "GR_BLOCKS"; + }; + gr-fec = { + cmakeEnableFlag = "GR_FEC"; + }; + gr-fft = { + runtime = [ fftwFloat ]; + cmakeEnableFlag = "GR_FFT"; + }; + gr-filter = { + runtime = [ fftwFloat ]; + cmakeEnableFlag = "GR_FILTER"; + }; + gr-analog = { + cmakeEnableFlag = "GR_ANALOG"; + }; + gr-digital = { + cmakeEnableFlag = "GR_DIGITAL"; + }; + gr-dtv = { + cmakeEnableFlag = "GR_DTV"; + }; + gr-audio = { + runtime = [] + ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib libjack2 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ] + ; + cmakeEnableFlag = "GR_AUDIO"; + }; + gr-channels = { + cmakeEnableFlag = "GR_CHANNELS"; + }; + gr-qtgui = { + runtime = [ qt5.qtbase libsForQt5.qwt ]; + pythonRuntime = [ python.pkgs.pyqt5 ]; + cmakeEnableFlag = "GR_QTGUI"; + }; + gr-trellis = { + cmakeEnableFlag = "GR_TRELLIS"; + }; + gr-uhd = { + runtime = [ uhd ]; + cmakeEnableFlag = "GR_UHD"; + }; + gr-utils = { + cmakeEnableFlag = "GR_UTILS"; + }; + gr-modtool = { + pythonRuntime = with python.pkgs; [ + click + click-plugins + ]; + cmakeEnableFlag = "GR_MODTOOL"; + }; + gr-video-sdl = { + runtime = [ SDL ]; + cmakeEnableFlag = "GR_VIDEO_SDL"; + }; + gr-vocoder = { + runtime = [ codec2 gsm ]; + cmakeEnableFlag = "GR_VOCODER"; + }; + gr-wavelet = { + cmakeEnableFlag = "GR_WAVELET"; + runtime = [ gsl ]; + }; + gr-zeromq = { + runtime = [ cppzmq zeromq ]; + cmakeEnableFlag = "GR_ZEROMQ"; + }; }; + shared = (import ./shared.nix { + inherit + stdenv + python + removeReferencesTo + featuresInfo + features + versionAttr + sourceSha256 + overrideSrc + fetchFromGitHub + fetchSubmodules + ; + qt = qt5; + gtk = gtk3; + }); + inherit (shared) + version + src + hasFeature # function + nativeBuildInputs + buildInputs + disallowedReferences + stripDebugList + passthru + doCheck + dontWrapPythonPrograms + meta + ; + cmakeFlags = shared.cmakeFlags + # From some reason, if these are not set, libcodec2 and gsm are not + # detected properly. NOTE: qradiolink needs libcodec2 to be detected in + # order to build, see https://github.com/qradiolink/qradiolink/issues/67 + ++ stdenv.lib.optionals (hasFeature "gr-vocoder" features) [ + "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" + "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" + "-DLIBCODEC2_HAS_FREEDV_API=ON" + "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" + "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" + ] + ; - nativeBuildInputs = [ - cmake - pkgconfig - git - makeWrapper - cppunit - orc - ]; - - buildInputs = [ - boost - fftw - python - swig2 - lxml - qt4 - qwt - SDL - libusb1 - uhd - gsl - ] ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib ] - ++ stdenv.lib.optionals stdenv.isDarwin [ CoreAudio ]; - - propagatedBuildInputs = [ - Mako - cheetah - numpy - scipy - matplotlib - pyqt4 - pygtk - wxPython - pyopengl - ]; - - NIX_LDFLAGS = "-lpthread"; - - enableParallelBuilding = true; - - postPatch = '' - substituteInPlace \ - gr-fec/include/gnuradio/fec/polar_decoder_common.h \ - --replace BOOST_CONSTEXPR_OR_CONST const - ''; - - # Enables composition with nix-shell - grcSetupHook = writeText "grcSetupHook.sh" '' - addGRCBlocksPath() { - addToSearchPath GRC_BLOCKS_PATH $1/share/gnuradio/grc/blocks - } - addEnvHooks "$targetOffset" addGRCBlocksPath - ''; - - setupHook = [ grcSetupHook ]; - - # patch wxgui and pygtk check due to python importerror in a headless environment - # wxgtk gui will be removed in GR3.8 - # c++11 hack may not be necessary anymore + postInstall = shared.postInstall + # This is the only python reference worth removing, if needed (3.7 doesn't + # set that reference). + + stdenv.lib.optionalString (!hasFeature "python-support" features) '' + ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake + '' + ; preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable ${stdenv.lib.optionalString (!stdenv.isDarwin) "-std=c++11"}" - sed -i 's/.*wx\.version.*/set(WX_FOUND TRUE)/g' gr-wxgui/CMakeLists.txt - sed -i 's/.*pygtk_version.*/set(PYGTK_FOUND TRUE)/g' grc/CMakeLists.txt - find . -name "CMakeLists.txt" -exec sed -i '1iadd_compile_options($<$<COMPILE_LANGUAGE:CXX>:-std=c++11>)' "{}" ";" - ''; - - # Framework path needed for qwt6_qt4 but not qwt5 - cmakeFlags = - stdenv.lib.optionals stdenv.isDarwin [ "-DCMAKE_FRAMEWORK_PATH=${qwt}/lib" ]; - - # - Ensure we get an interactive backend for matplotlib. If not the gr_plot_* - # programs will not display anything. Yes, $MATPLOTLIBRC must point to the - # *dirname* where matplotlibrc is located, not the file itself. - # - GNU Radio core is C++ but the user interface (GUI and API) is Python, so - # we must wrap the stuff in bin/. - # Notes: - # - May want to use makeWrapper instead of wrapProgram - # - may want to change interpreter path on Python examples instead of wrapping - # - see https://github.com/NixOS/nixpkgs/issues/22688 regarding use of --prefix / python.withPackages - # - see https://github.com/NixOS/nixpkgs/issues/24693 regarding use of DYLD_FRAMEWORK_PATH on Darwin - postInstall = '' - printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc" - - for file in $(find $out/bin $out/share/gnuradio/examples -type f -executable); do - wrapProgram "$file" \ - --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ - --set MATPLOTLIBRC "$out/share/gnuradio" \ - ${stdenv.lib.optionalString stdenv.isDarwin "--set DYLD_FRAMEWORK_PATH /System/Library/Frameworks"} - done - ''; + '' + # If python-support is disabled, don't install volk's (git submodule) + # volk_modtool - it references python. + # + # NOTE: on the next release, volk will always be required to be installed + # externally (submodule removed upstream). Hence this hook will fail and + # we'll need to package volk while able to tell it to install or not + # install python referencing files. When we'll be there, this will help: + # https://github.com/gnuradio/volk/pull/404 + + stdenv.lib.optionalString (!hasFeature "python-support" features) '' + sed -i -e "/python\/volk_modtool/d" volk/CMakeLists.txt + '' + ; + patches = [ + # Don't install python referencing files if python support is disabled. + # See: https://github.com/gnuradio/gnuradio/pull/3839 + (fetchpatch { + url = "https://github.com/gnuradio/gnuradio/commit/4a4fd570b398b0b50fe875fcf0eb9c9db2ea5c6e.diff"; + sha256 = "xz2E0ji6zfdOAhjfPecAcaVOIls1XP8JngLkBbBBW5Q="; + }) + (fetchpatch { + url = "https://github.com/gnuradio/gnuradio/commit/dbc8ad7e7361fddc7b1dbc267c07a776a3f9664b.diff"; + sha256 = "tQcCpcUbJv3yqAX8rSHN/pAuBq4ueEvoVo7sNzZGvf4="; + }) + ]; +in - meta = with stdenv.lib; { - description = "Software Defined Radio (SDR) software"; - longDescription = '' - GNU Radio is a free & open-source software development toolkit that - provides signal processing blocks to implement software radios. It can be - used with readily-available low-cost external RF hardware to create - software-defined radios, or without hardware in a simulation-like - environment. It is widely used in hobbyist, academic and commercial - environments to support both wireless communications research and - real-world radio systems. - ''; - homepage = "https://www.gnuradio.org"; - license = licenses.gpl3; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor fpletz ]; - }; +stdenv.mkDerivation rec { + inherit + pname + version + src + nativeBuildInputs + buildInputs + cmakeFlags + preConfigure + # disallowedReferences + stripDebugList + patches + postInstall + passthru + doCheck + dontWrapPythonPrograms + meta + ; } diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index e0b8d7dd44f7..4e2406fc07a0 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, log4cpp , makeWrapper, cppunit, libosmocore, gr-osmosdr , pythonSupport ? true, python, swig }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr + cmake boost gnuradio makeWrapper cppunit libosmocore gr-osmosdr log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index 490caaaa7bea..b2f99164bec6 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio -, pythonSupport ? true, python, swig, limesuite +, pythonSupport ? true, python, swig, limesuite, log4cpp } : assert pythonSupport -> python != null && swig != null; @@ -24,7 +24,7 @@ in stdenv.mkDerivation { ] ++ stdenv.lib.optionals pythonSupport [ swig ]; buildInputs = [ - boost gnuradio limesuite + boost gnuradio limesuite log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python ]; diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index e3d851e2e14a..3435d5cdb4f0 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd -, makeWrapper, libsodium, cppunit +, makeWrapper, libsodium, cppunit, log4cpp , pythonSupport ? true, python, swig }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost gnuradio uhd makeWrapper libsodium cppunit + cmake boost gnuradio uhd makeWrapper libsodium cppunit log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index ad54fc8d7c4f..9eb6fe648d02 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -8,6 +8,7 @@ , rtl-sdr , soapysdr-with-plugins , uhd +, log4cpp }: assert pythonSupport -> python != null && swig != null; @@ -24,10 +25,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake makeWrapper boost + cmake makeWrapper boost log4cpp airspy gnuradio hackrf libbladeRF rtl-sdr uhd ] ++ stdenv.lib.optionals stdenv.isLinux [ soapysdr-with-plugins ] - ++ stdenv.lib.optionals pythonSupport [ python swig ]; + ++ stdenv.lib.optionals pythonSupport [ python swig python.pkgs.cheetah ]; postInstall = '' for prog in "$out"/bin/*; do diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index 1f8ed211ef29..72838569bb3b 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, log4cpp , makeWrapper, pythonSupport ? true, python, swig }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake boost gnuradio makeWrapper + cmake boost gnuradio makeWrapper log4cpp ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; postInstall = '' diff --git a/pkgs/applications/radio/gnuradio/shared.nix b/pkgs/applications/radio/gnuradio/shared.nix new file mode 100644 index 000000000000..66ce0a5f5132 --- /dev/null +++ b/pkgs/applications/radio/gnuradio/shared.nix @@ -0,0 +1,135 @@ +{ stdenv +, python +, qt +, gtk +, removeReferencesTo +, featuresInfo +, features +, versionAttr +, sourceSha256 +# If overriden. No need to set default values, as they are given defaults in +# the main expressions +, overrideSrc +, fetchFromGitHub +, fetchSubmodules +}: + +let + lib = stdenv.lib; +in rec { + version = builtins.concatStringsSep "." ( + lib.attrVals [ "major" "minor" "patch" ] versionAttr + ); + src = if overrideSrc != {} then + overrideSrc + else + fetchFromGitHub { + repo = "gnuradio"; + owner = "gnuradio"; + rev = "v${version}"; + sha256 = sourceSha256; + inherit fetchSubmodules; + } + ; + # Check if a feature is enabled, while defaulting to true if feat is not + # specified. + hasFeature = feat: features: ( + if builtins.hasAttr feat features then + features.${feat} + else + true + ); + nativeBuildInputs = lib.flatten (lib.mapAttrsToList ( + feat: info: ( + if hasFeature feat features then + (if builtins.hasAttr "native" info then info.native else []) ++ + (if builtins.hasAttr "pythonNative" info then info.pythonNative else []) + else + [] + ) + ) featuresInfo); + buildInputs = lib.flatten (lib.mapAttrsToList ( + feat: info: ( + if hasFeature feat features then + (if builtins.hasAttr "runtime" info then info.runtime else []) ++ + (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) + else + [] + ) + ) featuresInfo); + cmakeFlags = lib.mapAttrsToList ( + feat: info: ( + if feat == "basic" then + # Abuse this unavoidable "iteration" to set this flag which we want as + # well - it means: Don't turn on features just because their deps are + # satisfied, let only our cmakeFlags decide. + "-DENABLE_DEFAULT=OFF" + else + if hasFeature feat features then + "-DENABLE_${info.cmakeEnableFlag}=ON" + else + "-DENABLE_${info.cmakeEnableFlag}=OFF" + )) featuresInfo + ; + disallowedReferences = [ + # TODO: Should this be conditional? + stdenv.cc + stdenv.cc.cc + ] + # If python-support is disabled, we probably don't want it referenced + ++ lib.optionals (!hasFeature "python-support" features) [ python ] + ; + # Gcc references from examples + stripDebugList = [ "lib" "bin" ] + ++ lib.optionals (hasFeature "gr-audio" features) [ "share/gnuradio/examples/audio" ] + ++ lib.optionals (hasFeature "gr-uhd" features) [ "share/gnuradio/examples/uhd" ] + ++ lib.optionals (hasFeature "gr-qtgui" features) [ "share/gnuradio/examples/qt-gui" ] + ; + postInstall = '' + '' + # Gcc references + + lib.optionalString (hasFeature "volk" features) '' + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so) + '' + + lib.optionalString (hasFeature "gnuradio-runtime" features) '' + ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libgnuradio-runtime.so) + '' + ; + # NOTE: Outputs are disabled due to upstream not using GNU InstallDIrs cmake + # module. It's not that bad since it's a development package for most + # purposes. If closure size needs to be reduced, features should be disabled + # via an override. + passthru = { + inherit + hasFeature + versionAttr + features + featuresInfo + python + qt + gtk + ; + }; + # Wrapping is done with an external wrapper + dontWrapPythonPrograms = true; + # Tests should succeed, but it's hard to get LD_LIBRARY_PATH right in order + # for it to happen. + doCheck = false; + + meta = with lib; { + description = "Software Defined Radio (SDR) software"; + longDescription = '' + GNU Radio is a free & open-source software development toolkit that + provides signal processing blocks to implement software radios. It can be + used with readily-available low-cost external RF hardware to create + software-defined radios, or without hardware in a simulation-like + environment. It is widely used in hobbyist, academic and commercial + environments to support both wireless communications research and + real-world radio systems. + ''; + homepage = "https://www.gnuradio.org"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ doronbehar bjornfor fpletz ]; + }; +} diff --git a/pkgs/applications/radio/gnuradio/wrapper.nix b/pkgs/applications/radio/gnuradio/wrapper.nix index ffed3da03187..6b854918f571 100644 --- a/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/pkgs/applications/radio/gnuradio/wrapper.nix @@ -1,24 +1,134 @@ -{ stdenv, gnuradio, makeWrapper, python, extraPackages ? [] }: +{ stdenv +, unwrapped +, makeWrapper +# For lndir +, xorg +# For Emulating wrapGAppsHook +, gsettings-desktop-schemas +, glib +, hicolor-icon-theme +, pango +, json-glib +, dconf +, gobject-introspection +, librsvg +, gdk-pixbuf +, harfbuzz +, at-spi2-core +, atk +# For Adding additional GRC blocks +, extraPackages ? [] +# For Adding additional python packaages +, extraPythonPackages ? [] +# Allow to add whatever you want to the wrapper +, extraMakeWrapperArgs ? [] +}: -with { inherit (stdenv.lib) appendToName makeSearchPath; }; +let + pythonPkgs = extraPythonPackages + # Add the extraPackages as python modules as well + ++ (builtins.map unwrapped.python.pkgs.toPythonModule extraPackages) + ++ stdenv.lib.flatten (stdenv.lib.mapAttrsToList ( + feat: info: ( + if unwrapped.hasFeature feat unwrapped.features then + (if builtins.hasAttr "pythonRuntime" info then info.pythonRuntime else []) + else + [] + ) + ) unwrapped.featuresInfo) + ++ stdenv.lib.optionals (unwrapped.hasFeature "python-support" unwrapped.features) [ + # Add unwrapped itself as a python module + (unwrapped.python.pkgs.toPythonModule unwrapped) + ] + ; + python3Env = unwrapped.python.withPackages(ps: pythonPkgs); + name = (stdenv.lib.appendToName "wrapped" unwrapped).name; + makeWrapperArgs = builtins.concatStringsSep " " ([ + ] + # Emulating wrapGAppsHook & wrapQtAppsHook working together + ++ stdenv.lib.optionals ( + (unwrapped.hasFeature "gnuradio-companion" unwrapped.features) + || (unwrapped.hasFeature "gr-qtgui" unwrapped.features) + ) [ + "--prefix" "XDG_DATA_DIRS" ":" "$out/share" + "--prefix" "XDG_DATA_DIRS" ":" "$out/share/gsettings-schemas/${name}" + "--prefix" "XDG_DATA_DIRS" ":" "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" + "--prefix" "XDG_DATA_DIRS" ":" "${hicolor-icon-theme}/share" + # Needs to run `gsettings` on startup, see: + # https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1764890.html + "--prefix" "PATH" ":" "${stdenv.lib.getBin glib}/bin" + ] + ++ stdenv.lib.optionals (unwrapped.hasFeature "gnuradio-companion" unwrapped.features) [ + "--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache" + "--prefix" "GIO_EXTRA_MODULES" ":" "${stdenv.lib.getLib dconf}/lib/gio/modules" + "--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk}/share" + "--prefix" "XDG_DATA_DIRS" ":" "${unwrapped.gtk}/share/gsettings-schemas/${unwrapped.gtk.name}" + "--prefix" "GI_TYPELIB_PATH" ":" "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ + unwrapped.gtk + gsettings-desktop-schemas + atk + # From some reason, if .out is not used, .bin is used, and we want + # what's in `.out`. + pango.out + gdk-pixbuf + json-glib + harfbuzz + librsvg + gobject-introspection + at-spi2-core + ]}" + ] + ++ stdenv.lib.optionals (extraPackages != []) [ + "--prefix" "GRC_BLOCKS_PATH" ":" "${stdenv.lib.makeSearchPath "share/gnuradio/grc/blocks" extraPackages}" + ] + ++ stdenv.lib.optionals (unwrapped.hasFeature "gr-qtgui" unwrapped.features) + # 3.7 builds with qt4 + (if unwrapped.versionAttr.major == "3.8" then + [ + "--prefix" "QT_PLUGIN_PATH" ":" + "${stdenv.lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtPluginPrefix}" + "--prefix" "QML2_IMPORT_PATH" ":" + "${stdenv.lib.getBin unwrapped.qt.qtbase}/${unwrapped.qt.qtbase.qtQmlPrefix}" + ] + else + # TODO: Add here qt4 related environment for 3.7? + [ + + ] + ) + ++ extraMakeWrapperArgs + ); +in stdenv.mkDerivation { - name = (appendToName "with-packages" gnuradio).name; - buildInputs = [ makeWrapper python ]; + inherit name; - buildCommand = '' - mkdir -p $out/bin - ln -s "${gnuradio}"/bin/* $out/bin/ + buildInputs = [ + makeWrapper + xorg.lndir + ]; - for file in $(find -L $out/bin -type f); do - if test -x "$(readlink -f "$file")"; then - wrapProgram "$file" \ - --prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":" - (map (path: "$(toPythonPath ${path})") extraPackages)} \ - --prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages} - fi + passthru = { + inherit python3Env pythonPkgs unwrapped; + }; + + buildCommand = '' + mkdir $out + cd $out + lndir -silent ${unwrapped} + for i in $out/bin/*; do + if [[ ! -x "$i" ]]; then + continue + fi + cp -L "$i" "$i".tmp + mv -f "$i".tmp "$i" + if head -1 "$i" | grep -q ${unwrapped.python}; then + substituteInPlace "$i" \ + --replace ${unwrapped.python} ${python3Env} + fi + wrapProgram "$i" ${makeWrapperArgs} done ''; - inherit (gnuradio) meta; + inherit (unwrapped) meta; } 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/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index 9d6ffbd439c4..7320deaf4ce4 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -1,11 +1,13 @@ -{ stdenv +{ stdenv , fetchFromGitHub +, fetchpatch , qttools , qtmultimedia , liblo , gst_all_1 , qmake , pkgconfig +, wrapQtAppsHook }: with stdenv; @@ -25,6 +27,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkgconfig + wrapQtAppsHook ]; buildInputs = [ @@ -37,6 +40,14 @@ mkDerivation rec { gst_all_1.gst-vaapi ]; + patches = [ + (fetchpatch { + name = "message-handler-segfault.patch"; + url = "https://github.com/mapmapteam/mapmap/pull/519/commits/22eeee59ba7de6de7b73ecec3b0ea93bdc7f04e8.patch"; + sha256 = "0is905a4lf9vvl5b1n4ky6shrnbs5kz9mlwfk78hrl4zabfmcl5l"; + }) + ]; + installPhase = '' mkdir -p $out/bin cp mapmap $out/bin/mapmap @@ -57,8 +68,6 @@ mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.erictapen ]; platforms = platforms.linux; - # binary segfaults at the moment - broken = true; }; } 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/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 44748f231bc2..a1744b48deb9 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -48,8 +48,15 @@ + extraPostFetch # Remove write permissions for files unpacked with write bits set # Fixes https://github.com/NixOS/nixpkgs/issues/38649 + # + # However, we should (for the moment) retain write permission on the directory + # itself, to avoid tickling https://github.com/NixOS/nix/issues/4295 in + # single-user Nix installations. This is because in sandbox mode we'll try to + # move the path, and if we don't have write permissions on the directory, + # then we can't update the ".." entry. + '' chmod -R a-w "$out" + chmod u+w "$out" ''; } // removeAttrs args [ "stripRoot" "extraPostFetch" ])).overrideAttrs (x: { # Hackety-hack: we actually need unzip hooks, too 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/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 3c9a531ab62f..9f21ca1eeb7b 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/59ba02b3424684458764210fa9e32ca08e516db2.tar.gz"; - sha256 = "0m4scz6b7xg7kisy6zlnw258pkfksmzzppw9gp0g6rdl0cxly239"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/a82d2463451cfd47772b3fb331b1a0e8386675ef.tar.gz"; + sha256 = "0l2h2z0982nmw3kq9r6ppwgs7ar4bda9c808mc2nkcyfmcnkdl6w"; } 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/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 4e9087995056..79c8e221894b 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.16"; + version = "2.17"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "0a5268w8b413i62ggipgy19k83va1n0ni8bvfwrp17r0n97wbqx2"; + sha256 = "1gff34xqypqjhh15lv4cc4ifsg07jx2znlsj9is4wmqf39a8h8n4"; }; sourceRoot = "."; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 7b9c439b247c..4bbed000e433 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "3.38.1"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hr87nl8pc7h8w65i8jwj5fdwr46wbygdnx6mhpbbyqirdm5gdsr"; + sha256 = "0v8iymg72m83ikxxyhapvz5v8zh8hlr1pw7n215cy3p8q6yg41cb"; }; # Tests need an X display 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/desktops/gnome-3/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix new file mode 100644 index 000000000000..523dbc622f08 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, substituteAll, glib, gnome3, gettext }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-EasyScreenCast"; + version = "unstable-2020-11-25"; + + src = fetchFromGitHub { + # To make it work with gnome 3.38, using effectively: https://github.com/EasyScreenCast/EasyScreenCast/pull/276 + owner = "Ian2020"; + repo = "EasyScreenCast"; + rev = "b1ab4a999bc7110ecbf68b5fe42c37fa67d7cb0d"; + sha256 = "s9b0ITKUzgG6XOd1bK7i3mGxfc+T+UHrTZhBp0Ff8zQ="; + }; + + patches = [ + (substituteAll { + src = ./fix-gi-path.patch; + gnomeShell = gnome3.gnome-shell; + }) + ]; + + nativeBuildInputs = [ + glib gettext + ]; + + makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + + uuid = "EasyScreenCast@iacopodeenosee.gmail.com"; + + meta = with stdenv.lib; { + description = "Simplifies the use of the video recording function integrated in gnome shell"; + homepage = "https://github.com/EasyScreenCast/EasyScreenCast"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch b/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch new file mode 100644 index 000000000000..2d32021b6c66 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch @@ -0,0 +1,16 @@ +diff --git i/utilaudio.js w/utilaudio.js +index 983b29c..7a94de8 100644 +--- i/utilaudio.js ++++ w/utilaudio.js +@@ -11,10 +11,7 @@ + */ + + const GIRepository = imports.gi.GIRepository; +-GIRepository.Repository.prepend_search_path("/usr/lib/gnome-shell"); +-GIRepository.Repository.prepend_library_path("/usr/lib/gnome-shell"); +-GIRepository.Repository.prepend_search_path("/usr/lib64/gnome-shell"); +-GIRepository.Repository.prepend_library_path("/usr/lib64/gnome-shell"); ++GIRepository.Repository.prepend_search_path("@gnomeShell@/lib/gnome-shell"); + const Gvc = imports.gi.Gvc; + const Lang = imports.lang; + 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/dhall-modules/Prelude.nix b/pkgs/development/dhall-modules/Prelude.nix index 2fe084753e62..512c8f8bf551 100644 --- a/pkgs/development/dhall-modules/Prelude.nix +++ b/pkgs/development/dhall-modules/Prelude.nix @@ -1,11 +1,11 @@ { buildDhallGitHubPackage }: buildDhallGitHubPackage { - name = "Prelude-19.0.0"; + name = "Prelude-20.0.0"; owner = "dhall-lang"; repo = "dhall-lang"; directory = "Prelude"; file = "package.dhall"; - rev = "v19.0.0"; - sha256 = "04m29f5xlks6rarv1gy909j68bsflwl18l9bg7kyy1vpwap0avkp"; + rev = "v20.0.0"; + sha256 = "1smk57xki1cj24xpp0s3gv85radl6ry76ybsjkqak8h13s79lwla"; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 272332e33eab..aa8212f167b1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -38,11 +38,6 @@ self: super: { ghcjs-base = null; ghcjs-prim = null; - # Some packages add this (non-existent) dependency to express that they - # cannot compile in a given configuration. Win32 does this, for example, when - # compiled on Linux. We provide the name to avoid evaluation errors. - unbuildable = throw "package depends on meta package 'unbuildable'"; - # enable using a local hoogle with extra packagages in the database # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }" # $ hoogle server @@ -327,6 +322,7 @@ self: super: { http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105 ihaskell = dontCheck super.ihaskell; influxdb = dontCheck super.influxdb; + integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0 itanium-abi = dontCheck super.itanium-abi; katt = dontCheck super.katt; language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275 @@ -442,9 +438,6 @@ self: super: { rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 - # Should not appear in nixpkgs yet (broken anyway) - yarn2nix = throw "yarn2nix is not yet packaged for nixpkgs. See https://github.com/Profpatsch/yarn2nix#yarn2nix"; - # no haddock since this is an umbrella package. cloud-haskell = dontHaddock super.cloud-haskell; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 93c4daac2247..e4ee9c1cb351 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -76,7 +76,7 @@ default-package-overrides: # haskell-language-server 0.5.0.0 doesn't accept newer versions - fourmolu ==0.2.* - refinery ==0.2.* - # Stackage Nightly 2020-11-23 + # Stackage Nightly 2020-12-04 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -215,18 +215,18 @@ default-package-overrides: - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 - ANum ==0.2.0.2 - - ap-normalize ==0.1.0.0 - apecs ==0.9.2 - apecs-gloss ==0.2.4 - apecs-physics ==0.4.4 - api-field-json-th ==0.1.0.2 - - app-settings ==0.2.0.12 + - ap-normalize ==0.1.0.0 - appar ==0.1.8 - appendmap ==0.1.5 - apply-refact ==0.8.2.1 - apportionment ==0.0.0.3 - approximate ==0.3.2 - approximate-equality ==1.1.0.2 + - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - arbor-postgres ==0.0.5 - arithmoi ==0.11.0.1 @@ -235,12 +235,12 @@ default-package-overrides: - ascii ==1.0.0.2 - ascii-case ==1.0.0.2 - ascii-char ==1.0.0.2 + - asciidiagram ==1.3.3.3 - ascii-group ==1.0.0.2 - ascii-predicates ==1.0.0.2 - ascii-progress ==0.3.3.0 - ascii-superset ==1.0.0.2 - ascii-th ==1.0.0.2 - - asciidiagram ==1.3.3.3 - asif ==6.0.4 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 @@ -268,19 +268,14 @@ default-package-overrides: - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 - - auto-update ==0.1.6 - autoexporter ==1.1.19 + - auto-update ==0.1.6 - avers ==0.0.17.1 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.6 - backtracking ==0.1.0 - bank-holidays-england ==0.2.0.6 - barbies ==2.0.2.0 - - base-compat ==0.11.2 - - base-compat-batteries ==0.11.2 - - base-orphans ==0.8.3 - - base-prelude ==1.4 - - base-unicode-symbols ==0.2.4.2 - base16 ==0.3.0.1 - base16-bytestring ==0.1.1.7 - base16-lens ==0.1.3.0 @@ -294,7 +289,12 @@ default-package-overrides: - base64-bytestring-type ==1.0.1 - base64-lens ==0.3.0 - base64-string ==0.2 + - base-compat ==0.11.2 + - base-compat-batteries ==0.11.2 - basement ==0.0.11 + - base-orphans ==0.8.3 + - base-prelude ==1.4 + - base-unicode-symbols ==0.2.4.2 - basic-prelude ==0.7.0 - bazel-runfiles ==0.12 - bbdb ==0.8 @@ -307,10 +307,11 @@ default-package-overrides: - bibtex ==0.1.0.6 - bifunctors ==5.5.8 - bimap ==0.4.0 - - bimap-server ==0.1.0.1 - bimaps ==0.1.0.2 + - bimap-server ==0.1.0.1 - bin ==0.1 - binary-conduit ==1.3.1 + - binaryen ==0.0.5.0 - binary-ext ==2.0.4 - binary-ieee754 ==0.1.0.0 - binary-instances ==1.0.0.1 @@ -321,7 +322,6 @@ default-package-overrides: - binary-search ==1.0.0.3 - binary-shared ==0.8.3 - binary-tagged ==0.3 - - binaryen ==0.0.5.0 - bindings-DSL ==1.0.25 - bindings-GLFW ==3.3.2.0 - bindings-libzip ==1.0.1 @@ -329,8 +329,8 @@ default-package-overrides: - bins ==0.1.2.0 - bitarray ==0.0.1.1 - bits ==0.5.2 - - bits-extra ==0.0.2.0 - bitset-word8 ==0.1.1.2 + - bits-extra ==0.0.2.0 - bitvec ==1.0.3.0 - blake2 ==0.3.0 - blanks ==0.5.0 @@ -355,8 +355,8 @@ default-package-overrides: - boring ==0.1.3 - both ==0.1.1.1 - bound ==2.0.2 - - bounded-queue ==1.0.0 - BoundedChan ==1.0.3.0 + - bounded-queue ==1.0.0 - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 @@ -373,10 +373,10 @@ default-package-overrides: - butcher ==1.3.3.2 - bv ==0.5 - bv-little ==1.1.1 - - byte-count-reader ==0.10.1.2 - - byte-order ==0.1.2.0 - byteable ==0.1.1 + - byte-count-reader ==0.10.1.2 - bytedump ==1.0 + - byte-order ==0.1.2.0 - byteorder ==1.0.4 - bytes ==0.17 - byteset ==0.1.1.0 @@ -386,13 +386,12 @@ default-package-overrides: - bytestring-mmap ==0.2.2 - bytestring-strict-builder ==0.4.5.3 - bytestring-to-vector ==0.3.0.1 - - bytestring-tree-builder ==0.2.7.5 + - bytestring-tree-builder ==0.2.7.7 - bz2 ==1.0.1.0 - bzlib ==0.5.1.0 - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.1 - c2hs ==0.28.6 - - ca-province-codes ==1.0.0.0 - cabal-debian ==5.1 - cabal-doctest ==1.0.8 - cabal-file ==0.1.1 @@ -404,12 +403,13 @@ default-package-overrides: - calendar-recycling ==0.0.0.1 - call-stack ==0.2.0 - can-i-haz ==0.3.1.0 + - ca-province-codes ==1.0.0.0 - cardano-coin-selection ==1.0.1 - carray ==0.1.6.8 - casa-client ==0.0.1 - casa-types ==0.0.1 - - case-insensitive ==1.2.1.0 - cased ==0.1.0.0 + - case-insensitive ==1.2.1.0 - cases ==0.1.4 - casing ==0.1.4.1 - cassava ==0.5.2.0 @@ -468,12 +468,12 @@ default-package-overrides: - cmark-gfm ==0.2.2 - cmark-lucid ==0.1.0.0 - cmdargs ==0.10.20 + - codec-beam ==0.2.0 + - codec-rpm ==0.2.2 + - code-page ==0.2 - co-log ==0.4.0.1 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 - - code-page ==0.2 - - codec-beam ==0.2.0 - - codec-rpm ==0.2.2 - Color ==0.3.0 - colorful-monoids ==0.2.1.3 - colorize-haskell ==1.0.1 @@ -508,7 +508,7 @@ default-package-overrides: - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 - - conduit ==1.3.3 + - conduit ==1.3.4 - conduit-algorithms ==0.0.11.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 @@ -519,8 +519,8 @@ default-package-overrides: - conferer-hspec ==0.4.0.1 - conferer-source-json ==0.4.0.1 - conferer-warp ==0.4.0.1 - - config-ini ==0.2.4.0 - ConfigFile ==1.1.4 + - config-ini ==0.2.4.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - configurator-pg ==0.2.5 @@ -528,8 +528,8 @@ default-package-overrides: - connection-pool ==0.2.2 - console-style ==0.0.2.1 - constraint ==0.1.4.0 - - constraint-tuples ==0.1.2 - constraints ==0.12 + - constraint-tuples ==0.1.2 - construct ==0.3 - contravariant ==1.5.2 - contravariant-extras ==0.3.5.2 @@ -556,13 +556,8 @@ default-package-overrides: - cron ==0.7.0 - crypto-api ==0.13.3 - crypto-cipher-types ==0.0.9 - - crypto-enigma ==0.1.1.6 - - crypto-numbers ==0.2.7 - - crypto-pubkey ==0.2.8 - - crypto-pubkey-types ==0.4.3 - - crypto-random ==0.0.9 - - crypto-random-api ==0.2.0 - cryptocompare ==0.1.2 + - crypto-enigma ==0.1.1.6 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 - cryptohash-md5 ==0.11.100.1 @@ -571,6 +566,11 @@ default-package-overrides: - cryptonite ==0.27 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 + - crypto-pubkey-types ==0.4.3 + - crypto-random ==0.0.9 + - crypto-random-api ==0.2.0 - csp ==1.4.0 - css-syntax ==0.1.0.0 - css-text ==0.1.3.0 @@ -607,11 +607,12 @@ default-package-overrides: - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - data-diverse ==4.7.0.0 + - datadog ==0.2.5.0 - data-dword ==0.3.2 - data-endian ==0.1.1 - data-fix ==0.3.0 - data-forest ==0.1.0.8 - - data-has ==0.3.0.0 + - data-has ==0.4.0.0 - data-hash ==0.2.0.1 - data-interval ==2.0.1 - data-inttrie ==0.1.4 @@ -625,7 +626,6 @@ default-package-overrides: - data-reify ==0.6.3 - data-serializer ==0.3.4.1 - data-textual ==0.3.0.3 - - datadog ==0.2.5.0 - dataurl ==0.1.0.0 - DAV ==1.3.4 - DBFunctor ==0.1.1.1 @@ -639,13 +639,13 @@ default-package-overrides: - declarative ==0.5.3 - deepseq-generics ==0.2.0.0 - deepseq-instances ==0.1.0.1 - - deferred-folds ==0.9.11 + - deferred-folds ==0.9.15 - dejafu ==2.4.0.0 - dense-linear-algebra ==0.1.0.0 - depq ==0.4.1.0 - deque ==0.4.3 - - derive-topdown ==0.0.2.2 - deriveJsonNoPrefix ==0.1.0.1 + - derive-topdown ==0.0.2.2 - deriving-aeson ==0.2.6 - deriving-compat ==0.5.10 - derulo ==1.0.9 @@ -654,17 +654,17 @@ default-package-overrides: - dhall-json ==1.7.3 - dhall-lsp-server ==1.0.11 - dhall-yaml ==1.2.3 - - di-core ==1.0.4 - - di-monad ==1.3.1 - diagrams-solve ==0.1.2 - dialogflow-fulfillment ==0.1.1.3 + - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.4.0 - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.3 - - direct-sqlite ==2.3.26 + - di-monad ==1.3.1 - directory-tree ==0.12.1 + - direct-sqlite ==2.3.26 - dirichlet ==0.1.0.0 - discount ==0.1.1 - disk-free-space ==0.1.0.1 @@ -676,16 +676,16 @@ default-package-overrides: - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 - dns ==4.0.1 - - do-list ==1.0.1 - - do-notation ==0.1.0.2 - dockerfile ==0.2.0 - doclayout ==0.3 - - doctemplates ==0.8.2 + - doctemplates ==0.8.3 - doctest ==0.16.3 - doctest-discover ==0.2.0.0 - doctest-exitcode-stdio ==0.0 - doctest-lib ==0.1 - doldol ==0.4.1.2 + - do-list ==1.0.1 + - do-notation ==0.1.0.2 - dotenv ==0.8.0.7 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 @@ -724,10 +724,10 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.30 - eliminators ==0.7 + - elm2nix ==0.2.1 - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elm2nix ==0.2.1 - elynx ==0.5.0 - elynx-markov ==0.5.0 - elynx-nexus ==0.5.0 @@ -739,9 +739,9 @@ default-package-overrides: - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.6 - - enum-subset-generate ==0.1.0.0 - enummapset ==0.6.0.3 - enumset ==0.0.5 + - enum-subset-generate ==0.1.0.0 - envelope ==0.2.2.0 - envy ==2.1.0.0 - epub-metadata ==4.5 @@ -760,24 +760,24 @@ default-package-overrides: - essence-of-live-coding-quickcheck ==0.2.4 - etc ==0.4.1.0 - eve ==0.1.9.0 - - event-list ==0.1.2 - eventful-core ==0.2.0 - eventful-test-helpers ==0.2.0 + - event-list ==0.1.2 - eventstore ==1.4.1 - every ==0.0.1 - exact-combinatorics ==0.2.0.9 - exact-pi ==0.5.0.1 - exception-hierarchy ==0.1.0.4 - exception-mtl ==0.4.0.1 + - exceptions ==0.10.4 - exception-transformers ==0.4.0.9 - exception-via ==0.1.0.0 - - exceptions ==0.10.4 - executable-path ==0.0.3.1 - exit-codes ==1.0.0 - exomizer ==1.0.0 - - exp-pairs ==0.2.1.0 - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 + - exp-pairs ==0.2.1.0 - express ==0.1.3 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 @@ -804,10 +804,10 @@ default-package-overrides: - fgl ==5.7.0.3 - file-embed ==0.0.13.0 - file-embed-lzma ==0 - - file-modules ==0.1.2.4 - - file-path-th ==0.1.0.0 - filelock ==0.1.1.5 - filemanip ==0.3.6.3 + - file-modules ==0.1.2.4 + - file-path-th ==0.1.0.0 - filepattern ==0.1.2 - fileplow ==0.1.0.0 - filtrable ==0.1.4.0 @@ -837,8 +837,8 @@ default-package-overrides: - fn ==0.3.0.2 - focus ==1.0.1.4 - focuslist ==0.1.0.2 - - fold-debounce ==0.2.0.9 - foldable1 ==0.1.0.0 + - fold-debounce ==0.2.0.9 - foldl ==1.4.10 - folds ==0.7.5 - follow-file ==0.0.3 @@ -852,10 +852,10 @@ default-package-overrides: - foundation ==0.0.25 - free ==5.1.4 - free-categories ==0.2.0.2 - - free-vl ==0.1.4 - freenect ==1.2.1 - freer-simple ==1.2.1.1 - freetype2 ==0.2.0 + - free-vl ==0.1.4 - friendly-time ==0.4.1 - from-sum ==0.2.3.0 - frontmatter ==0.1.0.2 @@ -871,8 +871,8 @@ default-package-overrides: - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 - fuzzy-dates ==0.1.1.2 - - fuzzy-time ==0.1.0.0 - fuzzyset ==0.2.0 + - fuzzy-time ==0.1.0.0 - gauge ==0.2.5 - gd ==3000.7.3 - gdp ==0.0.3.0 @@ -887,8 +887,8 @@ default-package-overrides: - generic-lens-core ==2.0.0.0 - generic-monoid ==0.1.0.1 - generic-optics ==2.0.0.0 - - generic-random ==1.3.0.1 - GenericPretty ==1.2.2 + - generic-random ==1.3.0.1 - generics-sop ==0.5.1.0 - generics-sop-lens ==0.2.0.1 - geniplate-mirror ==0.7.7 @@ -922,6 +922,9 @@ default-package-overrides: - ghc-core ==0.5.6 - ghc-events ==0.14.0 - ghc-exactprint ==0.6.3.3 + - ghcid ==0.8.7 + - ghci-hexcalc ==0.1.1.0 + - ghcjs-codemirror ==0.0.0.2 - ghc-lib ==8.10.2.20200916 - ghc-lib-parser ==8.10.2.20200916 - ghc-lib-parser-ex ==8.10.0.16 @@ -936,9 +939,6 @@ default-package-overrides: - ghc-typelits-knownnat ==0.7.3 - ghc-typelits-natnormalise ==0.7.2 - ghc-typelits-presburger ==0.3.0.1 - - ghci-hexcalc ==0.1.1.0 - - ghcid ==0.8.7 - - ghcjs-codemirror ==0.0.0.2 - ghost-buster ==0.1.1.0 - gi-atk ==2.0.22 - gi-cairo ==1.0.24 @@ -951,15 +951,14 @@ default-package-overrides: - gi-gdkx11 ==3.0.10 - gi-gio ==2.0.27 - gi-glib ==2.0.24 - - gi-gobject ==2.0.24 + - gi-gobject ==2.0.25 - gi-graphene ==1.0.2 - gi-gtk ==3.0.36 - gi-gtk-hs ==0.3.9 - gi-harfbuzz ==0.0.3 - - gi-pango ==1.0.23 - - gi-xlib ==2.0.9 - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 + - gi-pango ==1.0.23 - githash ==0.1.5.0 - github ==0.26 - github-release ==1.3.5 @@ -968,6 +967,7 @@ default-package-overrides: - github-webhooks ==0.15.0 - gitlab-haskell ==0.2.3 - gitrev ==1.3.1 + - gi-xlib ==2.0.9 - gl ==0.9 - glabrous ==2.0.2 - GLFW-b ==3.3.0.0 @@ -982,11 +982,11 @@ default-package-overrides: - gothic ==0.1.5 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - - graph-wrapper ==0.2.6.0 - graphite ==0.10.0.1 - graphql-client ==1.1.0 - graphs ==0.7.1 - graphviz ==2999.20.1.0 + - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - groom ==0.1.2.1 - group-by-date ==0.1.0.3 @@ -1014,8 +1014,8 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.2.4.1 - haskeline ==0.8.1.0 - - haskell-gi ==0.24.5 - - haskell-gi-base ==0.24.4 + - haskell-gi ==0.24.7 + - haskell-gi-base ==0.24.5 - haskell-gi-overloading ==1.0 - haskell-import-graph ==1.0.4 - haskell-lexer ==1.1 @@ -1040,7 +1040,7 @@ default-package-overrides: - hdaemonize ==0.5.6 - HDBC ==2.4.0.3 - HDBC-session ==0.1.2.0 - - headroom ==0.3.1.0 + - headroom ==0.3.2.0 - heap ==1.0.4 - heaps ==0.3.6.1 - hebrew-time ==0.1.2 @@ -1050,7 +1050,7 @@ default-package-overrides: - hedgehog-fakedata ==0.0.1.3 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - - hedis ==0.12.15 + - hedis ==0.13.1 - hedn ==0.3.0.2 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -1064,9 +1064,9 @@ default-package-overrides: - hgeometry ==0.11.0.0 - hgeometry-combinatorial ==0.11.0.0 - hgrev ==0.2.6 - - hi-file-parser ==0.1.0.0 - hidapi ==0.1.5 - hie-bios ==0.7.1 + - hi-file-parser ==0.1.0.0 - higher-leveldb ==0.6.0.0 - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 @@ -1088,6 +1088,7 @@ default-package-overrides: - hnix-store-core ==0.2.0.0 - hnock ==0.4.0 - hoauth2 ==1.16.0 + - hocon ==0.1.0.4 - hOpenPGP ==2.9.5 - hopenpgp-tools ==0.23.3 - hopfli ==0.2.2.1 @@ -1103,16 +1104,15 @@ default-package-overrides: - hpc-lcov ==1.0.1 - hprotoc ==2.4.17 - hruby ==0.3.8 - - hs-bibutils ==6.10.0.0 - - hs-functors ==0.1.7.1 - - hs-GeoIP ==0.3 - - hs-php-session ==0.0.9.3 - hsass ==0.8.0 + - hs-bibutils ==6.10.0.0 - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 - hsebaysdk ==0.4.1.0 - hsemail ==2.2.1 + - hs-functors ==0.1.7.1 + - hs-GeoIP ==0.3 - hsini ==0.5.1.2 - hsinstall ==2.6 - HSlippyMap ==3.0.1 @@ -1145,6 +1145,7 @@ default-package-overrides: - hspec-tables ==0.0.1 - hspec-wai ==0.10.1 - hspec-wai-json ==0.10.1 + - hs-php-session ==0.0.9.3 - hsshellscript ==3.4.5 - HStringTemplate ==0.8.7 - HSvm ==0.1.1.3.22 @@ -1157,6 +1158,7 @@ default-package-overrides: - html-entities ==1.1.4.3 - html-entity-map ==0.1.0.0 - htoml ==1.0.0.3 + - http2 ==2.0.5 - HTTP ==4000.3.15 - http-api-data ==0.4.1.1 - http-client ==0.6.4.1 @@ -1168,14 +1170,13 @@ default-package-overrides: - http-date ==0.0.10 - http-directory ==0.1.8 - http-download ==0.2.0.0 + - httpd-shed ==0.4.1.1 - http-link-header ==1.0.3.1 - http-media ==0.8.0.0 - http-query ==0.1.0 - http-reverse-proxy ==0.6.0 - http-streams ==0.8.7.2 - http-types ==0.12.3 - - http2 ==2.0.5 - - httpd-shed ==0.4.1.1 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.1.0 - HUnit-approx ==1.1.1.1 @@ -1188,6 +1189,7 @@ default-package-overrides: - hw-conduit-merges ==0.2.1.0 - hw-diagnostics ==0.0.1.0 - hw-dsv ==0.4.1.0 + - hweblib ==0.6.3 - hw-eliasfano ==0.1.2.0 - hw-excess ==0.2.3.0 - hw-fingertree ==0.1.2.0 @@ -1200,7 +1202,7 @@ default-package-overrides: - hw-json-simd ==0.1.1.0 - hw-json-simple-cursor ==0.1.1.0 - hw-json-standard-cursor ==0.2.3.1 - - hw-kafka-client ==3.1.2 + - hw-kafka-client ==4.0.0 - hw-mquery ==0.2.1.0 - hw-packed-vector ==0.2.1.0 - hw-parser ==0.1.1.0 @@ -1212,7 +1214,6 @@ default-package-overrides: - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - hw-xml ==0.5.1.0 - - hweblib ==0.6.3 - hxt ==9.3.1.18 - hxt-charproperties ==9.4.0.0 - hxt-css ==0.1.0.3 @@ -1293,13 +1294,13 @@ default-package-overrides: - iso3166-country-codes ==0.20140203.8 - iso639 ==0.1.0.3 - iso8601-time ==0.1.5 - - it-has ==0.2.0.0 - iterable ==3.0 - - ix-shapable ==0.1.0 + - it-has ==0.2.0.0 - ixset-typed ==0.5 - ixset-typed-binary-instance ==0.1.0.2 - ixset-typed-conversions ==0.1.2.0 - ixset-typed-hashable-instance ==0.1.0.2 + - ix-shapable ==0.1.0 - jack ==0.7.1.4 - jalaali ==1.0.0.0 - jira-wiki-markup ==1.3.2 @@ -1310,9 +1311,9 @@ default-package-overrides: - js-flot ==0.8.3 - js-jquery ==3.3.1 - json-feed ==1.0.11 + - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 - - jsonpath ==0.2.0.0 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.4.1 @@ -1388,9 +1389,9 @@ default-package-overrides: - libyaml ==0.1.2 - LibZip ==1.0.1 - life-sync ==1.1.1.0 - - lift-generics ==0.2 - lifted-async ==0.10.1.2 - lifted-base ==0.2.3.12 + - lift-generics ==0.2 - line ==4.0.1 - linear ==1.21.3 - linear-circuit ==0.1.0.2 @@ -1399,11 +1400,11 @@ default-package-overrides: - linux-namespaces ==0.1.3.0 - liquid-fixpoint ==0.8.10.2 - List ==0.6.2 + - ListLike ==4.7.2 - list-predicate ==0.1.0.1 + - listsafe ==0.1.0.1 - list-singleton ==1.0.0.4 - list-t ==1.0.4 - - ListLike ==4.7.2 - - listsafe ==0.1.0.1 - ListTree ==0.2.3 - little-logger ==0.3.1 - little-rio ==0.2.2 @@ -1435,20 +1436,20 @@ default-package-overrides: - machines ==0.7.1 - magic ==1.1 - magico ==0.0.2.1 - - main-tester ==0.2.0.1 - mainland-pretty ==0.7.0.1 + - main-tester ==0.2.0.1 - makefile ==1.1.0.0 - managed ==1.0.8 - MapWith ==0.2.0.0 - markdown ==0.1.17.4 - markdown-unlit ==0.5.0 - markov-chain ==0.0.3.4 - - massiv ==0.5.6.0 + - massiv ==0.5.7.0 - massiv-io ==0.4.0.0 - massiv-test ==0.1.5 + - mathexpr ==0.3.0.0 - math-extras ==0.1.1.0 - math-functions ==0.3.4.1 - - mathexpr ==0.3.0.0 - matplotlib ==0.7.5 - matrices ==0.5.0 - matrix ==0.3.6.1 @@ -1460,9 +1461,9 @@ default-package-overrides: - mbox-utility ==0.0.3.1 - mcmc ==0.3.0 - mcmc-types ==1.0.3 - - med-module ==0.1.2.1 - medea ==1.2.0 - median-stream ==0.7.0.0 + - med-module ==0.1.2.1 - megaparsec ==9.0.1 - megaparsec-tests ==9.0.1 - membrain ==0.0.0.2 @@ -1491,12 +1492,12 @@ default-package-overrides: - mime-mail ==0.5.0 - mime-mail-ses ==0.4.3 - mime-types ==0.1.0.9 - - min-max-pqueue ==0.1.0.2 - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 - minimorph ==0.3.0.0 - minio-hs ==1.5.3 - miniutter ==0.5.1.1 + - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.3.0 @@ -1518,36 +1519,36 @@ default-package-overrides: - monad-control-aligned ==0.0.1.1 - monad-coroutine ==0.9.0.4 - monad-extras ==0.6.0 + - monadic-arrays ==0.2.2 - monad-journal ==0.8.1 - - monad-logger ==0.3.35 + - monadlist ==0.0.2 + - monad-logger ==0.3.36 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.11 - monad-loops ==0.4.3 - monad-memo ==0.5.3 - monad-metrics ==0.2.1.4 - monad-par ==0.3.5 - - monad-par-extras ==0.3.3 - monad-parallel ==0.7.2.3 + - monad-par-extras ==0.3.3 - monad-peel ==0.2.1.2 - monad-primitive ==0.1 - monad-products ==4.0.1 + - MonadPrompt ==1.0.0.5 + - MonadRandom ==0.5.2 - monad-resumption ==0.1.4.0 - monad-skeleton ==0.1.5 - monad-st ==0.2.4.1 + - monads-tf ==0.1.0.3 - monad-time ==0.3.1.0 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - monadic-arrays ==0.2.2 - - monadlist ==0.0.2 - - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.5.2 - - monads-tf ==0.1.0.3 - mongoDB ==2.7.0.0 + - monoid-subclasses ==1.0.1 + - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.1 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.1.0 - - monoid-subclasses ==1.0.1 - - monoid-transformer ==0.0.4 - more-containers ==0.2.2.0 - morpheus-graphql ==0.16.0 - morpheus-graphql-client ==0.16.0 @@ -1560,14 +1561,14 @@ default-package-overrides: - mpi-hs-cereal ==0.1.0.0 - mtl-compat ==0.2.2 - mtl-prelude ==2.0.3.1 - - multi-containers ==0.1.1 - multiarg ==0.30.0.10 + - multi-containers ==0.1.1 - multimap ==1.2.1 - multipart ==0.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.3 - - murmur-hash ==0.1.0.9 - murmur3 ==1.0.4 + - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - mustache ==2.3.1 - mutable-containers ==0.3.4 @@ -1615,16 +1616,16 @@ default-package-overrides: - nicify-lib ==1.0.1 - NineP ==0.0.2.1 - nix-paths ==1.0.1 - - no-value ==1.0.0.0 - - non-empty ==0.3.2 - - non-empty-sequence ==0.2.0.4 - - non-negative ==0.1.2 - nonce ==1.0.7 - nondeterminism ==1.4 + - non-empty ==0.3.2 - nonempty-containers ==0.3.4.1 - - nonempty-vector ==0.2.1.0 - nonemptymap ==0.0.6.0 + - non-empty-sequence ==0.2.0.4 + - nonempty-vector ==0.2.1.0 + - non-negative ==0.1.2 - not-gloss ==0.7.7.0 + - no-value ==1.0.0.0 - nowdoc ==0.1.1.0 - nqe ==0.6.3 - nri-env-parser ==0.1.0.2 @@ -1640,9 +1641,9 @@ default-package-overrides: - nvim-hs ==2.1.0.4 - nvim-hs-contrib ==2.0.0.0 - nvim-hs-ghcid ==2.0.0.0 - - o-clock ==1.2.0 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.1 + - o-clock ==1.2.0 - odbc ==0.2.2 - oeis2 ==1.0.4 - ofx ==0.4.4.0 @@ -1655,9 +1656,9 @@ default-package-overrides: - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.7.1.0 - - open-browser ==0.2.1.0 - OpenAL ==1.7.0.5 - openapi3 ==3.0.0.1 + - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 - OpenGL ==3.0.3.0 - OpenGLRaw ==3.3.4.0 @@ -1736,15 +1737,15 @@ default-package-overrides: - persistent ==2.10.5.3 - persistent-documentation ==0.1.0.2 - persistent-mysql ==2.10.2.3 - - persistent-pagination ==0.1.1.1 + - persistent-pagination ==0.1.1.2 - persistent-postgresql ==2.10.1.2 - - persistent-qq ==2.9.2 + - persistent-qq ==2.9.2.1 - persistent-sqlite ==2.10.6.2 - persistent-template ==2.8.2.3 - persistent-typed-db ==0.1.0.1 - pg-harness-client ==0.6.0 - - pg-transact ==0.3.1.1 - pgp-wordlist ==0.1.0.3 + - pg-transact ==0.3.1.1 - phantom-state ==0.2.1.2 - pid1 ==0.1.2.0 - pipes ==4.3.14 @@ -1782,36 +1783,36 @@ default-package-overrides: - port-utils ==0.2.1.0 - posix-paths ==0.2.1.6 - possibly ==1.0.0.0 - - post-mess-age ==0.2.1.0 - postgres-options ==0.2.0.0 - - postgresql-binary ==0.12.3.1 + - postgresql-binary ==0.12.3.3 - postgresql-libpq ==0.9.4.3 - postgresql-libpq-notify ==0.2.0.0 - postgresql-orm ==0.5.1 - postgresql-simple ==0.6.3 - postgresql-typed ==0.6.1.2 - postgrest ==7.0.1 + - post-mess-age ==0.2.1.0 - pptable ==0.3.0.0 - pqueue ==1.4.1.3 - prairie ==0.0.1.0 - prefix-units ==0.2.0 - prelude-compat ==0.0.0.2 - prelude-safeenum ==0.1.1.2 + - prettyclass ==1.0.0.0 - pretty-class ==1.0.1.1 - pretty-diff ==0.2.0.3 - pretty-hex ==1.1 - - pretty-relative-time ==0.2.0.0 - - pretty-show ==1.10 - - pretty-simple ==3.3.0.0 - - pretty-sop ==0.2.0.3 - - pretty-terminal ==0.1.0.0 - - prettyclass ==1.0.0.0 - prettyprinter ==1.6.2 - prettyprinter-ansi-terminal ==1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - prettyprinter-convert-ansi-wl-pprint ==1.1.1 + - pretty-relative-time ==0.2.0.0 + - pretty-show ==1.10 + - pretty-simple ==3.3.0.0 + - pretty-sop ==0.2.0.3 + - pretty-terminal ==0.1.0.0 - primes ==0.2.1.0 - primitive ==0.7.1.0 - primitive-addr ==0.1.0.2 @@ -1825,21 +1826,14 @@ default-package-overrides: - product-profunctors ==0.11.0.1 - profiterole ==0.1 - profunctors ==5.5.2 - - project-template ==0.2.1.0 - projectroot ==0.2.0.1 + - project-template ==0.2.1.0 - prometheus ==2.2.2 - prometheus-client ==1.0.1 - prometheus-wai-middleware ==1.0.1.0 - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 - - proto-lens ==0.7.0.0 - - proto-lens-arbitrary ==0.1.2.9 - - proto-lens-optparse ==0.1.1.7 - - proto-lens-protobuf-types ==0.7.0.0 - - proto-lens-protoc ==0.7.0.0 - - proto-lens-runtime ==0.7.0.0 - - proto-lens-setup ==0.4.0.4 - proto3-wire ==1.1.0 - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.0 @@ -1847,6 +1841,13 @@ default-package-overrides: - protocol-buffers-descriptor ==2.4.17 - protocol-radius ==0.0.1.1 - protocol-radius-test ==0.1.0.1 + - proto-lens ==0.7.0.0 + - proto-lens-arbitrary ==0.1.2.9 + - proto-lens-optparse ==0.1.1.7 + - proto-lens-protobuf-types ==0.7.0.0 + - proto-lens-protoc ==0.7.0.0 + - proto-lens-runtime ==0.7.0.0 + - proto-lens-setup ==0.4.0.4 - protolude ==0.3.0 - proxied ==0.3.1 - psqueues ==0.2.7.2 @@ -1892,38 +1893,37 @@ default-package-overrides: - random-source ==0.3.0.8 - random-tree ==0.6.0.5 - range ==0.3.0.2 - - range-set-list ==0.1.3.1 - Ranged-sets ==0.4.0 + - range-set-list ==0.1.3.1 - rank1dynamic ==0.4.1 - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - - rate-limit ==1.4.2 - ratel ==1.0.12 + - rate-limit ==1.4.2 - ratel-wai ==1.1.3 - rattle ==0.2 - - raw-strings-qq ==1.1 - rawfilepath ==0.2.4 - rawstring-qm ==0.2.3.0 + - raw-strings-qq ==1.1 - rcu ==0.2.4 - rdf ==0.1.0.4 - rdtsc ==1.3.0.1 - re2 ==0.3 + - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 - - readable ==0.3.1 - reanimate ==1.1.2.1 - reanimate-svg ==0.13.0.0 - rebase ==1.6.1 - record-dot-preprocessor ==0.2.7 - record-hasfield ==1.0 - - record-wrangler ==0.1.1.0 - records-sop ==0.1.0.3 + - record-wrangler ==0.1.1.0 - recursion-schemes ==5.2.1 - reducers ==3.12.3 - - ref-fd ==0.4.0.2 - - ref-tf ==0.4.0.2 - refact ==0.3.0.2 + - ref-fd ==0.4.0.2 - refined ==0.6.1 - reflection ==2.1.6 - reform ==0.2.7.4 @@ -1931,6 +1931,7 @@ default-package-overrides: - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.4 - RefSerialize ==0.4.0 + - ref-tf ==0.4.0.2 - regex ==1.1.0.0 - regex-applicative ==0.3.4 - regex-applicative-text ==0.1.0.1 @@ -1955,13 +1956,14 @@ default-package-overrides: - replace-attoparsec ==1.4.2.0 - replace-megaparsec ==1.4.3.0 - repline ==0.4.0.0 - - req ==3.7.0 + - req ==3.8.0 - req-conduit ==1.0.0 - rerebase ==1.6.1 - resistor-cube ==0.0.1.2 - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - resourcet ==1.2.4.2 + - resourcet-pool ==0.1.0.0 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - retry ==0.8.1.2 @@ -1987,15 +1989,15 @@ default-package-overrides: - runmemo ==1.0.0.1 - rvar ==0.2.0.6 - safe ==0.3.19 + - safecopy ==0.10.3 - safe-decimal ==0.2.0.0 - safe-exceptions ==0.1.7.1 - safe-foldable ==0.1.0.0 + - safeio ==0.0.5.0 - safe-json ==1.1.1 - safe-money ==0.9 - - safe-tensor ==0.2.1.0 - - safecopy ==0.10.3 - - safeio ==0.0.5.0 - SafeSemaphore ==0.10.1 + - safe-tensor ==0.2.1.0 - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.0 @@ -2033,8 +2035,8 @@ default-package-overrides: - semigroupoid-extras ==5 - semigroupoids ==5.3.4 - semigroups ==0.19.1 - - semiring-simple ==1.0.0.1 - semirings ==0.5.4 + - semiring-simple ==1.0.0.1 - semver ==0.4.0.1 - sendfile ==0.7.11.1 - seqalign ==0.2.0.4 @@ -2051,18 +2053,20 @@ default-package-overrides: - servant-conduit ==0.15.1 - servant-docs ==0.11.8 - servant-errors ==0.1.6.0 + - servant-exceptions ==0.2.1 + - servant-exceptions-server ==0.2.1 - servant-foreign ==0.15.3 - servant-github-webhook ==0.4.2.0 - servant-http-streams ==0.18.2 - servant-machines ==0.15.1 - servant-multipart ==0.12 - - servant-openapi3 ==2.0.1.0 + - servant-openapi3 ==2.0.1.1 - servant-pipes ==0.15.2 - servant-rawm ==1.0.0.0 - servant-server ==0.18.2 - servant-swagger ==1.1.10 - - servant-swagger-ui ==0.3.4.3.36.1 - - servant-swagger-ui-core ==0.3.3 + - servant-swagger-ui ==0.3.4.3.37.2 + - servant-swagger-ui-core ==0.3.4 - serverless-haskell ==0.12.4 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 @@ -2078,9 +2082,9 @@ default-package-overrides: - shared-memory ==0.2.0.0 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - - shell-utility ==0.1 - shellmet ==0.0.3.1 - shelltestrunner ==1.9 + - shell-utility ==0.1 - shelly ==1.9.0 - shikensu ==0.3.11 - should-not-typecheck ==2.1.0 @@ -2109,8 +2113,8 @@ default-package-overrides: - skein ==1.0.9.4 - skews ==0.1.0.3 - skip-var ==0.1.1.0 - - skylighting ==0.10.0.3 - - skylighting-core ==0.10.0.3 + - skylighting ==0.10.1 + - skylighting-core ==0.10.1 - slack-api ==0.12 - slack-progressbar ==0.1.0.1 - slist ==0.1.1.0 @@ -2150,16 +2154,16 @@ default-package-overrides: - splitmix ==0.0.5 - spoon ==0.3.1 - spreadsheet ==0.1.3.8 - - sql-words ==0.1.6.4 - sqlcli ==0.2.2.0 - sqlcli-odbc ==0.2.0.1 - sqlite-simple ==0.4.18.0 + - sql-words ==0.1.6.4 - squeal-postgresql ==0.7.0.1 - squeather ==0.4.0.0 - srcloc ==0.5.1.2 - stache ==2.2.0 - - stack-templatizer ==0.1.0.2 - stackcollapse-ghc ==0.0.1.3 + - stack-templatizer ==0.1.0.2 - stateref ==0.3 - StateVar ==1.2 - static-text ==0.2.0.6 @@ -2174,16 +2178,16 @@ default-package-overrides: - stm-extras ==0.1.0.3 - stm-hamt ==1.2.0.4 - stm-lifted ==2.5.0.0 - - stm-split ==0.0.2.1 - STMonadTrans ==0.4.4 + - stm-split ==0.0.2.1 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - storable-endian ==0.2.6 - storable-record ==0.0.5 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13.1 - - store ==0.7.7 - - store-core ==0.4.4.3 + - store ==0.7.8 + - store-core ==0.4.4.4 - store-streaming ==0.2.0.3 - stratosphere ==0.59.1 - streaming ==0.2.3.0 @@ -2196,6 +2200,7 @@ default-package-overrides: - strict-list ==0.1.5 - strict-tuple ==0.1.4 - strict-tuple-lens ==0.1.0.1 + - stringbuilder ==0.5.1 - string-class ==0.1.7.0 - string-combinators ==0.6.0.5 - string-conv ==0.1.2 @@ -2203,9 +2208,8 @@ default-package-overrides: - string-interpolate ==0.3.0.2 - string-qq ==0.0.4 - string-random ==0.1.3.0 - - string-transform ==1.1.1 - - stringbuilder ==0.5.1 - stringsearch ==0.3.6.6 + - string-transform ==1.1.1 - stripe-concepts ==1.0.2.4 - stripe-core ==2.6.2 - stripe-haskell ==2.6.2 @@ -2230,10 +2234,10 @@ default-package-overrides: - symmetry-operations-symbols ==0.0.2.1 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 + - systemd ==2.3.0 - system-fileio ==0.3.16.4 - system-filepath ==0.4.14 - system-info ==0.5.1 - - systemd ==2.3.0 - tabular ==0.2.2.8 - tagchup ==0.4.1.1 - tagged ==0.8.6 @@ -2256,6 +2260,7 @@ default-package-overrides: - tasty-hedgehog ==1.0.0.2 - tasty-hspec ==1.1.6 - tasty-hunit ==0.10.0.2 + - tasty-hunit-compat ==0.2 - tasty-kat ==0.0.3 - tasty-leancheck ==0.0.1 - tasty-lua ==0.2.3.1 @@ -2296,6 +2301,7 @@ default-package-overrides: - text-icu ==0.7.0.1 - text-latin1 ==0.3.1 - text-ldap ==0.1.1.13 + - textlocal ==0.1.0.5 - text-manipulate ==0.2.0.1 - text-metrics ==0.3.0 - text-postgresql ==0.0.3.1 @@ -2306,9 +2312,8 @@ default-package-overrides: - text-show ==3.9 - text-show-instances ==3.8.4 - text-zipper ==0.10.1 - - textlocal ==0.1.0.5 - - tf-random ==0.5 - tfp ==1.0.1.1 + - tf-random ==0.5 - th-abstraction ==0.4.0.0 - th-bang-compat ==0.0.1.0 - th-compat ==0.1 @@ -2316,6 +2321,10 @@ default-package-overrides: - th-data-compat ==0.1.0.0 - th-desugar ==1.11 - th-env ==0.1.0.2 + - these ==1.1.1.1 + - these-lens ==1.0.1.1 + - these-optics ==1.0.1.1 + - these-skinny ==0.7.4 - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.2 @@ -2323,37 +2332,33 @@ default-package-overrides: - th-nowq ==0.1.0.5 - th-orphans ==0.13.11 - th-printf ==0.7 - - th-reify-compat ==0.0.1.5 - - th-reify-many ==0.1.9 - - th-strict-compat ==0.1.0.1 - - th-test-utils ==1.1.0 - - th-utilities ==0.2.4.0 - - these ==1.1.1.1 - - these-lens ==1.0.1.1 - - these-optics ==1.0.1.1 - - these-skinny ==0.7.4 - thread-hierarchy ==0.3.0.2 - thread-local-storage ==0.2 - - thread-supervisor ==0.2.0.0 - threads ==0.5.1.6 + - thread-supervisor ==0.2.0.0 - threepenny-gui ==0.9.0.0 + - th-reify-compat ==0.0.1.5 + - th-reify-many ==0.1.9 - throttle-io-stream ==0.2.0.1 - through-text ==0.1.0.0 - throwable-exceptions ==0.1.0.9 + - th-strict-compat ==0.1.0.1 + - th-test-utils ==1.1.0 + - th-utilities ==0.2.4.1 - thyme ==0.3.5.5 - tidal ==1.6.1 - tile ==0.3.0.0 - time-compat ==1.9.4 + - timeit ==2.0 + - timelens ==0.2.0.2 - time-lens ==0.4.0.2 - time-locale-compat ==0.1.1.5 - time-locale-vietnamese ==1.0.0.0 - time-manager ==0.0.0 - time-parsers ==0.1.2.1 - - time-units ==1.0.0 - - timeit ==2.0 - - timelens ==0.2.0.2 - - timer-wheel ==0.3.0 - timerep ==2.0.1.0 + - timer-wheel ==0.3.0 + - time-units ==1.0.0 - timezone-olson ==0.2.0 - timezone-series ==0.1.9 - tinylog ==0.15.0 @@ -2388,10 +2393,13 @@ default-package-overrides: - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 + - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - tuples-homogenous-h98 ==0.1.1.0 - turtle ==1.5.20 + - TypeCompose ==0.9.14 + - typed-process ==0.2.6.0 + - typed-uuid ==0.0.0.2 - type-equality ==1 - type-errors ==0.2.0.0 - type-errors-pretty ==0.0.1.1 @@ -2405,17 +2413,14 @@ default-package-overrides: - type-of-html ==1.6.1.2 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - - type-spec ==0.4.0.0 - - TypeCompose ==0.9.14 - - typed-process ==0.2.6.0 - - typed-uuid ==0.0.0.2 - typerep-map ==0.3.3.0 + - type-spec ==0.4.0.0 - tzdata ==0.2.20201021.0 - ua-parser ==0.7.5.1 - uglymemo ==0.1.0.1 - ulid ==0.3.0.0 - unagi-chan ==0.4.1.3 - - unbounded-delays ==0.1.1.0 + - unbounded-delays ==0.1.1.1 - unboxed-ref ==0.4.0.0 - unboxing-vector ==0.2.0.0 - uncaught-exception ==0.1.0 @@ -2511,7 +2516,7 @@ default-package-overrides: - wai-cors ==0.2.7 - wai-enforce-https ==0.0.2.1 - wai-eventsource ==3.0.0 - - wai-extra ==3.1.2 + - wai-extra ==3.1.3 - wai-feature-flags ==0.1.0.1 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.6 @@ -2547,18 +2552,18 @@ default-package-overrides: - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==0.0.0.3 - - with-location ==0.1.0 - - with-utf8 ==1.0.2.1 - witherable-class ==0 - within ==0.2.0.1 + - with-location ==0.1.0 + - with-utf8 ==1.0.2.1 - wizards ==1.0.3 - wl-pprint-annotated ==0.1.0.1 - wl-pprint-console ==0.1.0.2 - wl-pprint-text ==1.2.0.1 - - word-trie ==0.3.0 - - word-wrap ==0.4.1 - word24 ==2.0.1 - word8 ==0.1.3 + - word-trie ==0.3.0 + - word-wrap ==0.4.1 - world-peace ==1.0.2.0 - wrap ==0.0.0 - wreq ==0.5.3.2 @@ -2586,6 +2591,7 @@ default-package-overrides: - xml-basic ==0.1.3.1 - xml-conduit ==1.9.0.0 - xml-conduit-writer ==0.1.1.2 + - xmlgen ==0.6.2.2 - xml-hamlet ==0.5.0.1 - xml-helpers ==1.0.0 - xml-indexed-cursor ==0.1.1.0 @@ -2594,7 +2600,6 @@ default-package-overrides: - xml-to-json ==2.0.1 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.8 - - xmlgen ==0.6.2.2 - xmonad ==0.15 - xmonad-contrib ==0.16 - xmonad-extras ==0.15.2 @@ -2602,7 +2607,6 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.5.0 - yamlparse-applicative ==0.1.0.2 - - yes-precure5-command ==5.5.3 - yesod ==1.6.1.0 - yesod-auth ==1.6.10.1 - yesod-auth-hashdb ==1.7.1.5 @@ -2615,8 +2619,9 @@ default-package-overrides: - yesod-persistent ==1.6.0.5 - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - - yesod-test ==1.6.10 + - yesod-test ==1.6.11 - yesod-websockets ==0.3.0.2 + - yes-precure5-command ==5.5.3 - yi-rope ==0.11 - yjsvg ==0.2.0.1 - yjtools ==0.9.18 @@ -2631,9 +2636,9 @@ default-package-overrides: - zio ==0.1.0.2 - zip ==1.6.0 - zip-archive ==0.4.1 - - zip-stream ==0.2.0.1 - zipper-extra ==0.1.3.2 - zippers ==0.3 + - zip-stream ==0.2.0.1 - zlib ==0.6.2.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 @@ -3192,9 +3197,7 @@ broken-packages: - arguedit - ariadne - arion - - arith-encode - arithmetic-circuits - - arithmoi - armada - armor - arpa @@ -3374,8 +3377,8 @@ broken-packages: - base64-conduit - baserock-schema - basex-client - - basic - BASIC + - basic - baskell - batchd - battlenet @@ -3523,6 +3526,7 @@ broken-packages: - BirdPP - birds-of-paradise - bisect-binary + - bishbosh - bit-array - bit-stream - bitcoin-address @@ -3791,7 +3795,6 @@ broken-packages: - canteven-log - canteven-parsedate - cantor - - cantor-pairing - cao - cap - Capabilities @@ -3895,8 +3898,8 @@ broken-packages: - chatwork - cheapskate-terminal - check-pvp - - checked - Checked + - checked - checkmate - chell-quickcheck - chessIO @@ -3990,6 +3993,7 @@ broken-packages: - cli-extras - cli-git - cli-nix + - clickhouse-haskell - clif - clifford - clifm @@ -4345,7 +4349,6 @@ broken-packages: - custom-prelude - CV - cv-combinators - - cyclotomic - cypher - d-bus - d3js @@ -4354,8 +4357,8 @@ broken-packages: - damnpacket - Dangerous - danibot - - dao - Dao + - dao - dapi - darcs-benchmark - darcs-beta @@ -4533,6 +4536,7 @@ broken-packages: - derive-gadt - derive-IG - derive-monoid + - derive-storable-plugin - derive-trie - derp-lib - describe @@ -4801,11 +4805,13 @@ broken-packages: - ecma262 - ecu - eddie + - ede - edenmodules - edenskel - edentv - edge - edges + - edis - edit - edit-lenses - editable @@ -4879,13 +4885,13 @@ broken-packages: - EnumContainers - enumerate - enumerate-function - - enumeration - enumerator - enumerator-fd - enumerator-tf - enumfun - EnumMap - enummapmap + - env-extra - env-parser - envstatus - epanet-haskell @@ -5006,8 +5012,9 @@ broken-packages: - f-ree-hack-cheats-free-v-bucks-generator - Facebook-Password-Hacker-Online-Latest-Version - faceted - - facts + - factory - Facts + - facts - factual-api - fadno - fadno-braids @@ -5132,6 +5139,7 @@ broken-packages: - first-class-instances - firstify - FirstOrderTheory + - fishfood - fit - fits-parse - fitsio @@ -5159,6 +5167,7 @@ broken-packages: - flamethrower - flamingra - flashblast + - flat - flat-maybe - flatbuffers - flay @@ -5564,6 +5573,7 @@ broken-packages: - gloss-export - gloss-game - gloss-sodium + - glpk-headers - glpk-hs - gltf-codec - glue @@ -6000,7 +6010,6 @@ broken-packages: - haskell-type-exts - haskell-typescript - haskell-tyrant - - haskell-xmpp - haskell2010 - haskell2020 - haskell98 @@ -6153,8 +6162,8 @@ broken-packages: - hdaemonize-buildfix - hdbc-aeson - HDBC-mysql - - hdbc-postgresql-hstore - HDBC-postgresql-hstore + - hdbc-postgresql-hstore - hdbi - hdbi-conduit - hdbi-postgresql @@ -6198,6 +6207,7 @@ broken-packages: - hedgehog-servant - Hedi - hedis-config + - hedis-namespace - hedis-pile - hedis-simple - hedis-tags @@ -6241,7 +6251,6 @@ broken-packages: - heterolist - hetris - heukarya - - hevm - hevolisa - hevolisa-dph - hex-text @@ -6375,9 +6384,11 @@ broken-packages: - hlibfam - HList - hlivy - - hlogger - HLogger + - hlogger - hlongurl + - hlrdb + - hlrdb-core - hls - hls-brittany - hlwm @@ -6969,7 +6980,6 @@ broken-packages: - int-multimap - intcode - integer-pure - - integer-roots - integreat - intel-aes - intensional-datatys @@ -7216,6 +7226,7 @@ broken-packages: - keera-hails-reactive-yampa - keera-hails-reactivelenses - keera-hails-reactivevalues + - kempe - kerry - Ketchup - keter @@ -7788,8 +7799,8 @@ broken-packages: - mecab - mech - Mecha - - mechs - Mechs + - mechs - mediabus - mediabus-fdk-aac - mediabus-rtp @@ -8319,6 +8330,7 @@ broken-packages: - numeric-ranges - numerical - numhask-array + - numhask-free - numhask-hedgehog - numhask-histogram - numhask-prelude @@ -8495,6 +8507,7 @@ broken-packages: - pandoc-crossref - pandoc-csv2table - pandoc-filter-graphviz + - pandoc-filter-indent - pandoc-include - pandoc-include-code - pandoc-japanese-filters @@ -8662,6 +8675,7 @@ broken-packages: - peyotls - peyotls-codec - pez + - pg-extras - pg-harness - pg-harness-server - pg-recorder @@ -8797,6 +8811,7 @@ broken-packages: - polysemy-methodology - polysemy-methodology-composite - polysemy-optics + - polysemy-path - polysemy-RandomFu - polysemy-resume - polysemy-test @@ -8969,6 +8984,7 @@ broken-packages: - prosidy - prosidyc - prosper + - proteaaudio - proteome - proto-lens-combinators - proto-lens-descriptors @@ -9048,7 +9064,6 @@ broken-packages: - qtah-generator - qtah-qt5 - QuadEdge - - quadratic-irrational - QuadTree - quantfin - quantification @@ -9432,7 +9447,11 @@ broken-packages: - rocksdb-haskell - roku-api - rollbar + - rollbar-cli + - rollbar-client - rollbar-hs + - rollbar-wai + - rollbar-yesod - roller - RollingDirectory - ron-rdt @@ -9697,6 +9716,7 @@ broken-packages: - servant-openapi3 - servant-pagination - servant-pandoc + - servant-polysemy - servant-pool - servant-postgresql - servant-proto-lens @@ -9921,6 +9941,7 @@ broken-packages: - Smooth - smsaero - smt-lib + - smt2-parser - SmtLib - smtlib2 - smtlib2-debug @@ -10089,6 +10110,7 @@ broken-packages: - sqlvalue-list - sqsd-local - squeal-postgresql + - squeeze - sr-extra - srcinst - sscan @@ -10176,6 +10198,7 @@ broken-packages: - stmcontrol - stochastic - StockholmAlignment + - stocks - Stomp - storable - storable-static-array @@ -10357,8 +10380,8 @@ broken-packages: - table - table-tennis - tableaux - - tables - Tables + - tables - tablestorage - Tablify - tabloid @@ -10628,8 +10651,8 @@ broken-packages: - tonatona-servant - too-many-cells - toodles - - top - Top + - top - topkata - torch - TORCS @@ -10883,6 +10906,7 @@ broken-packages: - uploadcare - upskirt - urbit-airlock + - urbit-api - ureader - urembed - uri @@ -11150,6 +11174,7 @@ broken-packages: - WEditor - WEditorBrick - WEditorHyphen + - weekdaze - weighted - weighted-regexp - welshy @@ -11338,6 +11363,7 @@ broken-packages: - yam-datasource - yam-logger - yam-redis + - yam-servant - yam-transaction - yam-transaction-odbc - yam-web @@ -11358,6 +11384,7 @@ broken-packages: - yaop - yap - yarn-lock + - yarn2nix - yarr - yarr-image-io - yavie diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0a08fb89cbfa..530e2707a2a9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -830,4 +830,7 @@ self: super: builtins.intersectAttrs super { export HOME=$TMPDIR ''; }); + + # tests depend on a specific version of solc + hevm = dontCheck (doJailbreak super.hevm); } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 154c9ec14cb7..85711a041b5b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -20659,8 +20659,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.10"; - sha256 = "16m08h11c8wwi159ppn698m60nk54k4dgxa2di2j02g58l16pmcn"; + version = "0.3.11"; + sha256 = "0xlw2znk6lzblc9iv13fiy2zxngglc9ylzb1lj6qcfdnbi1sr9n0"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -24062,8 +24062,8 @@ self: { }: mkDerivation { pname = "advent-of-code-api"; - version = "0.2.7.0"; - sha256 = "0a1h2kwmfnhs1sj7wmnc4hgfwq45d8xl2ah0s6432k13v8lfpxwr"; + version = "0.2.7.1"; + sha256 = "1amm7gvr04ndfw6b0jxy8wsa35lqbfb85wp9bn9kycd8qp6vq9cs"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath finite-typelits http-api-data http-client http-client-tls @@ -24084,8 +24084,8 @@ self: { }: mkDerivation { pname = "advent-of-code-ocr"; - version = "0.1.0.0"; - sha256 = "03qak7hic0kbmxz7krq5z2a8ah6z7pzr7r3sybd5h778m4sgvdca"; + version = "0.1.1.0"; + sha256 = "0kzmm901yz262dblwv1wxf86h1jm8m2x1ky1gqvj03lck598fqz7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -24589,8 +24589,8 @@ self: { }: mkDerivation { pname = "aeson-injector"; - version = "1.1.4.0"; - sha256 = "1q8wv9xdw8nw504dxplb3ibskfjqbawmv2694sjwg5cvi8d7fvkn"; + version = "1.1.5.0"; + sha256 = "0hg853hhbvmqa6yj0xg8naxdrbs2n3lzld0jrbmfmccjqcfzarx4"; libraryHaskellDepends = [ aeson base bifunctors deepseq hashable lens servant-docs swagger2 text unordered-containers @@ -31931,8 +31931,8 @@ self: { }: mkDerivation { pname = "arch-hs"; - version = "0.4.0.0"; - sha256 = "022vvznfqkia0w6s6wc586cbzj3l6yabkf73bx2biy8axsls2g4p"; + version = "0.5.0.0"; + sha256 = "04w0b8ivwrm1g0qg0pym7qap4ggzv6ng9x6jy5k2nnbmpck07597"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32385,8 +32385,6 @@ self: { ]; description = "A practical arithmetic encoding (aka Godel numbering) library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "arithmatic" = callPackage @@ -32491,8 +32489,6 @@ self: { ]; description = "Efficient basic number-theoretic functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "arity-generic-liftA" = callPackage @@ -38622,8 +38618,8 @@ self: { }: mkDerivation { pname = "beam-automigrate"; - version = "0.1.0.1"; - sha256 = "0sjp09wfp6qlrbl6w8ddwngsnrwvp225msqgnv0l1x4nwxia5kpz"; + version = "0.1.1.0"; + sha256 = "14h8zbxyrkhajjbhjmdib9s99xv0bmar4s6gb4mpqkvhakj7a76n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41735,6 +41731,8 @@ self: { ]; description = "Plays chess"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bit-array" = callPackage @@ -43063,6 +43061,8 @@ self: { pname = "blaze-colonnade"; version = "1.2.2.1"; sha256 = "1wh0q72qv2s6a42i13lqb94i0b5bgmqwqw7d5xy89dc76j0ncd2d"; + revision = "1"; + editedCabalFile = "0b8imj6i3map53b3j9i7rz9wc65s10qd4hndpq6nik2xd6shdip3"; libraryHaskellDepends = [ base blaze-html blaze-markup colonnade profunctors text ]; @@ -44788,8 +44788,8 @@ self: { }: mkDerivation { pname = "box-socket"; - version = "0.1.1"; - sha256 = "162c3rnr5h5a8sixwnsbvf6fdbghsxx1ckvgdn4pd4b5xfa287j0"; + version = "0.1.2"; + sha256 = "0ybv8amph38s2yz8qpwjrn7428d09ikl7d5ljqkbivydripg6ybc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -44800,7 +44800,7 @@ self: { base box concurrency generic-lens lens numhask optparse-generic ]; testHaskellDepends = [ base doctest numhask ]; - description = "See readme.md"; + description = "Box websockets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -47248,8 +47248,8 @@ self: { }: mkDerivation { pname = "bytestring-tree-builder"; - version = "0.2.7.5"; - sha256 = "0mja4hfqn2p73hslsabgxmsj9i0990p217882ydb479vpdvy74m4"; + version = "0.2.7.7"; + sha256 = "193nryzgbjij6md84i2w2jhpsgsqz94g71744wj45qr2gzivyxfb"; libraryHaskellDepends = [ base base-prelude bytestring text ]; testHaskellDepends = [ base-prelude bytestring QuickCheck quickcheck-instances tasty @@ -49473,8 +49473,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.22.0"; - sha256 = "0cmv24r5ay34v50rfdp7rakhzrs0fx079nncfq4xi5j4mm484dna"; + version = "0.1.22.1"; + sha256 = "0mwpggxkag3l4ql75yhp5a0mpmwah44a9rqpsln0ds405jydjw92"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers data-default-class data-flags deepseq deque df1 di-core di-polysemy @@ -49990,8 +49990,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert data to and from a natural number representation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cao" = callPackage @@ -53069,33 +53067,31 @@ self: { "chessIO" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , directory, extra, file-embed, haskeline, megaparsec, MonadRandom - , mtl, o-clock, optparse-applicative, parallel, parser-combinators - , prettyprinter, process, random, stm, text, time - , unordered-containers, vector + , mtl, o-clock, optparse-applicative, parallel, prettyprinter + , process, random, stm, text, time, unordered-containers, vector }: mkDerivation { pname = "chessIO"; - version = "0.4.0.0"; - sha256 = "0166hrzpw9hcbcgckyf966nvjyf6caa1h3sdi923m9y32924p65v"; + version = "0.5.0.0"; + sha256 = "14di8x8r7q2sjwipx8crgr0bcy3qhr58knf6paqkfqsxc3iynr0h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base binary bytestring containers file-embed megaparsec - MonadRandom o-clock parser-combinators prettyprinter process random - stm text unordered-containers vector + attoparsec base binary bytestring containers extra file-embed + megaparsec MonadRandom o-clock prettyprinter process random stm + text unordered-containers vector ]; executableHaskellDepends = [ attoparsec base binary bytestring containers extra file-embed haskeline megaparsec MonadRandom mtl o-clock optparse-applicative - parser-combinators prettyprinter process random stm text time - unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base binary bytestring containers directory file-embed - megaparsec MonadRandom o-clock parallel parser-combinators prettyprinter process random stm text time unordered-containers vector ]; + testHaskellDepends = [ + attoparsec base binary bytestring containers directory extra + file-embed megaparsec MonadRandom o-clock parallel prettyprinter + process random stm text time unordered-containers vector + ]; description = "Basic chess library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -54098,19 +54094,21 @@ self: { "circular" = callPackage ({ mkDerivation, aeson, base, criterion, hspec, hspec-discover - , QuickCheck, quickcheck-instances, vector + , primitive, QuickCheck, quickcheck-instances, vector }: mkDerivation { pname = "circular"; - version = "0.1.1"; - sha256 = "0kj9sfal78k0ba5djq10xddy2h8lq0grf5cknwcr96j555nlwhk9"; - libraryHaskellDepends = [ aeson base vector ]; + version = "0.3.1"; + sha256 = "14fyhqyqv08yml0bsxpjqv3x1alnwdsp9yx5f035vwp9p1mh7rll"; + libraryHaskellDepends = [ aeson base primitive vector ]; testHaskellDepends = [ - aeson base hspec hspec-discover QuickCheck quickcheck-instances - vector + aeson base hspec hspec-discover primitive QuickCheck + quickcheck-instances vector ]; testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ aeson base criterion vector ]; + benchmarkHaskellDepends = [ + aeson base criterion primitive vector + ]; description = "Circular fixed-sized mutable vectors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -55446,6 +55444,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clickhouse-haskell" = callPackage + ({ mkDerivation, aeson, array, async, attoparsec, base, binary + , bytestring, bytestring-to-vector, call-stack, containers + , data-default-class, data-dword, exceptions, filepath, hashable + , hashmap, haxl, hspec, http-client, HUnit, io-streams, monad-loops + , monad-parallel, mtl, network, network-ip, network-simple, parsec + , QuickCheck, resource-pool, split, streaming-commons, text, time + , transformers, tz, unix-time, unordered-containers, uri-encode + , uuid, vector, word8 + }: + mkDerivation { + pname = "clickhouse-haskell"; + version = "0.1.2.0"; + sha256 = "0mys7l7sncrdwd673p0s4ls3ir5i26kcjl7x0hpd9a4ms8y04fxx"; + libraryHaskellDepends = [ + aeson array async attoparsec base binary bytestring + bytestring-to-vector call-stack containers data-default-class + data-dword exceptions filepath hashable hashmap haxl http-client + io-streams monad-loops monad-parallel mtl network network-ip + network-simple parsec resource-pool split streaming-commons text + time transformers tz unix-time unordered-containers uri-encode uuid + vector word8 + ]; + testHaskellDepends = [ + aeson array async attoparsec base binary bytestring + bytestring-to-vector call-stack containers data-default-class + data-dword exceptions filepath hashable hashmap haxl hspec + http-client HUnit io-streams monad-loops monad-parallel mtl network + network-ip network-simple parsec QuickCheck resource-pool split + streaming-commons text time transformers tz unix-time + unordered-containers uri-encode uuid vector word8 + ]; + description = "A Haskell library as database client for Clickhouse"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "clientsession" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cereal , cipher-aes, containers, cprng-aes, crypto-api, crypto-random @@ -60128,34 +60164,6 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.3.3"; - sha256 = "0jv3j1dc7iswi3kljn9y3jq7rn2aiq9d1vkn2xdpirc519ckxfnl"; - libraryHaskellDepends = [ - base bytestring directory exceptions filepath mono-traversable mtl - primitive resourcet text transformers unix unliftio-core vector - ]; - testHaskellDepends = [ - base bytestring containers directory exceptions filepath hspec - mono-traversable mtl QuickCheck resourcet safe silently split text - transformers unliftio vector - ]; - benchmarkHaskellDepends = [ - base containers deepseq gauge hspec kan-extensions mwc-random - transformers vector - ]; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit_1_3_4" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, gauge, hspec, kan-extensions - , mono-traversable, mtl, mwc-random, primitive, QuickCheck - , resourcet, safe, silently, split, text, transformers, unix - , unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "conduit"; version = "1.3.4"; sha256 = "1w30chhqryhkv82mvwqi1q09fvfxva70280q3nf4h97amld860lz"; libraryHaskellDepends = [ @@ -60173,7 +60181,6 @@ self: { ]; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-algorithms" = callPackage @@ -61020,10 +61027,8 @@ self: { }: mkDerivation { pname = "config-value"; - version = "0.8"; - sha256 = "1l2w2ylxx9d48pjnc9490kisawz48mf038f108g3zvb0j3iz9vyn"; - revision = "1"; - editedCabalFile = "0s121lvv1bv658ig1r3gdkf37wjyvgy958ll1497r8hsc6y73f4m"; + version = "0.8.1"; + sha256 = "086jv01a737547w6x9w1951vq0p7mx6vqw9ifw5kcs5nvhj5rx2q"; libraryHaskellDepends = [ array base containers pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -65656,8 +65661,8 @@ self: { }: mkDerivation { pname = "csound-catalog"; - version = "0.7.3"; - sha256 = "18xn06drza3pwyhidlkr478hvn8ss93f3f30wmfrh79ngabip4kp"; + version = "0.7.4"; + sha256 = "1ca70yk13b239383q9d8fwc4qd6jm22dqinfhasd88b4iv9p46h8"; libraryHaskellDepends = [ base csound-expression csound-sampler sharc-timbre transformers ]; @@ -65665,6 +65670,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "csound-controllers" = callPackage + ({ mkDerivation, base, csound-expression }: + mkDerivation { + pname = "csound-controllers"; + version = "0.1.1.0"; + sha256 = "1p2fa00djwyrv7fdrngawmk3r41q6a4mlsqgdm4qajmivbj0sg9m"; + libraryHaskellDepends = [ base csound-expression ]; + testHaskellDepends = [ base csound-expression ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + "csound-expression" = callPackage ({ mkDerivation, base, Boolean, colour, containers , csound-expression-dynamic, csound-expression-opcodes @@ -65673,8 +65689,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.3.3"; - sha256 = "0g6djh3ijvka6hkw4nhb7vhhyl4i268rdxvnwmm6ayg6a8kg8p0g"; + version = "5.3.4"; + sha256 = "0v5mv2yhw114y7hixh3qjy88sfrry7xfyzkwwk1dpwnq8yycp0ir"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -65691,8 +65707,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.5"; - sha256 = "07xykqpym48bvvs7sa0m12psahsn7z245cd89akv9flkgwjwaa29"; + version = "0.3.6"; + sha256 = "1s4gyn4rpkpfpb0glbb39hnzkw9vr4his3s4a4azx894cymyhzg0"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse deriving-compat hashable transformers wl-pprint @@ -65707,8 +65723,8 @@ self: { }: mkDerivation { pname = "csound-expression-opcodes"; - version = "0.0.4.0"; - sha256 = "1rzkv24xppysmx20x453wzxfapkic99c98jqzpf2iyfyny1qya2w"; + version = "0.0.5.0"; + sha256 = "1qif8nx3652883zf84w4d0l2lzlbrk9n25rn4i5mxcmlv9px06ha"; libraryHaskellDepends = [ base csound-expression-dynamic csound-expression-typed transformers ]; @@ -65724,8 +65740,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.3.1"; - sha256 = "02zd41sz1y8qfchdyhgiddi6s1p5081nr5haq04qdmbz5bgpdmbq"; + version = "0.2.4"; + sha256 = "1hqmwlgx0dcci7z76w4i5xcq10c4jigzbm7fvf0xxwffmhf6j752"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -65740,8 +65756,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.9.0"; - sha256 = "0vvsqbnd1yjwijz4g0y9av6d20m73b5swln4v7gna3jd16mrg2k1"; + version = "0.0.10.0"; + sha256 = "0mi7w39adkn5l1h05arfap3c0ddb8j65wv96i3jrswpc3ljf3b2y"; libraryHaskellDepends = [ base csound-expression transformers ]; description = "A musical sampler based on Csound"; license = stdenv.lib.licenses.bsd3; @@ -66831,8 +66847,6 @@ self: { ]; description = "A subfield of the complex numbers for exact calculation"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cypher" = callPackage @@ -68425,8 +68439,8 @@ self: { ({ mkDerivation, base, criterion, transformers }: mkDerivation { pname = "data-has"; - version = "0.3.0.0"; - sha256 = "0ybkm9zvl0l60f44p80fislbdmwwhavqz31wymnikjsyc01x899w"; + version = "0.4.0.0"; + sha256 = "1zkjn2m4s59h09i3kgqxr45xw8kr34d1f2fxanac1c7y8242vdbz"; libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base criterion transformers ]; description = "Simple extensible product"; @@ -71059,28 +71073,6 @@ self: { "deferred-folds" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , primitive, QuickCheck, quickcheck-instances, rerebase, tasty - , tasty-hunit, tasty-quickcheck, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "deferred-folds"; - version = "0.9.11"; - sha256 = "02j1akzjdi73l7adlhv49sln5saq2j53pziqwzw6zw0bsf53q00k"; - libraryHaskellDepends = [ - base bytestring containers foldl hashable primitive transformers - unordered-containers vector - ]; - testHaskellDepends = [ - QuickCheck quickcheck-instances rerebase tasty tasty-hunit - tasty-quickcheck - ]; - description = "Abstractions over deferred folds"; - license = stdenv.lib.licenses.mit; - }) {}; - - "deferred-folds_0_9_15" = callPackage - ({ mkDerivation, base, bytestring, containers, foldl, hashable - , primitive, QuickCheck, quickcheck-instances, rerebase, tasty , tasty-hunit, tasty-quickcheck, text, transformers , unordered-containers, vector }: @@ -71098,7 +71090,6 @@ self: { ]; description = "Abstractions over deferred folds"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "definitive-base" = callPackage @@ -71952,8 +71943,8 @@ self: { ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck }: mkDerivation { pname = "derive-storable"; - version = "0.2.0.0"; - sha256 = "0cr13ydc3p5zsrzimha4xkaj5hmf2bj3hylzjh2llgcgi2l8vc53"; + version = "0.3.0.0"; + sha256 = "1qxf729wmvcszw9bs2w9h7ww9sh55576hvalpg0qp6l3zlp3f4sq"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ base criterion deepseq ]; @@ -71967,10 +71958,8 @@ self: { }: mkDerivation { pname = "derive-storable-plugin"; - version = "0.2.3.0"; - sha256 = "0yr9s33drw5l4ckqipqpmgrsrnm18yr4742mmyjqm3x7wai7d99q"; - revision = "1"; - editedCabalFile = "0wrynvd305bk3mvm9rbs9vrfb65yhiy2s83r8hs690r1vsw4mdkj"; + version = "0.2.3.1"; + sha256 = "1g2i2l97jldw9yv10dbcbaq54lz1k1aajhxr28m7fgjwf2mry3gi"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ base derive-storable ghc ghci hspec QuickCheck @@ -71980,6 +71969,8 @@ self: { ]; description = "GHC core plugin supporting the derive-storable package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "derive-topdown" = callPackage @@ -72590,6 +72581,8 @@ self: { pname = "dhall"; version = "1.36.0"; sha256 = "014bdxmrcxzc2yrk838fxbz521714fk3a7c6idb9065wrfzch1wj"; + revision = "1"; + editedCabalFile = "1561i0rv0qx4mizwg1k04qynwdz6gsx4fifps9415rwdfki6dyxw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -76992,8 +76985,8 @@ self: { }: mkDerivation { pname = "doctemplates"; - version = "0.8.2"; - sha256 = "14xymm4lp0nfbm2y8jcyaisb52mrwjz40dz5n5c8m48rkqqb4qzl"; + version = "0.8.3"; + sha256 = "0pzzcy2f1ysnqzkv14h7x9dp9ywf5rn5k8cvwwwvlg6sjizgvfpd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers doclayout filepath HsYAML mtl parsec safe @@ -80075,29 +80068,36 @@ self: { }) {}; "ede" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors - , bytestring, comonad, directory, double-conversion, filepath, free - , lens, mtl, parsers, scientific, semigroups, tasty, tasty-golden - , text, text-format, text-manipulate, trifecta - , unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring + , comonad, directory, filepath, free, lens, mtl + , optparse-applicative, parsers, prettyprinter + , prettyprinter-ansi-terminal, scientific, tasty, tasty-golden + , text, text-manipulate, trifecta, unordered-containers, vector }: mkDerivation { pname = "ede"; - version = "0.2.9"; - sha256 = "0gvs9kyq4xyz11x5cqmr7vnh4d1vany36rfpmm4dg23w3yj36fab"; + version = "0.3.2.0"; + sha256 = "1y78l8b6wnl621nlfm3jwf9qskfnyd4ian1sxjsmk2jw22z1yp4d"; + isLibrary = true; + isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson ansi-wl-pprint base bifunctors bytestring comonad directory - double-conversion filepath free lens mtl parsers scientific - semigroups text text-format text-manipulate trifecta - unordered-containers vector + aeson base bytestring comonad directory filepath free lens mtl + parsers prettyprinter prettyprinter-ansi-terminal scientific text + text-manipulate trifecta unordered-containers vector + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring optparse-applicative prettyprinter + prettyprinter-ansi-terminal text ]; testHaskellDepends = [ - aeson base bifunctors bytestring directory tasty tasty-golden text + aeson base bifunctors bytestring directory filepath tasty + tasty-golden text ]; description = "Templating language with similar syntax and features to Liquid or Jinja2"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "edenmodules" = callPackage @@ -80217,6 +80217,8 @@ self: { libraryHaskellDepends = [ base bytestring cereal hedis ]; description = "Statically typechecked client for Redis"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "edit" = callPackage @@ -82762,8 +82764,6 @@ self: { testHaskellDepends = [ arith-encode base binary HUnit-Plus ]; description = "A practical API for building recursive enumeration procedures and enumerating datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "enumerator" = callPackage @@ -82921,6 +82921,8 @@ self: { ]; description = "Safe helpers for accessing and modifying environment variables"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "env-locale" = callPackage @@ -83581,13 +83583,24 @@ self: { ({ mkDerivation, base, containers, text }: mkDerivation { pname = "error-or"; - version = "0.1.0.0"; - sha256 = "1bpazb078xfbylzpzh9dq3p3fgddpizv118n31papi0fr7xddrli"; + version = "0.1.1.0"; + sha256 = "0xh47kyzdyycvi6dxlw736zsa4pxplh9ariw7p2mcr64rx2r77cl"; libraryHaskellDepends = [ base containers text ]; description = "Composable, hierarchical errors"; license = stdenv.lib.licenses.bsd3; }) {}; + "error-or-utils" = callPackage + ({ mkDerivation, base, containers, error-or, text }: + mkDerivation { + pname = "error-or-utils"; + version = "0.1.1"; + sha256 = "14n5h69wknns3b6ij8avdijwlpwykalkpvx2q57cg6zv0ywnvmwz"; + libraryHaskellDepends = [ base containers error-or text ]; + description = "Utilities using ErrorOr datatype"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "error-util" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -86765,6 +86778,8 @@ self: { ]; description = "Rational arithmetic in an irrational world"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "facts" = callPackage @@ -90055,6 +90070,8 @@ self: { ]; description = "Calculates file-size frequency-distribution"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "fit" = callPackage @@ -90792,6 +90809,8 @@ self: { ]; description = "Principled and efficient bit-oriented binary serialization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "flat-maybe" = callPackage @@ -94117,8 +94136,8 @@ self: { ({ mkDerivation, base, bifunctors, lens, optparse-applicative }: mkDerivation { pname = "friendly"; - version = "0.1.0.1"; - sha256 = "0860zmvlccdnjycmjr4wmi8ighps9dig5zik8hpj2h3z208ph8qp"; + version = "0.1.0.2"; + sha256 = "18j9nw76rwsikf5wyv33mw04mn4xmdnk757c26zfbcx8rkcwjqzn"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -98579,8 +98598,8 @@ self: { }: mkDerivation { pname = "geos"; - version = "0.3.0"; - sha256 = "1nv4x881ds6492lq1r14fd6isfb65b0cpxvgh6gpy5l0wyyap1gp"; + version = "0.4.1"; + sha256 = "1b6dp3vzp8jpgdzkqzfyjk8n26w8jb06adp77qzfbjmik0lw8b03"; libraryHaskellDepends = [ base bytestring mtl transformers vector ]; @@ -100927,25 +100946,6 @@ self: { }: mkDerivation { pname = "gi-gobject"; - version = "2.0.24"; - sha256 = "1i19s7pcs3gnhhyif8y3j7hngmdzfqbgaw52j8dvrz7w11fbx9sj"; - setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "GObject bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "gi-gobject_2_0_25" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-gobject"; version = "2.0.25"; sha256 = "0yz80wcxhy1mm441507qsj2f7380l2iwh4s1miwpd8kb5m147n9w"; setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; @@ -100956,7 +100956,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-graphene" = callPackage @@ -103895,6 +103894,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Low-level Haskell bindings to GLPK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) glpk;}; "glpk-hs" = callPackage @@ -112601,6 +112602,8 @@ self: { pname = "hakyll"; version = "4.13.4.1"; sha256 = "1z9k3029bjyxy2aqmqr6gzsva50154y4bfxqkmsjgl38lx3s6kk9"; + revision = "1"; + editedCabalFile = "1hv80gqq50zz791620lgdvkspspii0z59ngj7la69cdw2739cc5g"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -116412,28 +116415,6 @@ self: { }: mkDerivation { pname = "haskell-gi"; - version = "0.24.5"; - sha256 = "0cb7qbi92zgqv9nx0v6pggw3lwv931hpph2jnrbmr1vl7sz48rqn"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal attoparsec base bytestring Cabal containers directory - filepath haskell-gi-base mtl pretty-show process regex-tdfa safe - text transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_24_7" = callPackage - ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, directory, doctest, filepath, glib - , gobject-introspection, haskell-gi-base, mtl, pretty-show, process - , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; version = "0.24.7"; sha256 = "10xp6z6whfx3iad09l83mcszzj99cc9wcnvk593ypx6zhjv0r555"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -116446,32 +116427,18 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.24.4"; - sha256 = "1xdl2pfpk30h4649avh0ms6gq9dij3yxpfxn6kwxyjcsxdggzmdg"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - description = "Foundation for libraries generated by haskell-gi"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "haskell-gi-base_0_24_5" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; version = "0.24.5"; sha256 = "0fd5bsf2bnjaq9j8zs9l5837z9x2iryivs57y96c7fx6vxxb9xai"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-gi-overloading" = callPackage @@ -117927,8 +117894,6 @@ self: { executableToolDepends = [ hspec-discover ]; description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell2010" = callPackage @@ -118718,8 +118683,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.17.3"; - sha256 = "070z3qf4jgczl42dbmrfl0pcva9ddv59ygknw2yzlbablkhb160j"; + version = "0.17.5"; + sha256 = "1isfxzn5gz7py469mh9m6jd430w9alp0x8b75rymd3sp2ihwc3mz"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec memory mtl @@ -118856,8 +118821,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.38.3"; - sha256 = "1131smwdfbyw6y3mk3nsnsgkky0sd4zxjmlzzdp5g3b8s9859vwh"; + version = "0.38.4"; + sha256 = "1kiqib85rblq9y8mz5fsiqv4w9i5bzqj6h62yxd7riigc82h10g3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121941,32 +121906,6 @@ self: { "headroom" = callPackage ({ mkDerivation, aeson, base, data-default-class, doctest, either - , file-embed, hspec, microlens, microlens-th, mustache - , optparse-applicative, pcre-heavy, pcre-light, QuickCheck, rio - , template-haskell, time, yaml - }: - mkDerivation { - pname = "headroom"; - version = "0.3.1.0"; - sha256 = "0md8yzjq92xc9pq9h8a78irgyka23ck7nlhdbdyfnm2f490fx2yw"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base data-default-class either file-embed microlens - microlens-th mustache optparse-applicative pcre-heavy pcre-light - rio template-haskell time yaml - ]; - executableHaskellDepends = [ base optparse-applicative rio ]; - testHaskellDepends = [ - aeson base doctest hspec optparse-applicative pcre-light QuickCheck - rio time - ]; - description = "License Header Manager"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "headroom_0_3_2_0" = callPackage - ({ mkDerivation, aeson, base, data-default-class, doctest, either , file-embed, hspec, hspec-discover, microlens, microlens-th , mustache, optparse-applicative, pcre-heavy, pcre-light , QuickCheck, rio, template-haskell, time, yaml @@ -121990,7 +121929,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "License Header Manager"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heap" = callPackage @@ -122037,15 +121975,17 @@ self: { }) {}; "heapsize" = callPackage - ({ mkDerivation, base, criterion, deepseq, ghc-heap, hashable - , primitive, unordered-containers + ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-heap + , hashable, hashtables, primitive, transformers + , unordered-containers }: mkDerivation { pname = "heapsize"; - version = "0.1"; - sha256 = "0cmzmz6f572is70sp79fxriywl5d19rcb8c32x22c2yazyl6c6d9"; + version = "0.3.0"; + sha256 = "14i4yfk8qfpkcajb9h500dx4s5mqnpvfnyh1v3rp8pxcb93ffgc1"; libraryHaskellDepends = [ - base deepseq ghc-heap hashable primitive unordered-containers + base deepseq exceptions ghc-heap hashable hashtables primitive + transformers unordered-containers ]; benchmarkHaskellDepends = [ base criterion deepseq primitive ]; description = "Determine the size of runtime data structures"; @@ -122562,8 +122502,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.12.15"; - sha256 = "0zkavyx4nbdrwl5sywl2rn9lmakpfw2jgs8sjqzjsnnkbk62i33j"; + version = "0.13.1"; + sha256 = "1x1hm0cw0ccx3zcwirs5m3fkbvqc2mcyn5pvsx5fczzpnwzj4d2g"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq errors exceptions HTTP mtl network network-uri resource-pool scanner stm text time @@ -122634,6 +122574,8 @@ self: { testHaskellDepends = [ base ]; description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hedis-pile" = callPackage @@ -123805,8 +123747,8 @@ self: { "hevm" = callPackage ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base , base16-bytestring, binary, brick, bytestring, cereal, containers - , cryptonite, data-dword, deepseq, directory, ff, fgl, filepath - , free, haskeline, here, HUnit, lens, lens-aeson, megaparsec + , cryptonite, data-dword, deepseq, directory, fgl, filepath, free + , haskeline, here, HUnit, lens, lens-aeson, libff, megaparsec , memory, monad-par, mtl, multiset, operational, optparse-generic , process, QuickCheck, quickcheck-text, regex-tdfa, restless-git , rosezipper, s-cargot, sbv, scientific, secp256k1, semver-range @@ -123831,7 +123773,7 @@ self: { time transformers tree-view unordered-containers vector vty witherable wreq ]; - librarySystemDepends = [ ff secp256k1 ]; + librarySystemDepends = [ libff secp256k1 ]; executableHaskellDepends = [ aeson ansi-wl-pprint async base base16-bytestring binary brick bytestring containers cryptonite data-dword deepseq directory @@ -123847,9 +123789,7 @@ self: { testSystemDepends = [ secp256k1 ]; description = "Ethereum virtual machine evaluator"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {ff = null; inherit (pkgs) secp256k1;}; + }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage ({ mkDerivation, base, bytestring, cairo, filepath, haskell98 }: @@ -126036,15 +125976,15 @@ self: { "hinterface" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, containers - , cryptonite, deepseq, exceptions, hspec, lifted-async, lifted-base - , memory, monad-control, monad-logger, mtl, network, QuickCheck - , random, resourcet, safe-exceptions, stm, text, transformers - , transformers-base, vector + , cryptonite, deepseq, exceptions, hspec, hspec-discover + , lifted-async, lifted-base, memory, monad-control, monad-logger + , mtl, network, QuickCheck, random, resourcet, safe-exceptions, stm + , text, transformers, transformers-base, vector }: mkDerivation { pname = "hinterface"; - version = "2.0.0"; - sha256 = "1n1mp34s0ks7hkd2ddhfva9pbjwkciy1jjmqznmca244xg095yia"; + version = "2.0.1"; + sha256 = "0gxzkw1acvw8awmc5c52wxxhg7qda5sr0kh7g6ywy20xw231glf4"; libraryHaskellDepends = [ array async base binary bytestring containers cryptonite deepseq exceptions lifted-async lifted-base memory monad-control @@ -126055,6 +125995,7 @@ self: { async base binary bytestring hspec monad-logger QuickCheck transformers vector ]; + testToolDepends = [ hspec-discover ]; description = "Haskell / Erlang interoperability library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -127461,6 +127402,8 @@ self: { ]; description = "High-level Redis Database"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hlrdb-core" = callPackage @@ -127479,6 +127422,8 @@ self: { ]; description = "High-level Redis Database Core API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hls" = callPackage @@ -128326,24 +128271,52 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "hnix-store-core_0_3_0_1" = callPackage + ({ mkDerivation, algebraic-graphs, attoparsec, base + , base16-bytestring, base64-bytestring, binary, bytestring, cereal + , containers, cryptohash-md5, cryptohash-sha1, cryptohash-sha256 + , cryptohash-sha512, directory, filepath, hashable, io-streams + , lifted-base, monad-control, mtl, nix-derivation, process + , process-extras, saltine, tasty, tasty-discover, tasty-golden + , tasty-hspec, tasty-hunit, tasty-quickcheck, temporary, text, time + , unix, unordered-containers, vector + }: + mkDerivation { + pname = "hnix-store-core"; + version = "0.3.0.1"; + sha256 = "186r0z8csvj7ly9ag9lpvc6nm4x3hzx18rdc1jxzavaavcpdpn00"; + libraryHaskellDepends = [ + algebraic-graphs attoparsec base base16-bytestring + base64-bytestring binary bytestring cereal containers + cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512 + directory filepath hashable lifted-base monad-control mtl + nix-derivation saltine text time unix unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base base16-bytestring base64-bytestring binary + bytestring containers directory filepath io-streams process + process-extras tasty tasty-discover tasty-golden tasty-hspec + tasty-hunit tasty-quickcheck temporary text unix + ]; + testToolDepends = [ tasty-discover ]; + description = "Core effects for interacting with the Nix store"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hnix-store-remote" = callPackage - ({ mkDerivation, base, base64-bytestring, binary, bytestring - , containers, hnix-store-core, mtl, network, pretty-simple, text - , unix, unordered-containers + ({ mkDerivation, attoparsec, base, binary, bytestring, containers + , filepath, hnix-store-core, mtl, network, nix-derivation, text + , time, unix, unordered-containers, vector }: mkDerivation { pname = "hnix-store-remote"; - version = "0.1.0.0"; - sha256 = "04dmql5235z05hq36wnbgc3sk0izqryv7n8dh8r3dq2j87zvv3y8"; - isLibrary = true; - isExecutable = true; + version = "0.3.0.0"; + sha256 = "0spvbix7m70v95fvkcs0vxas8nmwpjh4lfaglyvw1ijkf71xn9gl"; libraryHaskellDepends = [ - base base64-bytestring binary bytestring containers hnix-store-core - mtl network text unix unordered-containers - ]; - executableHaskellDepends = [ - base bytestring hnix-store-core mtl pretty-simple - unordered-containers + attoparsec base binary bytestring containers filepath + hnix-store-core mtl network nix-derivation text time unix + unordered-containers vector ]; description = "Remote hnix store"; license = stdenv.lib.licenses.asl20; @@ -128551,8 +128524,8 @@ self: { }: mkDerivation { pname = "hobbits"; - version = "1.3"; - sha256 = "1w8bz1z747dd7vh110iynmsq5n0a84zw1gk7jcxfwl5lpfrqz97s"; + version = "1.3.1"; + sha256 = "0jpm65s2f0fz5ipppryy2k8qja2ijmfd56a65z5k0hsx4j93ipva"; libraryHaskellDepends = [ base containers deepseq haskell-src-exts haskell-src-meta mtl syb tagged template-haskell th-expand-syns transformers vector @@ -128630,12 +128603,9 @@ self: { ({ mkDerivation, base, hspec, MissingH, parsec, split }: mkDerivation { pname = "hocon"; - version = "0.1.0.1"; - sha256 = "06xk118q1f5cik98w3swqw61nc7skx0bvf7mj8iyji8wm6sb1p1w"; - isLibrary = true; - isExecutable = true; + version = "0.1.0.4"; + sha256 = "1wncdrqrvd2dhzrnsizxx95h022wmlnw9i9yjgn9k2j6yl7j1iiz"; libraryHaskellDepends = [ base hspec MissingH parsec split ]; - executableHaskellDepends = [ base hspec MissingH parsec split ]; testHaskellDepends = [ base hspec MissingH parsec split ]; description = "Small library for typesafe's configuration specification"; license = stdenv.lib.licenses.bsd3; @@ -128820,8 +128790,8 @@ self: { pname = "hoist-error"; version = "0.2.1.0"; sha256 = "028lczd80nhj3yj5dq9qixzdzkyisl34qpi6bb28r8b9nj2i2nss"; - revision = "3"; - editedCabalFile = "1g80simnv15dqlch83mgn6yj8z93g0wpj0y1xz53p4dvafs18zlc"; + revision = "4"; + editedCabalFile = "1xp8l236gflh5njl3s8f0d2ahqypks70pfjnawskc0fcnl818qpa"; libraryHaskellDepends = [ base either mtl ]; description = "Some convenience facilities for hoisting errors into a monad"; license = stdenv.lib.licenses.mit; @@ -131272,8 +131242,8 @@ self: { }: mkDerivation { pname = "hriemann"; - version = "0.3.3.3"; - sha256 = "0xxdzbx5wqmz62k8jka2k896sdz49j2aqivmcic9fsrar5inalyp"; + version = "0.3.3.4"; + sha256 = "0hgnpxldj4wag582h0qnf0nchjxbdmd6ydl8xadi278wpv0hdqnw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137146,6 +137116,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-conduit_2_3_7_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, connection, cookie + , data-default-class, hspec, http-client, http-client-tls + , http-types, HUnit, mtl, network, resourcet, streaming-commons + , temporary, text, time, tls, transformers, unliftio, unliftio-core + , utf8-string, wai, wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "http-conduit"; + version = "2.3.7.4"; + sha256 = "1mbaasmxx90gzfirwn8lmjpwj34gf1dk9y3m9mm88rzmy3s6czbb"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit conduit-extra http-client + http-client-tls http-types mtl resourcet transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive conduit + conduit-extra connection cookie data-default-class hspec + http-client http-types HUnit network resourcet streaming-commons + temporary text time tls transformers unliftio utf8-string wai + wai-conduit warp warp-tls + ]; + doCheck = false; + description = "HTTP client package with conduit interface and HTTPS support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, conduit, containers, cookie, data-default @@ -139483,8 +139482,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "3.1.2"; - sha256 = "1yqzh9cvs9yr88wa0r26izd35hg2vfzqvzxbx0l6c1apgc3m7hd6"; + version = "4.0.0"; + sha256 = "0cwiaxri121lh713sisy9mka0h6z2ip82hzqbyzqj1dnljkqry9c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143033,8 +143032,8 @@ self: { }: mkDerivation { pname = "implicit-hie"; - version = "0.1.2.4"; - sha256 = "1jjw64pdz3jgd4jys1rg95bhrjyiizjdi0rwwqldc27a7misd2ca"; + version = "0.1.2.5"; + sha256 = "0jgnsbd38gw20h1lv39bh3n9bhawkjq90ajalgjyy5pih434mphf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143061,8 +143060,8 @@ self: { }: mkDerivation { pname = "implicit-hie-cradle"; - version = "0.3.0.0"; - sha256 = "0zbgqx7dzkpsf6pnxvfrkgl2v70vvm5h4by65m7yi73qjxrcghd1"; + version = "0.3.0.2"; + sha256 = "185pisgqp95zkpcksqiwiyghmg01cvfa7g6wzc31004mwwb114ih"; libraryHaskellDepends = [ base base16-bytestring bytestring containers directory extra filepath hie-bios hslogger implicit-hie process temporary text time @@ -143277,6 +143276,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "inbox" = callPackage + ({ mkDerivation, async, base, error-or, text, time }: + mkDerivation { + pname = "inbox"; + version = "0.1.0"; + sha256 = "12012di97775da8ijv0qjwaxls36kvly0j7nvqqj15ai3kf9yarq"; + libraryHaskellDepends = [ async base error-or text time ]; + description = "Inbox for asychronous messages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "inc-ref" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -144226,17 +144236,20 @@ self: { "inline-java" = callPackage ({ mkDerivation, base, bytestring, Cabal, criterion, deepseq , directory, filepath, ghc, hspec, jni, jvm, language-java, mtl - , process, singletons, template-haskell, temporary, text + , process, QuickCheck, quickcheck-unicode, singletons + , template-haskell, temporary, text, vector }: mkDerivation { pname = "inline-java"; - version = "0.9.1"; - sha256 = "12p59gf4dk4q00zpjwp0bzgljfa0nhr32x5schg0hj9bgsj6c6pk"; + version = "0.10.0"; + sha256 = "0rs2rw21y0yc0h4c1rz25qblk39flkg19fwjz87s6l0ly1hvcrm5"; libraryHaskellDepends = [ base bytestring Cabal directory filepath ghc jni jvm language-java mtl process template-haskell temporary text ]; - testHaskellDepends = [ base hspec jni jvm text ]; + testHaskellDepends = [ + base hspec jni jvm QuickCheck quickcheck-unicode text vector + ]; benchmarkHaskellDepends = [ base criterion deepseq jni jvm singletons ]; @@ -144742,8 +144755,6 @@ self: { ]; description = "Integer roots and perfect powers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "integer-simple" = callPackage @@ -145315,13 +145326,13 @@ self: { "intricacy" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , crypto-api, crypto-pubkey-types, cryptohash, directory, filepath - , hscurses, mtl, network-fancy, random, RSA, safe, SDL, SDL-gfx - , SDL-mixer, SDL-ttf, stm, time, transformers, vector + , hscurses, mtl, ncurses, network-fancy, random, RSA, safe, SDL + , SDL-gfx, SDL-mixer, SDL-ttf, stm, time, transformers, vector }: mkDerivation { pname = "intricacy"; - version = "0.7.2"; - sha256 = "0iv79rlgi7xi5l0a530m8vniba5jnn45hddwfrrm9yyfvpfgx1sw"; + version = "0.7.2.3"; + sha256 = "1651ivbk4iiwhy5hwwhc8s2dgfxdm9f4hswfxkdb06yp7i6y2pyj"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -145331,9 +145342,10 @@ self: { network-fancy random RSA safe SDL SDL-gfx SDL-mixer SDL-ttf stm time transformers vector ]; + executablePkgconfigDepends = [ ncurses ]; description = "A game of competitive puzzle-design"; license = stdenv.lib.licenses.gpl3; - }) {}; + }) {inherit (pkgs) ncurses;}; "intrinsic-superclasses" = callPackage ({ mkDerivation, base, containers, haskell-src-meta, mtl @@ -147134,8 +147146,8 @@ self: { pname = "iterm-show"; version = "0.1.0.1"; sha256 = "1wlrn6q3v5a4pqmk3a3syir7szq97g658s1bzrq5p65frs7i7daw"; - revision = "1"; - editedCabalFile = "1xyb5dj53vl4nf2a68zda95lz0fr987rghvh3610bmrgr8hg3y02"; + revision = "2"; + editedCabalFile = "0qz82j4gz226qhqhmami40ws6r8rlwf0l22hilzk1n4x00bvcdm7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base64-bytestring bytestring ]; @@ -147152,6 +147164,8 @@ self: { pname = "iterm-show-JuicyPixels"; version = "0.1.0.0"; sha256 = "1r4if1izanpz7kc2hl8vcn6iz7p0sk5dqq8rxvrpclcx3dklhh6z"; + revision = "1"; + editedCabalFile = "0pd14gfdpd12h1vlrk3dfg5vxlpd1jv2zi32nxic7p09wz59dkpk"; libraryHaskellDepends = [ base iterm-show JuicyPixels ]; description = "Orphan Show instances for JuciyPixels image types"; license = stdenv.lib.licenses.bsd3; @@ -147167,6 +147181,8 @@ self: { pname = "iterm-show-diagrams"; version = "0.1.0.0"; sha256 = "1szan9v24d8fksxcw3fqvzppf49664xm5y1zdk9yv007r5pfxr4c"; + revision = "1"; + editedCabalFile = "0yfc7phc2566mc7cqbin2px2l22nfg0xssf0vp0xkd4zqchji453"; libraryHaskellDepends = [ base diagrams-lib diagrams-rasterific iterm-show JuicyPixels ]; @@ -148463,16 +148479,17 @@ self: { }) {}; "jni" = callPackage - ({ mkDerivation, base, bytestring, choice, constraints, containers - , cpphs, deepseq, hspec, inline-c, jdk, singletons + ({ mkDerivation, async, base, bytestring, choice, constraints + , containers, cpphs, deepseq, hspec, inline-c, jdk, singletons, stm + , text }: mkDerivation { pname = "jni"; - version = "0.7.0"; - sha256 = "0dznaw0aqkmmymabws4dg7d71acgj72gfn5r587bi5gq0x86sgr3"; + version = "0.8.0"; + sha256 = "0m94p2zx877snh3imwcdnwa8ajfb76cg2rjgjx3pan508ham1h5i"; libraryHaskellDepends = [ - base bytestring choice constraints containers deepseq inline-c - singletons + async base bytestring choice constraints containers deepseq + inline-c singletons stm text ]; librarySystemDepends = [ jdk ]; libraryToolDepends = [ cpphs ]; @@ -149227,6 +149244,8 @@ self: { pname = "json-directory"; version = "0.1.0.1"; sha256 = "145z46hh3ba3g7niwv9kf5djfv3xa1q5fmwadi629h7grfij0rr3"; + revision = "1"; + editedCabalFile = "193f2vndgfhhb26yq15nai22cmzdlcypby8bbyy93hyidr7rd981"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150384,18 +150403,20 @@ self: { "jvm" = callPackage ({ mkDerivation, base, bytestring, choice, constraints, criterion - , deepseq, distributed-closure, exceptions, hspec, jni, singletons - , template-haskell, text, vector + , deepseq, distributed-closure, exceptions, hspec, jni, QuickCheck + , quickcheck-text, singletons, template-haskell, text, vector }: mkDerivation { pname = "jvm"; - version = "0.5.0"; - sha256 = "18n0b5bvy5hhq5x4ynbxa3zbqbh4z5isvzgg9h6hgs7366jyrqhf"; + version = "0.6.0"; + sha256 = "119davscv5mrw2mnlrklx8hbjrc7lhf5a9jphdnnxs6bywi8i2zm"; libraryHaskellDepends = [ base bytestring choice constraints distributed-closure exceptions jni singletons template-haskell text vector ]; - testHaskellDepends = [ base bytestring hspec jni text ]; + testHaskellDepends = [ + base bytestring hspec jni QuickCheck quickcheck-text text + ]; benchmarkHaskellDepends = [ base criterion deepseq jni singletons text ]; @@ -150412,15 +150433,15 @@ self: { }: mkDerivation { pname = "jvm-batching"; - version = "0.1.2"; - sha256 = "1if6yklllgja48bhaqggvmhsx5klbscx2clq37am7vapic5gydai"; + version = "0.2.0"; + sha256 = "19z0db10y181n4adkz23cmly0q4zp953zh6f3r7rmxcd78758pbk"; setupHaskellDepends = [ base Cabal inline-java ]; libraryHaskellDepends = [ base bytestring distributed-closure inline-java jni jvm singletons text vector ]; testHaskellDepends = [ - base bytestring hspec inline-java jvm text vector + base bytestring hspec inline-java jni jvm text vector ]; benchmarkHaskellDepends = [ base criterion deepseq jvm split vector @@ -150490,14 +150511,16 @@ self: { }: mkDerivation { pname = "jvm-streaming"; - version = "0.3.2"; - sha256 = "16qr1wb8ria2n26irpirfvgr43ibhjfypxbyvzc0vwi941m7np4m"; + version = "0.4.0"; + sha256 = "0k8y6kvbymmjlr3bvgcws0z2hwdznyr3b3alkwsjag49lsgp21sd"; setupHaskellDepends = [ base Cabal inline-java jvm-batching ]; libraryHaskellDepends = [ base distributed-closure inline-java jni jvm jvm-batching singletons streaming vector ]; - testHaskellDepends = [ base hspec inline-java jvm streaming text ]; + testHaskellDepends = [ + base hspec inline-java jni jvm streaming text + ]; benchmarkHaskellDepends = [ base criterion deepseq jvm streaming text vector ]; @@ -151885,6 +151908,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kempe" = callPackage + ({ mkDerivation, alex, array, base, bytestring, composition-prelude + , containers, criterion, deepseq, extra, filepath, happy, microlens + , microlens-mtl, mtl, optparse-applicative, prettyprinter, process + , tasty, tasty-golden, tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "kempe"; + version = "0.1.0.1"; + sha256 = "0wnjljwnwy9qq575v493y2dsbimks3plbsripfrjph0ldpianrdm"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base bytestring composition-prelude containers deepseq extra + microlens microlens-mtl mtl prettyprinter process temporary text + transformers + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ + base bytestring deepseq filepath prettyprinter process tasty + tasty-golden tasty-hunit temporary + ]; + benchmarkHaskellDepends = [ + base bytestring criterion prettyprinter text + ]; + doHaddock = false; + description = "Kempe compiler"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "kerry" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , errors, hedgehog, hedgehog-corpus, mmorph, mtl, process @@ -151909,6 +151966,27 @@ self: { broken = true; }) {}; + "kesha" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , cryptohash-md5, cryptohash-sha1, cryptohash-sha256, directory + , filepath, hspec, process, QuickCheck, temporary, text + }: + mkDerivation { + pname = "kesha"; + version = "0.1.0.1"; + sha256 = "1pcr284hcbswfh2bfx1ga0wz135ffzcn9g52am1ig6ayfb0b589c"; + libraryHaskellDepends = [ + base binary bytestring containers cryptohash-md5 cryptohash-sha1 + cryptohash-sha256 directory filepath text + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec process + QuickCheck temporary + ]; + description = "Haskell implementation of nix-hash"; + license = stdenv.lib.licenses.mit; + }) {}; + "keter" = callPackage ({ mkDerivation, aeson, array, async, attoparsec, base , blaze-builder, bytestring, case-insensitive, conduit @@ -152214,14 +152292,14 @@ self: { }) {}; "ki" = callPackage - ({ mkDerivation, atomic-primops, base, concurrency, containers - , dejafu, stm - }: + ({ mkDerivation, base, concurrency, containers, dejafu, stm }: mkDerivation { pname = "ki"; - version = "0.1.0"; - sha256 = "0lzr9i3zrg3qw9pvkp4scy7p5qi2g2x8kvz6h7sph4k61f78kfxg"; - libraryHaskellDepends = [ atomic-primops base containers stm ]; + version = "0.1.0.1"; + sha256 = "16hw0y7r76gqhn3qnr8ac49yr1xq33g6rcfh8zxgkg59zf5bl35a"; + revision = "1"; + editedCabalFile = "03j64ya9n2ck6ddqk3dsvghnnqq6pfc6l9q4xj9ir8ry5cgxhrqp"; + libraryHaskellDepends = [ base containers stm ]; testHaskellDepends = [ base concurrency dejafu stm ]; description = "A lightweight, structured concurrency library"; license = stdenv.lib.licenses.bsd3; @@ -152937,8 +153015,8 @@ self: { }: mkDerivation { pname = "kubernetes-client"; - version = "0.3.1.0"; - sha256 = "1ys3b143wckkgc7wjwfilkvr35j7as775p2d2riqkjpfi88kh301"; + version = "0.3.2.0"; + sha256 = "1z7ic3kqskbn59q9kifn3glnnnbaixcb7rhahw115i6s8yqql9rk"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring connection containers data-default-class either filepath hoauth2 http-client @@ -154555,8 +154633,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.4.1.1"; - sha256 = "0bc3qzhyip8dq7w8gf3wxlrlfd8swd1n6y6nbj2pnp7710jj8gb9"; + version = "1.4.1.2"; + sha256 = "0z6bri73gprs485pjhwvwd37p9lfqvy15k9ws5p4178m538bxmmq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -163395,8 +163473,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.7.1"; - sha256 = "0qqlbpvifh4n6w8b4brc9fybvaxx8aahj9da6y16zlxlf3n6jbv5"; + version = "0.8.0"; + sha256 = "1mzpi5vx18vi06bd5jkpixws01in69jqvg6hkzc7mxn75cw8gb34"; libraryHaskellDepends = [ aeson-pretty base bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley @@ -164179,8 +164257,8 @@ self: { }: mkDerivation { pname = "lumberjack"; - version = "0.1.0.2"; - sha256 = "1qixhfalj22zgfmg3q0jk7ci4nafdwbhrbpgiwzjmah11219jib1"; + version = "0.1.0.3"; + sha256 = "03y9v9ajh89ffacmnq0zfb83dyk6gd72msln7kksb69kkgcizd96"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165358,21 +165436,21 @@ self: { }) {}; "mail-pool" = callPackage - ({ mkDerivation, base, HaskellNet, HaskellNet-SSL, microlens + ({ mkDerivation, aeson, base, HaskellNet, HaskellNet-SSL, microlens , mime-mail, network, optparse-applicative, resource-pool, time }: mkDerivation { pname = "mail-pool"; - version = "2.1.0"; - sha256 = "1cjl7y6djiwr94h6vhrmwjv381xp89y8hv1zmbzz8fy0dywsiyiz"; + version = "2.2.3"; + sha256 = "1pqizx02p2iiqkl4kg3izkg477bh69jrk75insbfw30k3ay3g330"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base HaskellNet HaskellNet-SSL microlens mime-mail network + aeson base HaskellNet HaskellNet-SSL microlens mime-mail network optparse-applicative resource-pool time ]; executableHaskellDepends = [ - base HaskellNet HaskellNet-SSL microlens mime-mail network + aeson base HaskellNet HaskellNet-SSL microlens mime-mail network optparse-applicative resource-pool time ]; description = "Preconfigured email connection pool on top of smtp"; @@ -166842,28 +166920,6 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.5.6.0"; - sha256 = "13vzprqhyjz1qvsq6b29d8h9xgsrifbpbs2c5cw702hi7mw5zjhp"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq exceptions primitive - scheduler unliftio-core vector - ]; - testHaskellDepends = [ - base doctest mersenne-random-pure64 QuickCheck random splitmix - template-haskell - ]; - description = "Massiv (Массив) is an Array Library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "massiv_0_5_7_0" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, deepseq - , doctest, exceptions, mersenne-random-pure64, primitive - , QuickCheck, random, scheduler, splitmix, template-haskell - , unliftio-core, vector - }: - mkDerivation { - pname = "massiv"; version = "0.5.7.0"; sha256 = "04vv16h048gkfgqsdf3a42qrg62cik9j30p4s13rykq0shzcaf62"; libraryHaskellDepends = [ @@ -166876,7 +166932,6 @@ self: { ]; description = "Massiv (Массив) is an Array Library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "massiv-io" = callPackage @@ -168797,8 +168852,8 @@ self: { pname = "meminfo"; version = "0.2.0.0"; sha256 = "1mxk57qr4d1k6sz4qld09d61nc15hixggc5klfj5xr0n8rw1za3x"; - revision = "1"; - editedCabalFile = "10r7ji1xb8zv7a1ilyp626chly9y8m1i67adxqrj8lwgkqxpl8nk"; + revision = "2"; + editedCabalFile = "0i6znbcw4yyf8jzkixx5dxbklzfnh79hmywvwwamdmjgi39akpi5"; libraryHaskellDepends = [ attoparsec base bytestring containers ]; description = "Library for reading `/proc/meminfo`"; license = stdenv.lib.licenses.bsd3; @@ -171876,8 +171931,8 @@ self: { }: mkDerivation { pname = "mmsyn7h"; - version = "0.8.0.0"; - sha256 = "0mj96p3f96brv7cw3mkigngxnmqcn9r1yfghdx1jplrw5wycy80j"; + version = "0.8.1.0"; + sha256 = "0n1rs92cgand8sb7597ph18dmrxf5czkrx5wx90qi58w7m1fqh9p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172048,6 +172103,28 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "mock-time" = callPackage + ({ mkDerivation, base, error-or, error-or-utils, exceptions, inbox + , mtl, primitive, QuickCheck, resourcet, stm, tasty, tasty-hunit + , tasty-quickcheck, time, unliftio-core + }: + mkDerivation { + pname = "mock-time"; + version = "0.1.0"; + sha256 = "0fwnlkg3kbi7qh43ycymxxywsh8cw5f5km0ni4plf63k931y40jg"; + libraryHaskellDepends = [ + base error-or exceptions mtl primitive resourcet stm time + unliftio-core + ]; + testHaskellDepends = [ + base error-or error-or-utils exceptions inbox mtl primitive + QuickCheck resourcet stm tasty tasty-hunit tasty-quickcheck time + unliftio-core + ]; + description = "Mock time in tests"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mockazo" = callPackage ({ mkDerivation, base, constraints, hspec, multistate, relude , template-haskell @@ -173021,8 +173098,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.35"; - sha256 = "1mrwwv3h3wy84kgphwn6ahjzxab0bzgzzbqla1c3jx02xl9x3q72"; + version = "0.3.36"; + sha256 = "12rw0k01gkhiqjm2fhxgkmribksmizhj14xphfn8fkd86wzl0vbh"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm stm-chans @@ -173033,26 +173110,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "monad-logger_0_3_36" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , exceptions, fast-logger, lifted-base, monad-control, monad-loops - , mtl, resourcet, stm, stm-chans, template-haskell, text - , transformers, transformers-base, transformers-compat - , unliftio-core + "monad-logger-extras" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, hsyslog + , monad-logger, mtl }: mkDerivation { - pname = "monad-logger"; - version = "0.3.36"; - sha256 = "12rw0k01gkhiqjm2fhxgkmribksmizhj14xphfn8fkd86wzl0vbh"; + pname = "monad-logger-extras"; + version = "0.1.1.1"; + sha256 = "1zxwvaqw6ihhg945hr4ysk66prhbh00i6qipig44nx65fcwh835b"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring conduit conduit-extra exceptions fast-logger - lifted-base monad-control monad-loops mtl resourcet stm stm-chans - template-haskell text transformers transformers-base - transformers-compat unliftio-core + ansi-terminal base bytestring hsyslog monad-logger mtl ]; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + executableHaskellDepends = [ base monad-logger ]; + description = "Utilities for composing loggers, coloring output, plus a few orphan instances"; + license = stdenv.lib.licenses.bsd3; }) {}; "monad-logger-json" = callPackage @@ -174754,15 +174827,16 @@ self: { , cryptonite, data-default, first-class-families, fmt , generic-deriving, gitrev, haskeline, hex-text, interpolate, lens , megaparsec, memory, morley-prelude, mtl, named - , optparse-applicative, parser-combinators, pretty-simple - , semigroups, show-type, singletons, syb, template-haskell, text - , th-lift, th-lift-instances, time, timerep, transformers-compat - , unordered-containers, vector, vinyl, with-utf8, wl-pprint-text + , optparse-applicative, parser-combinators, scientific, semigroups + , show-type, singletons, syb, template-haskell, text + , text-manipulate, th-lift, th-lift-instances, time, timerep + , uncaught-exception, unordered-containers, vector, vinyl + , with-utf8, wl-pprint-text }: mkDerivation { pname = "morley"; - version = "1.9"; - sha256 = "17fkh2dbi79lgc61nj9v0fyj26n7lzsj824nvi94q0f9qi6ifk5j"; + version = "1.10.0"; + sha256 = "08mj8jzrbqqzn3vr5hlpbzhgik3i3544xn5inm28j40vhlahvmzk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174770,15 +174844,14 @@ self: { bytestring constraints containers cryptonite data-default first-class-families fmt generic-deriving gitrev hex-text interpolate lens megaparsec memory morley-prelude mtl named - optparse-applicative parser-combinators semigroups show-type - singletons syb template-haskell text th-lift th-lift-instances time - timerep transformers-compat unordered-containers vector vinyl - with-utf8 wl-pprint-text + optparse-applicative parser-combinators scientific semigroups + show-type singletons syb template-haskell text text-manipulate + th-lift th-lift-instances time timerep uncaught-exception + unordered-containers vector vinyl with-utf8 wl-pprint-text ]; executableHaskellDepends = [ aeson base bytestring data-default fmt haskeline megaparsec - morley-prelude named optparse-applicative pretty-simple text vinyl - with-utf8 + morley-prelude named optparse-applicative text vinyl with-utf8 ]; description = "Developer tools for the Michelson Language"; license = stdenv.lib.licenses.mit; @@ -180705,6 +180778,8 @@ self: { pname = "network"; version = "3.1.2.1"; sha256 = "0jlx8dls0h95znpcb66bd95k4mp3aaa733h89pq5ymyb8m29bapw"; + revision = "1"; + editedCabalFile = "12swsygnsnyvfjm3p9b6z8jh8vbw3q5akmggacsvr4fdm2p6v38q"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -180816,8 +180891,8 @@ self: { }: mkDerivation { pname = "network-arbitrary"; - version = "0.6.0.0"; - sha256 = "0yj93r7p4nbfwhklxb7wgkaq1bfl7qjqmn3q0qlxlghbb2xhmmh1"; + version = "0.7.0.0"; + sha256 = "0n3c9hm8p404diksx23l4afa7i4lcl92m2zp2aw4zy8n9vhpz8sv"; libraryHaskellDepends = [ base bytestring http-media http-types network-uri QuickCheck ]; @@ -182200,8 +182275,8 @@ self: { }: mkDerivation { pname = "newtype-zoo"; - version = "1.2.0.0"; - sha256 = "12p2nyjpvbqjc7p6jd59ggl37jlg5rh9z8y1bxy4w98m47p8lj31"; + version = "1.2.1.0"; + sha256 = "0zb4fm6c3m88xk76lr1d6b5yhnx45mb77m0srhq43r168rhk69d7"; libraryHaskellDepends = [ base comonad data-default deepseq pointed profunctors QuickCheck random @@ -182351,20 +182426,20 @@ self: { }) {}; "ngx-export-tools-extra" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, array, base, base64, binary - , bytestring, case-insensitive, containers, ede - , enclosed-exceptions, http-client, http-types, network, ngx-export - , ngx-export-tools, safe, snap-core, snap-server, template-haskell + ({ mkDerivation, aeson, array, base, base64, binary, bytestring + , case-insensitive, containers, ede, enclosed-exceptions + , http-client, http-types, network, ngx-export, ngx-export-tools + , prettyprinter, safe, snap-core, snap-server, template-haskell , text, time, trifecta, unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.5.9.0"; - sha256 = "073zzhrv9g7q8miqxws79h2hiqi3yssyb7smsb1mrx4y1rsmq4ss"; + version = "0.6.0.1"; + sha256 = "0xgnjriq9c3r9vpnkm0ldjqghss9ahjzk8ckrwq59bmdhns3fvx9"; libraryHaskellDepends = [ - aeson ansi-wl-pprint array base base64 binary bytestring - case-insensitive containers ede enclosed-exceptions http-client - http-types network ngx-export ngx-export-tools safe snap-core + aeson array base base64 binary bytestring case-insensitive + containers ede enclosed-exceptions http-client http-types network + ngx-export ngx-export-tools prettyprinter safe snap-core snap-server template-haskell text time trifecta unordered-containers ]; @@ -182732,6 +182807,8 @@ self: { pname = "nix-freeze-tree"; version = "0.1.0.0"; sha256 = "06l323g6qx87lbs9hbmnjr0b40f548w8496p7pihxrla1kb2v31x"; + revision = "1"; + editedCabalFile = "1lhhaaisiaj9hsifn5nv3mmkp10cn3szal3gsn4dx2j0h23b4f3p"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -183806,17 +183883,17 @@ self: { "nothunks" = callPackage ({ mkDerivation, base, bytestring, containers, ghc-heap, ghc-prim - , hedgehog, random, tasty, tasty-hedgehog, text, time, vector + , hedgehog, random, stm, tasty, tasty-hedgehog, text, time, vector }: mkDerivation { pname = "nothunks"; - version = "0.1.1.0"; - sha256 = "1nnkdzr3ffhy7yqi068ay3p1bc0g0lmpyps3pqf0267vcx8lf8zn"; + version = "0.1.2"; + sha256 = "0z9calmdw4bk4cdwrfq5nkxxks2f82q59i7kv6lnsgwyl4nqvg2y"; libraryHaskellDepends = [ - base bytestring containers ghc-heap text time vector + base bytestring containers ghc-heap stm text time vector ]; testHaskellDepends = [ - base containers ghc-prim hedgehog random tasty tasty-hedgehog + base containers ghc-prim hedgehog random stm tasty tasty-hedgehog ]; description = "Examine values for unexpected thunks"; license = stdenv.lib.licenses.mit; @@ -184236,11 +184313,11 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "nuha"; - version = "0.2.0.0"; - sha256 = "1xcxr7nq8k2lj3xl3h3p2d4wn4zqjzy5bwc8pixl3nf5q57nz3gi"; + version = "0.3.0.0"; + sha256 = "15lb19gj146zkq2bgpp03jscw5bb3xys1yylvla5sqrnjqjw5r1d"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base vector ]; - description = "Multidimensional arrays, Linear algebra"; + description = "Multidimensional arrays, Linear algebra, Numerical analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -184667,14 +184744,16 @@ self: { }: mkDerivation { pname = "numhask-free"; - version = "0.0.1"; - sha256 = "1n786zg3sbc9zjr4972b837p459qx8yc1jqh0qlq1yw50yd9ic79"; + version = "0.0.3"; + sha256 = "1agfha5bxiq153jgknjriawyirbcw3ksbhb88y3v55wqjcwyqfiy"; libraryHaskellDepends = [ attoparsec base containers free numhask text ]; testHaskellDepends = [ base doctest numhask ]; - description = "See readme.md"; + description = "numerical free algebras"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "numhask-hedgehog" = callPackage @@ -189819,6 +189898,35 @@ self: { broken = true; }) {}; + "pandoc-filter-indent" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup + , ghc-syntax-highlighter, HaTeX, optics-core, optics-th + , pandoc-types, text + }: + mkDerivation { + pname = "pandoc-filter-indent"; + version = "0.2.1.0"; + sha256 = "1jc5a977490jfqnhvqzg5zqs22r10x094mfqd26ynqq9fx7pa580"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-html blaze-markup ghc-syntax-highlighter HaTeX + optics-core optics-th pandoc-types text + ]; + executableHaskellDepends = [ + base blaze-html blaze-markup ghc-syntax-highlighter HaTeX + optics-core optics-th pandoc-types text + ]; + testHaskellDepends = [ + base blaze-html blaze-markup ghc-syntax-highlighter HaTeX + optics-core optics-th pandoc-types text + ]; + description = "Pandoc filter formatting Haskell code fragments using GHC lexer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "pandoc-highlighting-extensions" = callPackage ({ mkDerivation, base, data-default-class, pandoc, skylighting-core , skylighting-extensions, skylighting-modding, text @@ -193242,8 +193350,8 @@ self: { }: mkDerivation { pname = "pdftotext"; - version = "0.1.0.0"; - sha256 = "01zdcggm5p52j7bwimfhk5x5mjnbpz4iz8g5jq3lnnc3ddd0ab6y"; + version = "0.1.0.1"; + sha256 = "0nilgv9w6i59h99w89q0jimmximpwn62i22z67gi2834bhdaqmn7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring text ]; @@ -194617,8 +194725,8 @@ self: { }: mkDerivation { pname = "persistent-pagination"; - version = "0.1.1.1"; - sha256 = "03rxynxj2xx25l1zy42f06649m57blpx4inadb2a4dgz62zzyk5q"; + version = "0.1.1.2"; + sha256 = "16p89c4rjwak7slb7rmzn0qyap2vg3ayis8q3lkxl0k7a609pf5h"; libraryHaskellDepends = [ base conduit esqueleto foldl microlens mtl persistent ]; @@ -194730,8 +194838,8 @@ self: { }: mkDerivation { pname = "persistent-qq"; - version = "2.9.2"; - sha256 = "1nks3b420g447i3bvlpf3f41ry8jkfkl60m9yl48vyxgbpcjq523"; + version = "2.9.2.1"; + sha256 = "0gnwkrjyh9fkli35qp0mvivbsycz58ng26z6rfqv377hgrjsvjiq"; libraryHaskellDepends = [ base haskell-src-meta mtl persistent template-haskell text ]; @@ -195021,6 +195129,32 @@ self: { pname = "persistent-typed-db"; version = "0.1.0.1"; sha256 = "07yjzxg5yfxv1zbp5pkrvj8nrsxyhy4n11zgmd0q9g186q6283qn"; + revision = "1"; + editedCabalFile = "15qqrxjg00xvn9ffdj0yk3zxw5snn91379zzhzzv3kd9w1b25zg0"; + libraryHaskellDepends = [ + aeson base bytestring conduit http-api-data monad-logger + path-pieces persistent persistent-template resource-pool resourcet + template-haskell text transformers + ]; + testHaskellDepends = [ + aeson base bytestring conduit esqueleto hspec http-api-data + monad-logger path-pieces persistent persistent-template + resource-pool resourcet template-haskell text transformers + ]; + description = "Type safe access to multiple database schemata"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "persistent-typed-db_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec + , http-api-data, monad-logger, path-pieces, persistent + , persistent-template, resource-pool, resourcet, template-haskell + , text, transformers + }: + mkDerivation { + pname = "persistent-typed-db"; + version = "0.1.0.2"; + sha256 = "1pdhdb29b7gyaw3kh1vr76dyr7gvwpx9ymib17fzfsxks6s76dxc"; libraryHaskellDepends = [ aeson base bytestring conduit http-api-data monad-logger path-pieces persistent persistent-template resource-pool resourcet @@ -195033,6 +195167,7 @@ self: { ]; description = "Type safe access to multiple database schemata"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-vector" = callPackage @@ -195207,6 +195342,24 @@ self: { broken = true; }) {}; + "pg-extras" = callPackage + ({ mkDerivation, base, bytestring, HUnit, postgresql-simple + , raw-strings-qq, text, time + }: + mkDerivation { + pname = "pg-extras"; + version = "0.0.1"; + sha256 = "00vakhrq42y9zdib0qhwm8af2vs3ghhfwjmydipdhsimlk1xzlfg"; + libraryHaskellDepends = [ + base bytestring postgresql-simple raw-strings-qq text time + ]; + testHaskellDepends = [ base HUnit text ]; + description = "PostgreSQL database performance insights"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "pg-harness" = callPackage ({ mkDerivation, async, base, bytestring, HTTP, ini , postgresql-simple, random, scotty, text, transformers @@ -195782,8 +195935,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-common"; - version = "0.3.0.0"; - sha256 = "1l5czk3ncwbv324k96gyc77lx8nvxxqpqggbyxw18wrwpmyn46i8"; + version = "0.3.4.0"; + sha256 = "1cf2k35jljcbyzyfz85nsxjzh5wdiipm9sa558gky26yz1h3n54x"; libraryHaskellDepends = [ base phonetic-languages-permutations subG subG-instances vector ]; @@ -195791,6 +195944,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-simplified-lists-examples" = callPackage + ({ mkDerivation, base, heaps, mmsyn2, parallel + , phonetic-languages-constraints, phonetic-languages-permutations + , phonetic-languages-plus, phonetic-languages-rhythmicity + , phonetic-languages-simplified-common + , phonetic-languages-simplified-properties-lists + , phonetic-languages-ukrainian, print-info, subG + , ukrainian-phonetics-basic, uniqueness-periods-vector-filters + , uniqueness-periods-vector-stats, vector + }: + mkDerivation { + pname = "phonetic-languages-simplified-lists-examples"; + version = "0.4.0.0"; + sha256 = "18n45cz6x8lh8pphnipp24xjjf8j5h6kskmkr6x4l5y5qi13ld4x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base heaps mmsyn2 phonetic-languages-constraints + phonetic-languages-simplified-common + phonetic-languages-simplified-properties-lists vector + ]; + executableHaskellDepends = [ + base heaps mmsyn2 parallel phonetic-languages-constraints + phonetic-languages-permutations phonetic-languages-plus + phonetic-languages-rhythmicity phonetic-languages-simplified-common + phonetic-languages-simplified-properties-lists + phonetic-languages-ukrainian print-info subG + ukrainian-phonetics-basic uniqueness-periods-vector-filters + uniqueness-periods-vector-stats vector + ]; + description = "Simplified and somewhat optimized version of the phonetic-languages-examples"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-simplified-properties-lists" = callPackage ({ mkDerivation, base, phonetic-languages-rhythmicity , phonetic-languages-simplified-common, ukrainian-phonetics-basic @@ -195798,8 +195985,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-lists"; - version = "0.1.3.1"; - sha256 = "1cbai5vi33fp7l3vpd4n0adjh0dbazhy7sms7716zd7vi4b2zm6s"; + version = "0.3.0.0"; + sha256 = "094fyljkvfi2snj41j00xqflhabnsp5hn50xp6dvmpcr12k6nvs0"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-common ukrainian-phonetics-basic @@ -195813,8 +196000,8 @@ self: { ({ mkDerivation, base, mmsyn2, mmsyn5, vector }: mkDerivation { pname = "phonetic-languages-ukrainian"; - version = "0.2.3.0"; - sha256 = "0dn81mzqjp7fj5cvv0w1lp72mla5hqzdrbsk0ad22wz43hpvrl1l"; + version = "0.3.0.0"; + sha256 = "1z9frcwvy9njq1flk3hd2n4z8l4ad7f248w8h1pgjl1fbz6fv9dc"; libraryHaskellDepends = [ base mmsyn2 mmsyn5 vector ]; description = "Prepares Ukrainian text to be used as a phonetic language text"; license = stdenv.lib.licenses.mit; @@ -199487,12 +199674,16 @@ self: { }) {}; "polysemy-extra" = callPackage - ({ mkDerivation, base, containers, polysemy, polysemy-zoo }: + ({ mkDerivation, base, containers, exceptions, extra, polysemy + , polysemy-zoo + }: mkDerivation { pname = "polysemy-extra"; - version = "0.1.6.1"; - sha256 = "1x588nsfnfjwzgcpngj5cm4pb27x5shpvy7yzgkvzihcy1nw0vz5"; - libraryHaskellDepends = [ base containers polysemy polysemy-zoo ]; + version = "0.1.7.0"; + sha256 = "1cr4gmsxf07754gz1jlv8jr7a4zgs9w5v3s8g8hz1lhps090cdf4"; + libraryHaskellDepends = [ + base containers exceptions extra polysemy polysemy-zoo + ]; description = "Extra Input and Output functions for polysemy.."; license = stdenv.lib.licenses.mit; }) {}; @@ -199626,18 +199817,20 @@ self: { }) {}; "polysemy-path" = callPackage - ({ mkDerivation, base, path, polysemy, polysemy-plugin - , polysemy-zoo + ({ mkDerivation, base, path, polysemy, polysemy-extra + , polysemy-plugin }: mkDerivation { pname = "polysemy-path"; - version = "0.0.1.0"; - sha256 = "12iw6qq1pigvvb0bnbkxz7gdmr4z609vqdsn5sxzh5va02dn1r57"; + version = "0.2.0.0"; + sha256 = "0p5ylp8758zkhlgqrhq6v6fli03q9gmak7bzkw1czrxwdshkv0gi"; libraryHaskellDepends = [ - base path polysemy polysemy-plugin polysemy-zoo + base path polysemy polysemy-extra polysemy-plugin ]; description = "Polysemy versions of Path functions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polysemy-plugin" = callPackage @@ -199669,8 +199862,8 @@ self: { }: mkDerivation { pname = "polysemy-resume"; - version = "0.1.0.0"; - sha256 = "1zpnwrhpb89kg5r3qxbyshpz8sgrfx7p8y0cix3xb70gcb8kf6jj"; + version = "0.1.0.1"; + sha256 = "1pgirh7sz1lx45pkss1a4w7xgy7gcxmm7i2vz9hf0z7qdj9wfn8i"; libraryHaskellDepends = [ base polysemy polysemy-plugin relude transformers ]; @@ -199687,21 +199880,21 @@ self: { "polysemy-test" = callPackage ({ mkDerivation, base, containers, either, hedgehog, path, path-io , polysemy, polysemy-plugin, relude, string-interpolate, tasty - , tasty-hedgehog, text, transformers + , tasty-hedgehog, template-haskell, text, transformers }: mkDerivation { pname = "polysemy-test"; - version = "0.3.0.1"; - sha256 = "0xy5ax03qy7936jxhbx3wi341z8r00bmjifha83izgi664hzb5fs"; + version = "0.3.0.2"; + sha256 = "16xkg6iwb7ms3k7mbrwa152izgs520x6jvc5bwp9pl0mk70qx3nw"; libraryHaskellDepends = [ base containers either hedgehog path path-io polysemy - polysemy-plugin relude string-interpolate tasty tasty-hedgehog text - transformers + polysemy-plugin relude string-interpolate tasty tasty-hedgehog + template-haskell text transformers ]; testHaskellDepends = [ base containers either hedgehog path path-io polysemy - polysemy-plugin relude string-interpolate tasty tasty-hedgehog text - transformers + polysemy-plugin relude string-interpolate tasty tasty-hedgehog + template-haskell text transformers ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; @@ -199717,8 +199910,8 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.1.0.0"; - sha256 = "1sdi8a2swqy8d2bmkmd2zxr968bzmkz4q07b2qw7840sq8q4bp6f"; + version = "0.1.1.0"; + sha256 = "1az7mf2jvd0vhsjpswa37rxrj760n5n3vhxpb4rlx28g8nx2jmkj"; libraryHaskellDepends = [ aeson base composition containers data-default either polysemy relude string-interpolate template-haskell text time torsor @@ -200862,35 +201055,6 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.12.3.1"; - sha256 = "0frdyhzdrfnrqmf15all0g817p7i6asj46hzk87rw52qbfiyag2v"; - libraryHaskellDepends = [ - aeson base base-prelude binary-parser bytestring - bytestring-strict-builder containers loch-th network-ip - placeholders scientific text time transformers unordered-containers - uuid vector - ]; - testHaskellDepends = [ - aeson conversion conversion-bytestring conversion-text json-ast - loch-th network-ip placeholders postgresql-libpq QuickCheck - quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ criterion rerebase ]; - description = "Encoders and decoders for the PostgreSQL's binary format"; - license = stdenv.lib.licenses.mit; - }) {}; - - "postgresql-binary_0_12_3_3" = callPackage - ({ mkDerivation, aeson, base, base-prelude, binary-parser - , bytestring, bytestring-strict-builder, containers, conversion - , conversion-bytestring, conversion-text, criterion, json-ast - , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck - , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; version = "0.12.3.3"; sha256 = "0aivmhzs1cnr86j6xv6nix913walqfvgirydzrp09l5ppp5i2sps"; libraryHaskellDepends = [ @@ -200907,7 +201071,6 @@ self: { benchmarkHaskellDepends = [ criterion rerebase ]; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-common" = callPackage @@ -204974,16 +205137,16 @@ self: { ({ mkDerivation, aeson, base, bytestring, cassava, containers , generic-random, mongoDB, mtl, persistent, persistent-mongoDB , QuickCheck, quickcheck-instances, safe-exceptions, scientific - , swagger2, text, time, vector + , swagger2, text, time, uuid, vector }: mkDerivation { pname = "prolude"; - version = "0.0.0.11"; - sha256 = "0y9x5layrwd1na7rzrpc9syngcpg4h5cyd6lgg10xvbjkxqjz19v"; + version = "0.0.0.12"; + sha256 = "09z9716pjyxzpqn3qc0zsi9mz03vf1qnb1q5bcf66bvb1kfj0phw"; libraryHaskellDepends = [ aeson base bytestring cassava containers generic-random mongoDB mtl persistent persistent-mongoDB QuickCheck quickcheck-instances - safe-exceptions scientific swagger2 text time vector + safe-exceptions scientific swagger2 text time uuid vector ]; description = "ITProTV's custom prelude"; license = stdenv.lib.licenses.mit; @@ -205390,19 +205553,41 @@ self: { }) {}; "proteaaudio" = callPackage - ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }: + ({ mkDerivation, base, bytestring, c2hs, libpulse, libpulse-simple + , libpulseaudio + }: mkDerivation { pname = "proteaaudio"; - version = "0.8.0"; - sha256 = "0fwanb1i4cq7352kci3wxkb5nyi5cm6298r559faw1bfyj2lmfbh"; + version = "0.9.0"; + sha256 = "0y1vvcy0rdiraphi6c9i1xsw5zwdqsw0id40xhgvk37va36ryl3p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ libpulseaudio ]; + libraryPkgconfigDepends = [ libpulse libpulse-simple ]; libraryToolDepends = [ c2hs ]; description = "Simple audio library for Windows, Linux, OSX"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libpulseaudio;}; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {libpulse = null; libpulse-simple = null; + inherit (pkgs) libpulseaudio;}; + + "proteaaudio-sdl" = callPackage + ({ mkDerivation, base, bytestring, c2hs, SDL2 }: + mkDerivation { + pname = "proteaaudio-sdl"; + version = "0.9.0"; + sha256 = "0ksdb89phsdjjq5q043wvqi3swibfd1840180jg3m8wj3zcy5g3k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ SDL2 ]; + libraryPkgconfigDepends = [ SDL2 ]; + libraryToolDepends = [ c2hs ]; + description = "Simple audio library for SDL"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) SDL2;}; "proteome" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers @@ -207988,8 +208173,6 @@ self: { ]; description = "An implementation of quadratic irrationals"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "quandl-api" = callPackage @@ -209534,8 +209717,8 @@ self: { }: mkDerivation { pname = "r-glpk-phonetic-languages-ukrainian-durations"; - version = "0.2.1.0"; - sha256 = "0g3xw2a9id28wpvs868xjjmx2hh17876fiwpzjzngcjijr5351b4"; + version = "0.2.2.0"; + sha256 = "1svwml88hfnpdgbnny8nzga9gxnmgjggnkks8gz9dplcf8w1w39d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210183,8 +210366,8 @@ self: { pname = "random"; version = "1.2.0"; sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; - revision = "2"; - editedCabalFile = "1pjpv8rzbwhr881ayxbvz4filvx3qkdx13pa21407p5fiyf208a3"; + revision = "3"; + editedCabalFile = "04hrdpc4h35dqbwyc4vfp2hw7wsr6b121f3rm8l94j11kli4108y"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest mwc-random primitive smallcheck @@ -212181,8 +212364,8 @@ self: { }: mkDerivation { pname = "readme-lhs"; - version = "0.8.0"; - sha256 = "1yircw8xhrzj40y6026bjb8jx7mm3zkkss7bzvbph1vbpgcazsc4"; + version = "0.8.1"; + sha256 = "08ah0sbi4km40izgvfmc745zp03n8kkd830mbwga6xk69hm9q821"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214789,6 +214972,8 @@ self: { pname = "regex-wrapper"; version = "0.1.0.1"; sha256 = "0ibkdd5xpilzm5qngn01csrin6ial1hhjzgpi3wjv6krlswdil34"; + revision = "1"; + editedCabalFile = "1ickvkpvxpqbj5fwhf3jajkp90b2sc3vz3l5sqyi7v4xj2bx8m6m"; libraryHaskellDepends = [ aeson base bytestring containers hashable regex-tdfa string-conv text @@ -216217,6 +216402,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "replace-megaparsec_1_4_4_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, megaparsec + , parser-combinators, text + }: + mkDerivation { + pname = "replace-megaparsec"; + version = "1.4.4.0"; + sha256 = "1nlbs01ghm6gllkc7chv06hdrwlb94cipcwcx84wzasdqdzvcdl1"; + libraryHaskellDepends = [ + base bytestring megaparsec parser-combinators text + ]; + testHaskellDepends = [ base bytestring Cabal megaparsec text ]; + description = "Find, replace, and split string patterns with Megaparsec parsers (instead of regex)"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "replica" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, Diff , file-embed, http-types, QuickCheck, quickcheck-instances @@ -216434,37 +216636,6 @@ self: { }: mkDerivation { pname = "req"; - version = "3.7.0"; - sha256 = "1ajak1845dx5vzc7mb5wyh6rilggnm0y5bh93f955zby1mr3mhi1"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson authenticate-oauth base blaze-builder bytestring - case-insensitive connection exceptions http-api-data http-client - http-client-tls http-types modern-uri monad-control mtl retry - template-haskell text time transformers transformers-base - unliftio-core - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive hspec - hspec-core http-client http-types modern-uri monad-control mtl - QuickCheck retry template-haskell text time unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - doCheck = false; - description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "req_3_8_0" = callPackage - ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder - , bytestring, case-insensitive, connection, exceptions, hspec - , hspec-core, hspec-discover, http-api-data, http-client - , http-client-tls, http-types, modern-uri, monad-control, mtl - , QuickCheck, retry, template-haskell, text, time, transformers - , transformers-base, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "req"; version = "3.8.0"; sha256 = "1qd0bawdxig6sldlhqgj8cpkzfy7da9yy0wkvzs6mps6yk14kbap"; enableSeparateDataOutput = true; @@ -216484,7 +216655,6 @@ self: { doCheck = false; description = "Easy-to-use, type-safe, expandable, high-level HTTP client library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "req-conduit" = callPackage @@ -217918,6 +218088,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rhbzquery" = callPackage + ({ mkDerivation, base, bytestring, config-ini, directory + , email-validate, extra, filepath, http-types, optparse-applicative + , simple-cmd, simple-cmd-args, text + }: + mkDerivation { + pname = "rhbzquery"; + version = "0.1.1"; + sha256 = "0nlh81cmkfsjgsmrrrcbf51vzmni1ddrhb8dzzxk9a8s76ybmcks"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring config-ini directory email-validate extra filepath + http-types optparse-applicative simple-cmd simple-cmd-args text + ]; + testHaskellDepends = [ base simple-cmd ]; + description = "Bugzilla query tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rhine" = callPackage ({ mkDerivation, base, containers, deepseq, dunai, free , MonadRandom, random, simple-affine-space, time, transformers @@ -218343,8 +218533,8 @@ self: { }: mkDerivation { pname = "ring-buffers"; - version = "0.1.1"; - sha256 = "1xzvbygwp4zqz1nsbmb70062grzqw3jdwgbaaxn7hgirinims64h"; + version = "0.2"; + sha256 = "1bbmc8hasi8ralqzmfg2wq3bqa4qabjjlb9wm3csx2kdlhp4v15y"; libraryHaskellDepends = [ base contiguous primitive primitive-unlifted semirings ]; @@ -219170,6 +219360,50 @@ self: { broken = true; }) {}; + "rollbar-cli" = callPackage + ({ mkDerivation, base, optparse-applicative, rollbar-client }: + mkDerivation { + pname = "rollbar-cli"; + version = "0.1.0"; + sha256 = "1fspvwhgng251m5paps2nj3x73c1bms4s9y202nbdnil0wb1wdlf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base optparse-applicative rollbar-client + ]; + executableHaskellDepends = [ base rollbar-client ]; + testHaskellDepends = [ base ]; + description = "Simple CLI tool to perform commons tasks such as tracking deploys"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "rollbar-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, exceptions + , hspec, hspec-discover, mtl, process, req, text + , unordered-containers, yaml + }: + mkDerivation { + pname = "rollbar-client"; + version = "0.1.0"; + sha256 = "18ca2mrvl7kn226jnrv2yaqwanx6spf0sg034asp5bwnhn15fvb9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring directory exceptions mtl process req text + unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base hspec mtl text unordered-containers yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "Core library to communicate with Rollbar API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "rollbar-hs" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , hostname, hspec, hspec-golden-aeson, http-client, http-conduit @@ -219194,6 +219428,55 @@ self: { broken = true; }) {}; + "rollbar-wai" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, hspec + , hspec-discover, http-types, mtl, process, req, rollbar-client + , text, unordered-containers, wai, wai-extra, warp + }: + mkDerivation { + pname = "rollbar-wai"; + version = "0.1.0"; + sha256 = "19a1pngqprnmpl4547vssbha4nzjj9930ln4qyv8yk4skqkvny4j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive http-types rollbar-client + text unordered-containers wai wai-extra + ]; + testHaskellDepends = [ + aeson base hspec http-types mtl process req rollbar-client text + unordered-containers wai warp + ]; + testToolDepends = [ hspec-discover ]; + description = "Provides error reporting capabilities to WAI based applications through Rollbar API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "rollbar-yesod" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, rollbar-client + , rollbar-wai, unliftio, wai, yesod-core, yesod-test + }: + mkDerivation { + pname = "rollbar-yesod"; + version = "0.1.0"; + sha256 = "1azz0braw91mcw3gibixgpa6bd6z76k8q742qzai3xz1pivdf09f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base rollbar-client rollbar-wai unliftio wai yesod-core + ]; + testHaskellDepends = [ + base hspec rollbar-client wai yesod-core yesod-test + ]; + testToolDepends = [ hspec-discover ]; + description = "Provides error reporting capabilities to Yesod applications through Rollbar API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "roller" = callPackage ({ mkDerivation, base, optparse-applicative, random , regex-applicative @@ -219963,8 +220246,8 @@ self: { }: mkDerivation { pname = "rrule"; - version = "0.1.0.0"; - sha256 = "0059rrvvfrcsycc8aczayphscviidrq8ig3j4x3ln3xjfscq2l2l"; + version = "0.1.1"; + sha256 = "0xb0yf0p5r7szb7zxlcc95d22f49s9ql671f1lmvjvzg1jkmsvva"; libraryHaskellDepends = [ base megaparsec parser-combinators text time ]; @@ -227144,36 +227427,6 @@ self: { }: mkDerivation { pname = "servant-openapi3"; - version = "2.0.1.0"; - sha256 = "14mfa7l3rqjmqp89x9gny5sy3c1w41czkyx7qp1d8dz1y4qi4ipf"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson aeson-pretty base base-compat bytestring hspec http-media - insert-ordered-containers lens openapi3 QuickCheck servant - singleton-bool text unordered-containers - ]; - testHaskellDepends = [ - aeson base base-compat directory doctest filepath hspec lens - lens-aeson openapi3 QuickCheck servant template-haskell text time - utf8-string vector - ]; - testToolDepends = [ hspec-discover ]; - description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "servant-openapi3_2_0_1_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring - , Cabal, cabal-doctest, directory, doctest, filepath, hspec - , hspec-discover, http-media, insert-ordered-containers, lens - , lens-aeson, openapi3, QuickCheck, servant, singleton-bool - , template-haskell, text, time, unordered-containers, utf8-string - , vector - }: - mkDerivation { - pname = "servant-openapi3"; version = "2.0.1.1"; sha256 = "1cyzyljmdfr3gigdszcpj1i7l698fnxpc9hr83mzspm6qcmbqmgf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -227269,6 +227522,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-polysemy" = callPackage + ({ mkDerivation, base, deepseq, http-client, http-client-tls, lens + , mtl, polysemy, polysemy-plugin, polysemy-zoo, servant-client + , servant-server, servant-swagger, servant-swagger-ui, swagger2 + , text, wai, warp + }: + mkDerivation { + pname = "servant-polysemy"; + version = "0.1.0"; + sha256 = "1isk401bi31s8ldb14cw0bchr3lwjmm2aslrrl3hg21dsr0qfk4y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq http-client http-client-tls mtl polysemy + polysemy-plugin polysemy-zoo servant-client servant-server wai warp + ]; + executableHaskellDepends = [ + base deepseq http-client http-client-tls lens mtl polysemy + polysemy-plugin polysemy-zoo servant-client servant-server + servant-swagger servant-swagger-ui swagger2 text wai warp + ]; + description = "Utilities for using servant in a polysemy stack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "servant-pool" = callPackage ({ mkDerivation, base, resource-pool, servant, time }: mkDerivation { @@ -227972,8 +228252,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.3.4.3.36.1"; - sha256 = "0j66ci53mlv1v57xg0hx6sm876i7yj99v573zizgb497c747dy8n"; + version = "0.3.4.3.37.2"; + sha256 = "1kx8i2x3ffbwbjh2i2ljha2cl6vfj1fcad9wkmc9ll9mbj6cpl8v"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -227989,10 +228269,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui-core"; - version = "0.3.3"; - sha256 = "0gpdjnclbjjr6gwc0gyx1d4w06cjf6z5b2ngjfcgbn885wqllwh3"; - revision = "4"; - editedCabalFile = "1kj72caf8skcl25bfw4nh7kj7hh33wd55sggsd474di57wi9j2c4"; + version = "0.3.4"; + sha256 = "05vi74kgsf3yhkbw9cjl1zxs5swhh9jib6bwqf1h11cg0nr5i8ab"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -233043,28 +233321,6 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.10.0.3"; - sha256 = "1fzcvhkzrzf0rlic61fjbz7n9vfxjyc45kn57pw48qdl77shqhga"; - configureFlags = [ "-fexecutable" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers skylighting-core - ]; - executableHaskellDepends = [ - base blaze-html bytestring containers directory filepath - pretty-show text - ]; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "skylighting_0_10_1" = callPackage - ({ mkDerivation, base, binary, blaze-html, bytestring, containers - , directory, filepath, pretty-show, skylighting-core, text - }: - mkDerivation { - pname = "skylighting"; version = "0.10.1"; sha256 = "0zpf6p3c0byp3pv9bgg77ndq89n3fhcazyln44pq8lxnmjy0x15v"; configureFlags = [ "-fexecutable" ]; @@ -233079,7 +233335,6 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-core" = callPackage @@ -233092,37 +233347,6 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.10.0.3"; - sha256 = "1c2r0gsy4c5l6m3w0i3zzv1fvaaqzn2636sd0mmzd9a8ncsgyzf6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base base64-bytestring binary - blaze-html bytestring case-insensitive colour containers directory - filepath hxt mtl safe text transformers utf8-string - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath HUnit - pretty-show QuickCheck random tasty tasty-golden tasty-hunit - tasty-quickcheck text utf8-string - ]; - benchmarkHaskellDepends = [ - base containers criterion directory filepath text - ]; - description = "syntax highlighting library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "skylighting-core_0_10_1" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base - , base64-bytestring, binary, blaze-html, bytestring - , case-insensitive, colour, containers, criterion, Diff, directory - , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random, safe - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text - , transformers, utf8-string - }: - mkDerivation { - pname = "skylighting-core"; version = "0.10.1"; sha256 = "10da31x6zj1b3kydr63g36zmmqpqmgcbwdalhxvbmxliw1m5kfvx"; isLibrary = true; @@ -233142,7 +233366,6 @@ self: { ]; description = "syntax highlighting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skylighting-extensions" = callPackage @@ -234241,6 +234464,20 @@ self: { broken = true; }) {}; + "smt2-parser" = callPackage + ({ mkDerivation, base, HUnit, parsec, text }: + mkDerivation { + pname = "smt2-parser"; + version = "0.1.0.0"; + sha256 = "025v77ck9cn0pgfbf2fgqf18bpr1h2gn6szsnmh5q1n4hi961v6m"; + libraryHaskellDepends = [ base parsec text ]; + testHaskellDepends = [ base HUnit parsec text ]; + description = "A Haskell parser for SMT-LIB version 2.6"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "smtLib" = callPackage ({ mkDerivation, base, pretty }: mkDerivation { @@ -238663,6 +238900,8 @@ self: { ]; description = "A file-packing application"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sr-extra" = callPackage @@ -239201,8 +239440,8 @@ self: { }: mkDerivation { pname = "stack-all"; - version = "0.1"; - sha256 = "0gn20y7lyfpzzxg296rb4fd6nn1v0p3al6x1q78bdyhixjgk2plc"; + version = "0.1.1"; + sha256 = "0b81f6v18dyd5zia6drqn3jqncj3sp8cscrhlrcwvbljs1j8fd0j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -241484,6 +241723,8 @@ self: { testHaskellDepends = [ base bytestring HUnit ]; description = "Library for the IEX Trading API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stomp-conduit" = callPackage @@ -241714,8 +241955,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.7.7"; - sha256 = "152blmvnp8k0bh9bw6ddzmb2rhs0a36v1k0fza39n88sldx504s3"; + version = "0.7.8"; + sha256 = "0z312r0gwz0mzkpqal5vbcz5drdfwrnjnxfwfc594q2x7s8idiz3"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash deepseq directory @@ -241754,8 +241995,8 @@ self: { }: mkDerivation { pname = "store-core"; - version = "0.4.4.3"; - sha256 = "1b0fpv8wdp9lcvqplls548xrh336cb1m617fzd0ysbzqhhg5r3fv"; + version = "0.4.4.4"; + sha256 = "0h21wp51phbwk9ajblqaqzx1hk9c58gkihmycjn0hj299kxly80y"; libraryHaskellDepends = [ base bytestring ghc-prim primitive text transformers ]; @@ -247336,10 +247577,8 @@ self: { }: mkDerivation { pname = "taffybar"; - version = "3.2.2"; - sha256 = "02b6rmsb89c1h7fr81ljbij30pnl8z4dz6xz367g7a2b9hwq42gz"; - revision = "1"; - editedCabalFile = "0284vnzvgpjjh95p67k2b5476npa52hs8g55fvlvlcx487zpc1sc"; + version = "3.2.3"; + sha256 = "0c5w030b289qy05pzs1bx3sd23sxxdm44605hs4ibzffaf0pr7b0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -252093,6 +252332,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-manipulate_0_3_0_0" = callPackage + ({ mkDerivation, base, criterion, tasty, tasty-hunit, text }: + mkDerivation { + pname = "text-manipulate"; + version = "0.3.0.0"; + sha256 = "0pmzp38m3r0k6ps97b1wqplxlgvvlaid09x53jl3gxng0fwq910a"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base tasty tasty-hunit text ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Case conversion, word boundary manipulation, and textual subjugation"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-markup" = callPackage ({ mkDerivation, base, containers, QuickCheck, quickcheck-text , tasty, tasty-quickcheck, text @@ -253346,8 +253599,8 @@ self: { }: mkDerivation { pname = "th-utilities"; - version = "0.2.4.0"; - sha256 = "1c3idsx9fyh9n4d969mibxsyfb2nmivwm65zap3hyl40bnldc39l"; + version = "0.2.4.1"; + sha256 = "1k3dlhhgxc4bnzb13qysbvb41vx6fxf26grs2fjm2s3h65sghqxd"; libraryHaskellDepends = [ base bytestring containers directory filepath primitive syb template-haskell text th-orphans @@ -254488,6 +254741,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "time-compat_1_9_5" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit + , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "time-compat"; + version = "1.9.5"; + sha256 = "19p3056i6kh8lgcdsnwsh8pj80xyi23kmw9n7hmdacczs5kv49ii"; + libraryHaskellDepends = [ base base-orphans deepseq time ]; + testHaskellDepends = [ + base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit + tasty-quickcheck time + ]; + description = "Compatibility package for time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-extras" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -259751,10 +260022,8 @@ self: { }: mkDerivation { pname = "tweet-hs"; - version = "1.0.2.1"; - sha256 = "0b277whd3jywb6w0gkaijmzadpwabmyxvxyg6fmsysq1kp3isrnm"; - revision = "1"; - editedCabalFile = "0ca923bxx8aj6qzm0nvxvh1zmzqw34jv4xmnrjy1lfyndg0qg9vj"; + version = "1.0.2.2"; + sha256 = "1sl4pld3jig1m26alhj4s96ff43v3g00wxzrng4yhb76d88z0ipw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262284,8 +262553,8 @@ self: { ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }: mkDerivation { pname = "ukrainian-phonetics-basic"; - version = "0.3.1.2"; - sha256 = "0a4fdf64wv23kpnmz0jggm7vc0iazzsv8kpip3qjpnyfq2yqw06r"; + version = "0.3.2.0"; + sha256 = "16w4dggl61jh93rqq0czb3lpbq9cf4kxih5c0i5mbrjcxn50cdqg"; libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = stdenv.lib.licenses.mit; @@ -262492,23 +262761,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "unbounded-delays"; - version = "0.1.1.0"; - sha256 = "1ir9fghbrc214c97bwafk5ck6cacxz1pdnq4i18p604d1b8zg9wa"; - libraryHaskellDepends = [ base ]; - description = "Unbounded thread delays and timeouts"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unbounded-delays_0_1_1_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "unbounded-delays"; version = "0.1.1.1"; sha256 = "11b1vmlfv4pmmpl4kva58w7cf50xsj819cq3wzqgnbz3px9pxbar"; libraryHaskellDepends = [ base ]; description = "Unbounded thread delays and timeouts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unbounded-delays-units" = callPackage @@ -264667,6 +264924,24 @@ self: { broken = true; }) {}; + "urbit-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra + , http-client, modern-uri, req, req-conduit, text, uuid + }: + mkDerivation { + pname = "urbit-api"; + version = "0.2.0.0"; + sha256 = "01kv1zi2w6qkl00hj43bpahcsws499rqdvyj8d8cy6pzrbnydrqc"; + libraryHaskellDepends = [ + aeson base bytestring conduit conduit-extra http-client modern-uri + req req-conduit text uuid + ]; + description = "Talk to Urbit from Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "urbit-hob" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, hspec , hspec-core, murmur3, QuickCheck, text, vector @@ -265984,18 +266259,18 @@ self: { }) {}; "uusi" = callPackage - ({ mkDerivation, base, Cabal, filepath, HUnit, microlens + ({ mkDerivation, base, Cabal, directory, filepath, HUnit, microlens , microlens-th, text }: mkDerivation { pname = "uusi"; - version = "0.2.1.0"; - sha256 = "11r7p2g4pkxd57xvnbids3r6gwr76ar8c2kpdvpi9jlp01p0rfbm"; + version = "0.3.1.0"; + sha256 = "14n2n62lcaxfljxxdk6pw14liksfa77jj8zby5magdnsx2jzkb5i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal microlens microlens-th text ]; executableHaskellDepends = [ - base Cabal filepath microlens microlens-th text + base Cabal directory filepath microlens microlens-th text ]; testHaskellDepends = [ base Cabal HUnit microlens microlens-th text @@ -268933,8 +269208,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.7"; - sha256 = "1d2fdlgnzrjhd59niw0qm4qiqa8zcpjxj340r82018n06w4v5vsy"; + version = "3.8"; + sha256 = "08d48q6wml8bh28s39zk12hi6760xmn92qdb9zk7y3h896i8v15s"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -268956,19 +269231,20 @@ self: { }) {}; "vulkan-utils" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, doctest - , extra, file-embed, filepath, resourcet, template-haskell - , temporary, text, transformers, typed-process, vector, vulkan + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers + , dependent-map, dependent-sum, doctest, extra, file-embed + , filepath, resourcet, template-haskell, temporary, text + , transformers, typed-process, unordered-containers, vector, vulkan }: mkDerivation { pname = "vulkan-utils"; - version = "0.3"; - sha256 = "1q5qy4ah75xq4imr28i97f07qmbwaaisb7zc25ms6vr0cz4ijg7w"; + version = "0.4"; + sha256 = "0r7byk8i59qnvkaqvkr5kdw9spwni6g6pyspgwzabhvky6n2mang"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base bytestring extra file-embed filepath resourcet - template-haskell temporary text transformers typed-process vector - vulkan + base bytestring containers dependent-map dependent-sum extra + file-embed filepath resourcet template-haskell temporary text + transformers typed-process unordered-containers vector vulkan ]; testHaskellDepends = [ base doctest ]; description = "Utils for the vulkan package"; @@ -269364,35 +269640,6 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.1.2"; - sha256 = "03aszasb9508jy7dpazay89cy1zs4p5g0n08zjhsl8c47rap16ks"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring bytestring call-stack - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types http2 HUnit iproute network - old-locale resourcet streaming-commons text time transformers unix - unix-compat vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive cookie fast-logger hspec - http-types http2 HUnit resourcet text time transformers wai zlib - ]; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-extra_3_1_3" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , bytestring, call-stack, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, http2, HUnit, iproute, network, old-locale, resourcet - , streaming-commons, text, time, transformers, unix, unix-compat - , vault, void, wai, wai-logger, word8, zlib - }: - mkDerivation { - pname = "wai-extra"; version = "3.1.3"; sha256 = "17s8cf0fdbkg9z2pvpsbhxg2cy5yy3c94513gkgf81lfl38zdrn7"; isLibrary = true; @@ -269410,7 +269657,6 @@ self: { ]; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-feature-flags" = callPackage @@ -271692,22 +271938,23 @@ self: { "web-rep" = callPackage ({ mkDerivation, attoparsec, base, box, box-socket, clay , concurrency, doctest, generic-lens, interpolatedstring-perl6 - , language-javascript, lens, lucid, mtl, numhask, optparse-generic - , scotty, tasty, tasty-hspec, text, transformers + , language-javascript, lens, lucid, mtl, network-simple, numhask + , optparse-generic, scotty, tasty, tasty-hspec, text, transformers , unordered-containers, wai-middleware-static, wai-websockets , websockets }: mkDerivation { pname = "web-rep"; - version = "0.7.0"; - sha256 = "1045b19rjs1hgw92kq8z6wzm7jmx8k73ad9z4m2vzv1jwjhbgin4"; + version = "0.7.2"; + sha256 = "1h6krrm412b9374778jg33gdmk6ig0sp06yk68h5prjdgy6shmww"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base box box-socket clay concurrency generic-lens - interpolatedstring-perl6 language-javascript lens lucid mtl numhask - scotty text transformers unordered-containers wai-middleware-static - wai-websockets websockets + interpolatedstring-perl6 language-javascript lens lucid mtl + network-simple numhask scotty text transformers + unordered-containers wai-middleware-static wai-websockets + websockets ]; executableHaskellDepends = [ base numhask optparse-generic ]; testHaskellDepends = [ @@ -272771,6 +273018,8 @@ self: { ]; description = "A school-timetable problem-solver"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "weigh" = callPackage @@ -274996,6 +275245,8 @@ self: { pname = "wshterm"; version = "0.1.0.1"; sha256 = "09gxc8i4j236yvmvr31w3l05k0d1pqjgm6i88yn7hw16anjn23qq"; + revision = "1"; + editedCabalFile = "0f2w2f0mnv8mc5l5bj1vl76bs03s640ssn57ri2fk3235lklnwmh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -275625,13 +275876,13 @@ self: { "xcffib" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , directory, either, filemanip, filepath, HUnit, language-python - , mtl, optparse-applicative, semigroups, split, test-framework + , mtl, optparse-applicative, split, test-framework , test-framework-hunit, xcb-types }: mkDerivation { pname = "xcffib"; - version = "0.10.0"; - sha256 = "163fiyppb40xd4wibvjkya86630hlhn1ij0i5xlc547gazawhz4a"; + version = "0.11.1"; + sha256 = "18xwliqcba0ia4p64gxiqd0pvkg3r3ylsmn3mywa5p43x1dji481"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -275640,8 +275891,7 @@ self: { ]; executableHaskellDepends = [ attoparsec base bytestring containers directory either filemanip - filepath language-python mtl optparse-applicative semigroups split - xcb-types + filepath language-python mtl optparse-applicative split xcb-types ]; testHaskellDepends = [ base filepath HUnit language-python test-framework @@ -277053,8 +277303,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.36"; - sha256 = "0kqnadgsqn7m3zw2vk22ssf4aw67rij9l1lpjfsnv2qw0m5apsdl"; + version = "0.37"; + sha256 = "0bjjja73ip7c1s8r3j3dimzm2j17sx38nsh51nl3axf4z5pbif74"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -277081,7 +277331,7 @@ self: { filepath hspec mtl old-locale parsec parsec-numbers process regex-compat stm temporary time transformers unix X11 ]; - benchmarkHaskellDepends = [ base gauge mtl ]; + benchmarkHaskellDepends = [ base gauge mtl time ]; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; @@ -278119,6 +278369,8 @@ self: { servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yam-transaction" = callPackage @@ -278744,6 +278996,8 @@ self: { ]; description = "Convert yarn.lock files to nix expressions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "yarr" = callPackage @@ -280992,19 +281246,18 @@ self: { ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , bytestring, case-insensitive, conduit, containers, cookie, hspec , hspec-core, html-conduit, http-types, HUnit, memory, network - , pretty-show, semigroups, text, time, transformers, unliftio - , unliftio-core, wai, wai-extra, xml-conduit, xml-types, yesod-core - , yesod-form + , pretty-show, text, time, transformers, unliftio, unliftio-core + , wai, wai-extra, xml-conduit, xml-types, yesod-core, yesod-form }: mkDerivation { pname = "yesod-test"; - version = "1.6.10"; - sha256 = "0vw6yg5b22a6flbl822z23k0l23as5mmxjcdnj2zgjjv5i713yfx"; + version = "1.6.11"; + sha256 = "1h3bggs5z5ixriy8agj9f2ms5vfcbp7a3bwr3rpfkfrckwypj6hp"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring case-insensitive conduit containers cookie hspec-core html-conduit - http-types HUnit memory network pretty-show semigroups text time - transformers wai wai-extra xml-conduit xml-types yesod-core + http-types HUnit memory network pretty-show text time transformers + wai wai-extra xml-conduit xml-types yesod-core ]; testHaskellDepends = [ base bytestring containers cookie hspec html-conduit http-types diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index c79673a28646..30f00cc6ea2c 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -7,9 +7,6 @@ # files. self: super: { - multi-ghc-travis = throw ("haskellPackages.multi-ghc-travis has been renamed" - + " to haskell-ci, which is now on hackage"); - dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { }; # https://github.com/channable/vaultenv/issues/1 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/comedilib/default.nix b/pkgs/development/libraries/comedilib/default.nix index f011c04d8856..98811b97c87e 100644 --- a/pkgs/development/libraries/comedilib/default.nix +++ b/pkgs/development/libraries/comedilib/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "comedilib"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Linux-Comedi"; repo = "comedilib"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "159sv4jdgmcaqz76vazkyxxb85ni7pg14p1qv7y94hib3kspc195"; + sha256 = "0kfs2dw62vjz8j7fgsxq6ky8r8kca726gyklbm6kljvgfh47lyfw"; }; nativeBuildInputs = [ 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/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 8f6123fb85ae..02544d74782e 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.11"; + version = "20.12"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "0mc8dkdmvkaq418vwn6y9d7fbcdp47djc38rly7b4zarl8hwmc4q"; + sha256 = "1iwfsfbd2ji7lkk5fh0wla287gph0sadlf0pz2j0vyddpkvr0xgx"; }; nativeBuildInputs = [cmake]; 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/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index bcae19217e02..99b00e6ca9d7 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -30,6 +30,7 @@ , mpg123 , twolame , gtkSupport ? false, gtk3 ? null +, raspiCameraSupport ? false, libraspberrypi ? null , enableJack ? true, libjack2 , libXdamage , libXext @@ -43,6 +44,7 @@ }: assert gtkSupport -> gtk3 != null; +assert raspiCameraSupport -> ((libraspberrypi != null) && stdenv.isLinux && stdenv.isAarch64); let inherit (stdenv.lib) optionals; @@ -95,6 +97,8 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXdamage wavpack + ] ++ optionals raspiCameraSupport [ + libraspberrypi ] ++ optionals gtkSupport [ # for gtksink gtk3 @@ -128,8 +132,8 @@ stdenv.mkDerivation rec { "-Dv4l2=disabled" # Linux-only "-Dximagesrc=disabled" # Linux-only "-Dpulse=disabled" # TODO check if we can keep this enabled - ] ++ optionals (!(stdenv.isLinux && stdenv.hostPlatform.isAarch64)) [ - "-Drpicamsrc=disabled" # only works on Linux aarch64, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/blob/428c9b60532917c0ac49c9d48b15bdcd00a1370b/sys/rpicamsrc/meson.build#L10 + ] ++ optionals (!raspiCameraSupport) [ + "-Drpicamsrc=disabled" ]; postPatch = '' 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/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix index c394e3dc4d54..d29cbf6a7195 100644 --- a/pkgs/development/libraries/liblouis/default.nix +++ b/pkgs/development/libraries/liblouis/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "liblouis"; - version = "3.15.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = "liblouis"; repo = "liblouis"; rev = "v${version}"; - sha256 = "1ljy5xsy7vf2r0ix0d7bqcr6qvr6897f8madsx9zlm1mrj31n5px"; + sha256 = "0q9ixy8cjgd2d2lzxgkfd4chzr5j1bz783mg10pnwviyg6k630m5"; }; outputs = [ "out" "dev" "man" "info" "doc" ]; 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/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix deleted file mode 100644 index 06d0d194cd59..000000000000 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, fetchFromGitHub, glibcLocales -, cmake, python3, libpng, zlib -}: - -stdenv.mkDerivation rec { - pname = "onnxruntime"; - version = "1.3.1"; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = "onnxruntime"; - rev = "v${version}"; - sha256 = "0rbk1jbfc447x2wybz2hsba6w1ij0fq21996l52cqv39898lvy9d"; - # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc. - # submodules increase src size and compile times significantly - # not currently feasible due to how integrated cmake build is with git - fetchSubmodules = true; - # Remove unicode file names which leads to different checksums on HFS+ - # vs. other filesystems because of unicode normalisation. - postFetch = '' - rm -rf $out/winml/test/collateral/models/UnicodePath/ - ''; - }; - - # TODO: build server, and move .so's to lib output - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - python3 # for shared-lib or server - ]; - - buildInputs = [ - # technically optional, but highly recommended - libpng - zlib - ]; - - cmakeDir = "../cmake"; - - cmakeFlags = [ - "-Donnxruntime_USE_OPENMP=ON" - "-Donnxruntime_BUILD_SHARED_LIB=ON" - "-Donnxruntime_ENABLE_LTO=ON" - ]; - - # ContribOpTest.StringNormalizerTest sets locale to en_US.UTF-8" - preCheck = stdenv.lib.optionalString stdenv.isLinux '' - export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" - ''; - doCheck = true; - - postInstall = '' - rm -r $out/bin # ctest runner - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Cross-platform, high performance scoring engine for ML models"; - longDescription = '' - ONNX Runtime is a performance-focused complete scoring engine - for Open Neural Network Exchange (ONNX) models, with an open - extensible architecture to continually address the latest developments - in AI and Deep Learning. ONNX Runtime stays up to date with the ONNX - standard with complete implementation of all ONNX operators, and - supports all ONNX releases (1.2+) with both future and backwards - compatibility. - ''; - homepage = "https://github.com/microsoft/onnxruntime"; - changelog = "https://github.com/microsoft/onnxruntime/releases"; - # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures - platforms = platforms.unix; - license = licenses.mit; - maintainers = with maintainers; [ jonringer ]; - }; - -} diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 002c0a3c1a79..f17a114216bd 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.14.5"; + version = "6.14.6"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0k5385apwyhc3pzfq9104mphf6lf1lb33nhcfbpqiwwn9q14z6n3"; + sha256 = "0cp0jgzwkwamykgnmsg0zvzakq58f1ihs7lslnn4nh4p9gm75rq5"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index d50e065efc61..2e76050aa989 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -4,14 +4,15 @@ , blas, lapack , metis , fixDarwinDylibNames -, gnum4 +, gmp +, mpfr , enableCuda ? false , cudatoolkit }: stdenv.mkDerivation rec { pname = "suitesparse"; - version = "5.7.2"; + version = "5.8.1"; outputs = [ "out" "dev" "doc" ]; @@ -19,17 +20,19 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "SuiteSparse"; rev = "v${version}"; - sha256 = "1imndff7yygjrbbrcscsmirdi8w0lkwj5dbhydxmf7lklwn4j3q6"; + sha256 = "0qjlyfxs8s48rs63c2fzspisgq1kk4bwkgnhmh125hgkdhrq2w1c"; }; nativeBuildInputs = [ - gnum4 ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ + # Use compatible indexing for lapack and blas used + buildInputs = assert (blas.isILP64 == lapack.isILP64); [ blas lapack metis gfortran.cc.lib + gmp + mpfr ] ++ stdenv.lib.optional enableCuda cudatoolkit; preConfigure = '' @@ -41,8 +44,6 @@ stdenv.mkDerivation rec { "INSTALL=${placeholder "out"}" "INSTALL_INCLUDE=${placeholder "dev"}/include" "JOBS=$(NIX_BUILD_CORES)" - "BLAS=-lblas" - "LAPACK=-llapack" "MY_METIS_LIB=-lmetis" ] ++ stdenv.lib.optionals blas.isILP64 [ "CFLAGS=-DBLAS64" @@ -50,7 +51,13 @@ stdenv.mkDerivation rec { "CUDA_PATH=${cudatoolkit}" "CUDART_LIB=${cudatoolkit.lib}/lib/libcudart.so" "CUBLAS_LIB=${cudatoolkit}/lib/libcublas.so" - ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + # Unless these are set, the build will attempt to use `Accelerate` on darwin, see: + # https://github.com/DrTimothyAldenDavis/SuiteSparse/blob/v5.8.1/SuiteSparse_config/SuiteSparse_config.mk#L368 + "BLAS=-lblas" + "LAPACK=-llapack" + ] + ; buildFlags = [ # Build individual shared libraries, not demos diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index bfc1c55d2c4d..e6b013aa1370 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simpleitk"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; rev = "v${version}"; - sha256 = "0yijli538hd96pfg4vpfk983y6d5bw9dlbs9nsq4rp83r08qdcc5"; + sha256 = "1q51jmd6skrr31avxlrxx433lawc838ilzrj5vvv38a9f4gl45v8"; }; nativeBuildInputs = [ cmake swig ]; 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/swiftshader/default.nix b/pkgs/development/libraries/swiftshader/default.nix index 3965f46bd8d8..3631b8b4fe7c 100644 --- a/pkgs/development/libraries/swiftshader/default.nix +++ b/pkgs/development/libraries/swiftshader/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchgit, python3, cmake, jq, libX11, libXext }: +{ stdenv, fetchgit, python3, cmake, jq, libX11, libXext, zlib }: stdenv.mkDerivation rec { pname = "swiftshader"; - version = "2020-06-17"; + version = "2020-11-06"; src = fetchgit { url = "https://swiftshader.googlesource.com/SwiftShader"; - rev = "763957e6b4fc1aa360ab19c4109b8b26686783e8"; - sha256 = "0sdh48swx0qyq2nfkv1nggs14am0qc7z239qrxb69p2ddqm76g1s"; + rev = "4ed9d3498dcffa987acba1a8007ff8dec336f263"; + sha256 = "1gz2zflfacxf34s78djddf93brn9kyxj4byc4p2ip1pin43lh2lg"; }; nativeBuildInputs = [ cmake python3 jq ]; - buildInputs = [ libX11 libXext ]; + buildInputs = [ libX11 libXext zlib ]; # Make sure we include the drivers and icd files in the output as the cmake # generated install command only puts in the spirv-tools stuff. 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/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 66f3f26285ed..d7b3ff64d30f 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -1,9 +1,13 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx, qtest, result }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, dune-configurator +, mdx, qtest, result +}: buildDunePackage rec { pname = "iter"; version = "1.2.1"; + useDune2 = true; + src = fetchFromGitHub { owner = "c-cube"; repo = pname; @@ -11,10 +15,11 @@ buildDunePackage rec { sha256 = "0j2sg50byn0ppmf6l36ksip7zx1d3gv7sc4hbbxs2rmx39jr7vxh"; }; - buildInputs = lib.optionals doCheck [ mdx.bin qtest ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ result ]; doCheck = lib.versionAtLeast ocaml.version "4.07"; + checkInputs = [ mdx.bin qtest ]; meta = { homepage = "https://github.com/c-cube/sequence"; diff --git a/pkgs/development/ocaml-modules/mirage/runtime.nix b/pkgs/development/ocaml-modules/mirage/runtime.nix index 700065ba8e0b..50121ad62802 100644 --- a/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "mirage-runtime"; - version = "3.10.0"; + version = "3.10.1"; useDune2 = true; @@ -11,7 +11,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz"; - sha256 = "01nq358bilsvvwrvyavc5gik1csjljn4rb3k8yx94gxvbj5vx4h2"; + sha256 = "1glmsz2znhfkk4w6d6nsr7q5jqvivhmi8zwagzw2d8pah0c8bhm4"; }; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ]; 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/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index 7fd939e58ec2..958c088cd6a2 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ppx_tools_versioned"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - sha256 = "0c735w9mq49dmvkdw9ahfwh0icsk2sbhnfwmdhpibj86phfm17yj"; + sha256 = "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66"; }; propagatedBuildInputs = [ ocaml-migrate-parsetree ]; diff --git a/pkgs/development/ocaml-modules/qcheck/alcotest.nix b/pkgs/development/ocaml-modules/qcheck/alcotest.nix index 4f1baec1e556..aebe6bd95a85 100644 --- a/pkgs/development/ocaml-modules/qcheck/alcotest.nix +++ b/pkgs/development/ocaml-modules/qcheck/alcotest.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "qcheck-alcotest"; - inherit (qcheck-core) version src; + inherit (qcheck-core) version useDune2 src; propagatedBuildInputs = [ qcheck-core alcotest ]; diff --git a/pkgs/development/ocaml-modules/qcheck/core.nix b/pkgs/development/ocaml-modules/qcheck/core.nix index fa72a211ef45..03de70237a46 100644 --- a/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/pkgs/development/ocaml-modules/qcheck/core.nix @@ -2,7 +2,9 @@ buildDunePackage rec { pname = "qcheck-core"; - version = "0.15"; + version = "0.16"; + + useDune2 = true; minimumOCamlVersion = "4.03"; @@ -10,7 +12,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "qcheck"; rev = version; - sha256 = "1ywaklqm1agvxvzv7pwl8v4zlwc3ykw6l251w43f0gy9cfwqmh3j"; + sha256 = "1s5dpqj8zvd3wr2w3fp4wb6yc57snjpxzzfv9fb6l9qgigswwjdr"; }; meta = { diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index 2a0e6c0ae40c..dc73f42a13b0 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "qcheck"; - inherit (qcheck-ounit) version src; + inherit (qcheck-ounit) version useDune2 src; propagatedBuildInputs = [ qcheck-ounit ]; diff --git a/pkgs/development/ocaml-modules/qcheck/ounit.nix b/pkgs/development/ocaml-modules/qcheck/ounit.nix index 06897987a954..62b082f48fb2 100644 --- a/pkgs/development/ocaml-modules/qcheck/ounit.nix +++ b/pkgs/development/ocaml-modules/qcheck/ounit.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "qcheck-ounit"; - inherit (qcheck-core) version src; + inherit (qcheck-core) version useDune2 src; propagatedBuildInputs = [ qcheck-core ounit ]; diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index e7f00803a19c..d5829127a8bc 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "qtest"; version = "2.11.1"; + useDune2 = true; + src = fetchFromGitHub { owner = "vincent-hugot"; repo = pname; diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 375c2de27e0e..5aa3ecb0bf17 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; - version = "0.12.6"; + version = "0.12.7"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "14b2289nhb65qm8wrw51y8qgz5ysn8hcbrj5plznd1pdzl46zxc9"; + sha256 = "1c7hmcpcxn1bfa9cavqzriv7py2q7xfbdpb7kh1kb3j1qjap17dc"; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix index 2264f0dedbf9..31c671538a58 100644 --- a/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -2,6 +2,7 @@ , js_of_ocaml-ppx, re }: if stdenv.lib.versionOlder ocaml.version "4.03" +|| stdenv.lib.versionAtLeast ocaml.version "4.11" then throw "xtmpl not supported for ocaml ${ocaml.version}" else stdenv.mkDerivation rec { 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/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index fc1fcfad4002..d7e74f5eff82 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.9.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1y04mchxybmy197lgj2rz53fx29s248hirsmb3zk2vdzlbbbs1b6"; + sha256 = "035cdw2h3f511drc0q1j65j911m1pj6c5ghywavkhib0chim044c"; }; sourceRoot = "source/${pname}"; 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/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 971b43147c6c..22acf8725260 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -12,19 +12,20 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "4.2.0"; + version = "4.2.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; repo = "netatmo-api-python"; rev = "v${version}"; - sha256 = "0b2k1814zg3994k60xdw5gpsl8k1wy9zndd0b1p4dfb5qkx9f8kp"; + sha256 = "12lmjhqjn71a358nkpzl3dwgiwmmz4lcv9f0qf69ngznpiirk28m"; }; postPatch = '' substituteInPlace setup.cfg \ - --replace "oauthlib==3.1.0" "oauthlib" + --replace "oauthlib~=3.1.0" "oauthlib" \ + --replace "requests~=2.23.0" "requests" ''; propagatedBuildInputs = [ 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/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/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/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/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 0e57509d9f73..b51b26eab172 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.2.4"; + version = "4.2.5"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "1p6l5xzz7cbhrk5wy3906llhnwk0l8nck53pvi0l57kz7bdnag5w"; + sha256 = "0v3vla3k6csfb8w0j9njrhcjj4n7yh172n9wv6z397f1sa0fs202"; }; buildInputs = [ unzip ]; 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/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index d4c143b0bd02..00a285c67d02 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "buildkit"; - version = "0.7.2"; + version = "0.8.0"; goPackagePath = "github.com/moby/buildkit"; subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "0kn2ad0rh3xlcxjxslkyrfxhv3cx88996nhxn86605x1mybxb2iq"; + sha256 = "0qcgq93wj77i912xqhwrzkzaqz608ilczfn5kcsrf9jk2m1gnx7m"; }; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version} -X ${goPackagePath}/version.Revision=${src.rev}" ]; 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/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 1913e3d66f6e..af58da175100 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "7.3.0"; + version = "7.3.1"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "0d5v0g28myqiac0a5qy0sbpf0mjzzi3agyks9cdzsgg3ka1i18q9"; + sha256 = "1qridl42jldwv6wka7l54g354aj9f3vbgzhyz5gdz5vdzs9x93w8"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; 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/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 316be0b2fc01..cae76669ab42 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "0862f582i08h80pm6igmi00qsacl5b9jaahh50l2i3905k7rxf5s"; + sha256 = "0q21qd9fhchggby18gzyvds517n9vq7b1rr0gmzik4036ykg1lm2"; }; - cargoSha256 = "1b0nl4nwjza52madrfsmwivxxvz18b53kynv2fbsbh3zzbrm5fj1"; + cargoSha256 = "0dp4prv8c2a6mxl7wskpc65qlfjphdxshb4q2bswqa5i21h8r534"; nativeBuildInputs = [ installShellFiles ]; 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/misc/terraformer/default.nix b/pkgs/development/tools/misc/terraformer/default.nix index 07333d7e24aa..47c9c15a0cc7 100644 --- a/pkgs/development/tools/misc/terraformer/default.nix +++ b/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "11j7yra0qbjadg4cb57qbdxf0di7crfv0aqam6gc1zng3fzlh4w9"; + sha256 = "005i66d2gkyixqh9sk452la7z86d5x9q3njngjf4z9slcbpgk7bl"; }; - vendorSha256 = "1lsg5svdnmqiradpr4h2420y5jmml3af8pp0np1735n3wh1q1blh"; + vendorSha256 = "02i1q11nivdlkhf9chpi03p8jpa0fx9wbf79j834qv4fqy7jqf6l"; subPackages = [ "." ]; 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/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index b3dbd91c0ccb..b7e6021a6d8e 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.13"; + version = "1.0.17"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "1pgzxy9l1zh2qwq20ycqlxp9yj1mfchwc9179zd2v13rlraa8yph"; + sha256 = "13krr1zjh544swv4frfapvyi7bm8qf121x6qz9jqbw2cm3mid301"; }; vendorSha256 = "1y4nyw7rpgipblxqaps2zsd07cin8d0i0g9gvsnc3vifi6g29s8z"; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 6fa3b1b6058c..0f29fc741c63 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.17.0"; + version = "1.17.1"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0i86bymwfnqnvp6na6na5dmjzp3dp7l416irkllh3i5wgvppda7m"; + sha256 = "1q1rzqsga728cjv89lpgnwjb22azlmkffki9m0q21r1njzc3w74h"; }; nativeBuildInputs = [ installShellFiles ]; 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/games/factorio/versions.json b/pkgs/games/factorio/versions.json index b82652d21c10..b4c905450355 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.4.tar.xz", + "name": "factorio_alpha_x64-1.1.5.tar.xz", "needsAuth": true, - "sha256": "0gg10pk0qb44iizwvlzndjr2xkygqzaxmhp9bam7gz86b5cxs0cl", + "sha256": "17hm62mhldms41wv0vv2bzg8zg1mg7ga61h3yzw9dfvic661khmp", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.4/alpha/linux64", - "version": "1.1.4" + "url": "https://factorio.com/get-download/1.1.5/alpha/linux64", + "version": "1.1.5" }, "stable": { "name": "factorio_alpha_x64-1.0.0.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.4.tar.xz", + "name": "factorio_headless_x64-1.1.5.tar.xz", "needsAuth": false, - "sha256": "085lpblysh126y38z01f358xcpwmx1a6hcjlc66aw5ff6bp36yq8", + "sha256": "1s4ajj8kkz1q5rivv2q6c8ii73nxa11g4fs6hic3r43l52n89ml1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.4/headless/linux64", - "version": "1.1.4" + "url": "https://factorio.com/get-download/1.1.5/headless/linux64", + "version": "1.1.5" }, "stable": { "name": "factorio_headless_x64-1.0.0.tar.xz", diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index f41d684d83f5..b0a99e1dc246 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2020.1128.0"; + version = "2020.1204.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "0qf1lvzd668zd405ll3bdbk91xdyr2l9qg42ph93vjcnmrs2jqic"; + sha256 = "1yr9rkkmm15lgbfbrvpyp0d66i5v2xs39abw8yv6qlf70qh4bsg5"; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 4272a816a58a..8a24f0b1bdbb 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -1,8 +1,8 @@ { fetchNuGet }: [ (fetchNuGet { name = "Dapper"; - version = "2.0.35"; - sha256 = "0465i2p5kjj0hmadyw0xrpn43zpc4bnbid9mg561739fyjyjwmfm"; + version = "2.0.78"; + sha256 = "13xgi8prsa3y67hx644yflamwakjv8vsk5m15v407clsl2r4g0bp"; }) (fetchNuGet { name = "DeltaCompressionDotNet"; @@ -16,8 +16,8 @@ }) (fetchNuGet { name = "DiscordRichPresence"; - version = "1.0.150"; - sha256 = "0qmbi4sccia3w80q8xfvj3bw62nvz047wq198n2b2aflkf47bq79"; + version = "1.0.166"; + sha256 = "019rz0br8hamydmdrgzcc6280jfhm4i4ix27jh66a7h37alvdi3a"; }) (fetchNuGet { name = "FFmpeg.AutoGen"; @@ -261,8 +261,8 @@ }) (fetchNuGet { name = "JetBrains.Annotations"; - version = "2020.1.0"; - sha256 = "13fqcr6bs4x9rn0mpx110xl5apwh8ds1h0lx208znrm178ywqm8y"; + version = "2020.3.0"; + sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2"; }) (fetchNuGet { name = "ManagedBass"; @@ -575,11 +575,6 @@ sha256 = "0538fvjz9c27nvc6kv83b0912qvc71wz2w60svl0mscj86ds49wc"; }) (fetchNuGet { - name = "Microsoft.Net.Compilers.Toolset"; - version = "3.1.0"; - sha256 = "1csf8hgwvyxjlxdygacrk3pp0xkzydc1kvsv68cxy8h7gd62k0w0"; - }) - (fetchNuGet { name = "Microsoft.NetCore.Analyzers"; version = "3.3.1"; sha256 = "16cx0x5hcjs2ml5zjalfsp7n3rfyz75ihnvh1p10z96yaz43gdwn"; @@ -601,13 +596,13 @@ }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; - version = "3.1.0"; - sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + version = "3.1.1"; + sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; - version = "3.1.1"; - sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987"; + version = "5.0.0"; + sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { name = "Microsoft.NETCore.Targets"; @@ -636,8 +631,8 @@ }) (fetchNuGet { name = "Microsoft.Win32.Registry"; - version = "4.7.0"; - sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; + version = "5.0.0"; + sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { name = "Mono.Cecil"; @@ -681,8 +676,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2020.1127.0"; - sha256 = "05vxdkw5z7bylj8dyw52lxf3g12mmvdifwvwlgz00v6ybkxr455j"; + version = "2020.1203.0"; + sha256 = "0xk1l09gm39z1739a7bgykj2bkg6lgxx72ds9s7qmbc6nrkr7jwj"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -691,8 +686,8 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2020.1030.0"; - sha256 = "1sxip1m5y7c5jblf9br8f0i5yhv0qjpidv9w6bbdxiy29mfwnz6d"; + version = "2020.1202.0"; + sha256 = "1m5156gkyyhf52ii6y7yqmsgpwcxn6zgji3nnyny6lk9glmc9vvs"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; @@ -701,8 +696,8 @@ }) (fetchNuGet { name = "ppy.SDL2-CS"; - version = "1.0.40"; - sha256 = "1pvc154nqdbhn0rm6id0710yh72wvd2s5xmqxx3935h1jxrjgk8s"; + version = "1.0.53"; + sha256 = "0x52pq6xdg4qcgi8cnqlijifqjpszbi8z4nkmsym0xgd9m5bmd7k"; }) (fetchNuGet { name = "ppy.squirrel.windows"; @@ -816,8 +811,8 @@ }) (fetchNuGet { name = "Sentry"; - version = "2.1.6"; - sha256 = "0vc45p1arxwifv5fb6lzkqqxlsvm4i0xmpq2vc73vbjqzydd2phm"; + version = "2.1.8"; + sha256 = "1ii62ynihr4j2v2agjizk38kfz3m9bdijkks9k7ydhcq1bcz7jbn"; }) (fetchNuGet { name = "Sentry.PlatformAbstractions"; @@ -826,8 +821,8 @@ }) (fetchNuGet { name = "Sentry.Protocol"; - version = "2.1.6"; - sha256 = "0qc18kc9d7f0s6hmnpji3sbz0z09kdgg4fwh55rrmpfgr3w851s7"; + version = "2.1.8"; + sha256 = "04baw4yxc5lbcl83sfcdyjg5225719bf3sxpa3kjmhf58bjr143l"; }) (fetchNuGet { name = "SharpCompress"; @@ -845,14 +840,9 @@ sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) (fetchNuGet { - name = "SixLabors.Core"; - version = "1.0.0-beta0008"; - sha256 = "1yqcv5d2igsrmi9hf8xzikn0fms47skqpr552yzbj4z4wnraahaw"; - }) - (fetchNuGet { name = "SixLabors.ImageSharp"; - version = "1.0.0-beta0007"; - sha256 = "1k3hrp26imyqjarkrcsrhvamlmynzv6cakzq68yx69c0h8lmscaf"; + version = "1.0.2"; + sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; }) (fetchNuGet { name = "Splat"; @@ -921,11 +911,6 @@ }) (fetchNuGet { name = "System.Buffers"; - version = "4.5.0"; - sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; - }) - (fetchNuGet { - name = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) @@ -971,8 +956,8 @@ }) (fetchNuGet { name = "System.ComponentModel.Annotations"; - version = "4.7.0"; - sha256 = "06x1m46ddxj0ng28d7gry9gjkqdg2kp89jyf480g5gznyybbs49z"; + version = "5.0.0"; + sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) (fetchNuGet { name = "System.Composition"; @@ -1151,8 +1136,8 @@ }) (fetchNuGet { name = "System.IO.Packaging"; - version = "4.7.0"; - sha256 = "1vivvf158ilcpp6bq70zyafimi0lng546b34csmjb09k19wgxpiv"; + version = "5.0.0"; + sha256 = "08l85pi8jy65las973szqdnir2awxp0r16h21c0bgrz19gxhs11n"; }) (fetchNuGet { name = "System.IO.Pipelines"; @@ -1436,8 +1421,8 @@ }) (fetchNuGet { name = "System.Security.AccessControl"; - version = "4.7.0"; - sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; + version = "5.0.0"; + sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; @@ -1511,8 +1496,8 @@ }) (fetchNuGet { name = "System.Security.Principal.Windows"; - version = "4.7.0"; - sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; + version = "5.0.0"; + sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { name = "System.Text.Encoding"; 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/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 92fabffcd029..abc11a4a5f06 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkgconfig -, which, python, makeWrapper, docbook_xml_dtd_45 }: +, which, python3, makeWrapper, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { pname = "criu"; @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 ]; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python iptables ]; + nativeBuildInputs = [ pkgconfig docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython ]; + buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ]; + propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; postPatch = '' substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" @@ -39,6 +40,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/criu \ --prefix PATH : ${lib.makeBinPath [ iptables ]} + wrapPythonPrograms ''; meta = with stdenv.lib; { 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/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index d3c7fb965531..66d26dbde760 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.13.0"; + version = "8.14.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "06jq6x24kxwzkwjx05d4q6jyvjpbzqpjlj8arycw8z0w97k83hh9"; + sha256 = "12dm0sasw98ywd074rjd9hnbymvy8z16bicjxfxqz91n1y13732i"; }; buildPhase = '' 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/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index cc77dbd4891d..bde82468b720 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.02.5.1"; + version = "20.02.6.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "09d4zyyjl5mcrzhzbh6nhc35mzim1sy0h0p2h468nwk1fbl81ff5"; + sha256 = "0vllyljsmv3y9hw4vfgnz9cnjqhlk55dy1bipssw872aldlxfcdk"; }; outputs = [ "out" "dev" ]; 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/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f813af5ff6e3..456b30cb3972 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.118.4"; + version = "0.118.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -313,7 +313,7 @@ "google_domains" = ps: with ps; [ ]; "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib "google_pubsub" = ps: with ps; [ google_cloud_pubsub ]; - "google_translate" = ps: with ps; [ gtts-token ]; + "google_translate" = ps: with ps; [ gtts ]; "google_travel_time" = ps: with ps; [ googlemaps ]; "google_wifi" = ps: with ps; [ ]; "gpmdp" = ps: with ps; [ websocket_client ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 565a353cdca1..bc0622e4f554 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -62,7 +62,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.118.4"; + hassVersion = "0.118.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -78,7 +78,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "0b289ijxpay6yb2ahkfm7n9k423f8xlbwg8z903iwakiqg54ghip"; + sha256 = "1711qhcvrzl599cryd9wzamacn1vv37w67vprqgibnbw58kcpilj"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 3c1b9ff2da3c..fd6d34f0ad2d 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.16.2269"; + version = "0.16.2291"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "0bzyp2jjbfjh1xr2ga8vl6vyjhwks824sa8r1g5iydn9y36am7pf"; + sha256 = "1ybjssrj73qf34v66cv32gnlpvppp8kg2bwdv0r7qdy2vj5dx14a"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix index 5a543ed8ba3d..3929ffbafc62 100644 --- a/pkgs/servers/mail/postsrsd/default.nix +++ b/pkgs/servers/mail/postsrsd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "postsrsd"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "roehling"; repo = "postsrsd"; rev = version; - sha256 = "11yr557m60a62m4wxi20lr8kmagjrgndmnwlxzr241bwb20ba96x"; + sha256 = "1f10ac7bkphvjjh2xzzz5c0x97njx20yd8wvl99isqfsyyc2lhm7"; }; cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ]; diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index a31d7a9c6d88..9df7ad827f0a 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.38.0"; + version = "0.39.0"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "01fkzsvdz1b43m8glxl01vw7d19w5fglk9x1rj5bab8fgrx149w8"; + sha256 = "0ngqlb9d8xml0vnjsn6vpi02sjqldsiirlrzfncrh3hlcrhk4fcn"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index e7c144b31d16..45612509e948 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nginx_exporter"; - version = "0.6.0"; + version = "0.8.0"; goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; @@ -14,7 +14,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nginxinc"; repo = "nginx-prometheus-exporter"; - sha256 = "1rwafmm9x0sxj4z7x4axhrjgdy15z70a1y00hw6smq30fcpkazhq"; + sha256 = "sha256-fFzwJXTwtI0NXZYwORRZomj/wADqxW+wvDH49QK0IZw="; }; doCheck = true; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index fa94a3332a82..2080195dc566 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.16.2"; + version = "1.16.3"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-XdlXUwGn2isGn7SqCGaAjntposBEd6WbbdfN6dEycDI="; + sha256 = "1vhxa1sdnkjy86rn2zsyf8kc3nn2fdbym3kw5zxz88mjc8iq3x0d"; }; - vendorSha256 = "02fqx817w6f9grfc69ri06a6qygbr5chan6w9waq2y0mxvmypz28"; + vendorSha256 = "12rh8pggpdjgw9x23qa99cj7i67iqchacgzd11m4ficxv8a4bkyc"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} diff --git a/pkgs/servers/pg_featureserv/default.nix b/pkgs/servers/pg_featureserv/default.nix index a50c1d593008..fd31d728a3b2 100644 --- a/pkgs/servers/pg_featureserv/default.nix +++ b/pkgs/servers/pg_featureserv/default.nix @@ -2,17 +2,19 @@ buildGoModule rec { pname = "pg_featureserv"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "CrunchyData"; repo = pname; rev = "v${version}"; - sha256 = "0vfrwncx41yn9n2hqb32av3xgd13fqplrs1qzg5mv25i4qppd88l"; + sha256 = "0lfsbsgcb7z8ljxn1by37rbx02vaprrpacybk1kja1rjli7ik7m9"; }; vendorSha256 = "1jqrkx850ghmpnfjhqky93r8fq7q63m5ivs0lzljzbvn7ya75f2r"; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ]; + meta = with lib; { description = "Lightweight RESTful Geospatial Feature Server for PostGIS in Go"; homepage = "https://github.com/CrunchyData/pg_featureserv"; diff --git a/pkgs/servers/pg_tileserv/default.nix b/pkgs/servers/pg_tileserv/default.nix index 14f8b7938560..bd8edcf43356 100644 --- a/pkgs/servers/pg_tileserv/default.nix +++ b/pkgs/servers/pg_tileserv/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "pg_tileserv"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "CrunchyData"; repo = pname; rev = "v${version}"; - sha256 = "19ycpir662dv6jg3fnlj3208cjhy0lxww3wc3h19x96556yklnfg"; + sha256 = "1vdxnh1s8r8ydsjnj70s69nifhpyicb4jmgd5j7i49cr096jg526"; }; - vendorSha256 = "1wpzj6par25z7cyyz6p41cxdll4nzb0jjdl1pffgawiy9z7j17vb"; + vendorSha256 = "1wbv1wh3phd9p2hfnffsjv6f8hf9fgkwg88k9w56rx1pgps63nd9"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.programVersion=${version}" ]; doCheck = false; 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/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index af14a3e176c5..a20579371516 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -2,11 +2,11 @@ , libdaemon, popt, pkgconfig, libconfig, libpulseaudio, soxr }: stdenv.mkDerivation rec { - version = "3.3.6"; + version = "3.3.7"; pname = "shairport-sync"; src = fetchFromGitHub { - sha256 = "0s5aq1a7dmf3n2d6ps6x7xarpn53vvlcbms8k23wl2h5vrx91rwi"; + sha256 = "110k196y62zy6cmdvcnf74iamqj7jq0ybnqh1q1irjak81s3yz12"; rev = version; repo = "shairport-sync"; owner = "mikebrady"; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 1b75d5bfd7d1..777793b254cc 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.23.2"; + version = "0.23.4"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "1nv8qcw6pvsma8hdnagl5c8lzz3b09g8nzz83amn9jdcn3ynn0qg"; + sha256 = "05pkg0id9w8brjw7fdqh3qg1q920cdz9dizprim54dhx70kav27x"; }; dontBuild = true; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 247fe588bfcf..b926e747e49d 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.22.1"; + version = "0.22.5"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "1n0yxnjxlz2bvybdvba8cqqv702ry3crq114l2bni7q7llfs5y08"; + sha256 = "04lsmh80br1cr26dp11ai0f96lmjdkc9mjdwnmwkkc0d7igv7rc0"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "0avk20g7ic1gw1qr8bp4rbl7m822q2kphwc9f6ld6p5yl6pwqv3h"; + vendorSha256 = "0hyp44gzmp49mv26xa9j2nc64y2v3np1x1iqc4vsryf3ajsy2720"; doCheck = false; diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index 37bc4aa70d8d..6e5ae662b018 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - version = "0.3.0"; + version = "0.4.0"; pname = "tempo"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "tempo"; - sha256 = "0inqljiavqyq8dk2w0w0l2bds5390mrf8j190yb7lqwx9ra0cjp9"; + sha256 = "16hrvhnlciaf06l34p3bb3nvmxr8zwbh7zql13zja1hs0kvwxv5c"; }; vendorSha256 = null; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 92b6df3ef43f..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 ]; @@ -2692,11 +2692,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgserver = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation { - name = "xorg-server-1.20.9"; + name = "xorg-server-1.20.10"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2"; - sha256 = "0w9mrnffvjgmwi50kln15i8rpdskxv97r78l75wlcmg4vzhg46g2"; + url = "mirror://xorg/individual/xserver/xorg-server-1.20.10.tar.bz2"; + sha256 = "16bwrf0ag41l7jbrllbix8z6avc5yimga7ihvq4ch3a5hb020x4p"; }; 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/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c9d48c9de9f1..02dfb7ee1f55 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -630,16 +630,6 @@ self: super: propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; - # patchPhase is not working, this is a hack but we can remove it in the next xorg-server release - preConfigure = let - # https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067 - headerFix = fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/919f1f46fc67dae93b2b3f278fcbfc77af34ec58.patch"; - sha256 = "0w48rdpl01v0c97n9zdxhf929y76r1f6rqkfs9mfygkz3xcmrfsq"; - }; - in '' - patch -p1 < ${headerFix} - ''; prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" ''; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 70b76c7a6a28..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 @@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.20.9.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.20.10.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/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 30badb175a96..8fb14ed2ead7 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.7"; + version = "2.8.8"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "0bwzrrm07v2lpsja0r0z7nj3jrf814w57mmk8lbdk9dsb3i07x4w"; + sha256 = "1iqwzqgg26vsg7lwmgmga9y3ap9q8r5xyx799bj8kawnr8n6s4jd"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 0a5a5a92af60..a477beac5a0f 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -8,13 +8,12 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev71"; + version = "2.0.0dev75"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "f8b31e2a01a8797f8331c6af2c93a26ff82b2b4b"; - hash = "sha256-25WV64RPXpGlq9mZYxUVKUdUjU+e1UnuVTLf9Z9I8Tc= -"; + rev = "1a4caa8d1c232e9463febec406a8fedc71cb065c"; + sha256 = "0z2c9i2ci3f8979si8gcgnsz44ylchjax1f3dhj7pzyb2kcw6zri"; }; }); prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { @@ -30,13 +29,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.1.3"; # N.B: if you change this, change botocore to a matching version too + version = "2.1.7"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-7klM8jLNptaMyOjKkrsldUdw10vABgIc+Fs3Kj/z0V0="; + sha256 = "0sxdbc8y5yqcvsk2bxkywdh4fsq90vlsmcm45y0sa3rpza64xs3r"; }; postPatch = '' diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index b6834551cee6..c375b0987dc4 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0np11c4apyl7lmh4kjyi62bcf1kjf2fjjlli8aadvlli2ww8qrf2"; + sha256 = "1rhiak1264czcww5ayz35am9nsn5xa3kjd90szssg46ngxisd61x"; }; - vendorSha256 = "19fk2lw7m8kqwwhv3sqr0iix90sjcnh2mqqvr5p87hfjars4c55v"; + vendorSha256 = "1s9xhq1k67gf9saada1dr95n1sd265hndkxz0alqw6dm2vdp3n2q"; doCheck = false; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 7d2523b4073d..1bcee96c9fff 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,178 +1,178 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.10.2"; + version = "2.15.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.10.2-linux-x64.tar.gz"; - sha256 = "0pxm90vmha265zc4b1ip2f3iryslkwxznn4kb8l3ma6gibz1zav3"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.15.0-linux-x64.tar.gz"; + sha256 = "0yvzqqcfmgblig5jwdc07phyhnfjzvjd1qm0vgfi9ll9y88l33lc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.1.0-linux-amd64.tar.gz"; - sha256 = "1l4kszzw1w862sfd4jnz66lwnp02p4kl1fwvj5ab81qfwzwg0cfx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.3.0-linux-amd64.tar.gz"; + sha256 = "1rpmzra42kx2jnhdbnqg120lbnpw86y00vkqbqc3qyagi260f01g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.4.0-linux-amd64.tar.gz"; - sha256 = "1gzjdafx5zsqrb5r3amskak51ajcpqbbfw45939jdsdll8vclw7g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.19.0-linux-amd64.tar.gz"; + sha256 = "0y0j1aflrfas9sfr4g7jbn2cnhlz9hpz5il6qykz0m01v6sv604w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.6.0-linux-amd64.tar.gz"; - sha256 = "0myvx2glqnx29l4wd5vx4gm773zrcmwcjvs2b1yv63fl10md9sv7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.8.0-linux-amd64.tar.gz"; + sha256 = "174b6r2vhbf9svknidd05sccjzihp97wcd8jwy6dll83d8f8v2xn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.5.0-linux-amd64.tar.gz"; - sha256 = "12cajd8jiqy11s880vsv20gqfm44g160x7fxm93agjl7wng32ad6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-linux-amd64.tar.gz"; + sha256 = "0xq36wh57w7b7l5skx173lj3chl4rfgbfdivsvyjlnfahh2fmfr4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.8.0-linux-amd64.tar.gz"; - sha256 = "0k429fh477f84kmnhyl5s9p0yym7d6sdq7hy7wqx6psxp4rf5h9x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.11.0-linux-amd64.tar.gz"; + sha256 = "0p2i0k0js3js35jcphf64rzxs7zg9wq25yfzd9q6b2kp2vyqbvjs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v2.8.0-linux-amd64.tar.gz"; - sha256 = "045z7qj23bq71nxfjk1vvnfbjcnqfkcbxbpjz72q0hw4xn7dq6jz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.1.1-linux-amd64.tar.gz"; + sha256 = "1hzf4668sljy2g6s9xz6lvn8cbjy8bb2flhdmc4ln69xxcsslj9z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.3.0-linux-amd64.tar.gz"; - sha256 = "16d0jd3429pr4vlrzrv32w2fa53j7gyqq5lc78gw9j4v3mc3scvz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.4.1-linux-amd64.tar.gz"; + sha256 = "0fr8ac7864ph02hhl3f08xjyk626c4zbcf8nr7xhmh2ifz6sj9sl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.25.0-linux-amd64.tar.gz"; - sha256 = "0gz4kpddaf9p25lfnp70p6197wrfgsiys7s4vdy75z8dyd4sbiv0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.4.0-linux-amd64.tar.gz"; + sha256 = "0zx9yy97n0wk87ylgq67nphagfp1gas5z99mcfmlh9rf4mj8fhpz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.0.0-linux-amd64.tar.gz"; - sha256 = "0n2532gfb5i53raya07rn8wcp15rc07jfg8wsm2lfzj7a4mp2p6c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.3.0-linux-amd64.tar.gz"; + sha256 = "02c0nmnk27q9ssv7wv8s30ysxnkqbq7sd004gia4wxf97fhlhl5x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v2.6.0-linux-amd64.tar.gz"; - sha256 = "16l1a30rkg9l6yh68qv61dgm3h3gdgpsdacvnfg1ra0fvvfs9477"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.3.0-linux-amd64.tar.gz"; + sha256 = "01rpv9m6mj8yqz302g15x4yp37pp4ghdc686n4l7xz08xdb209xi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.2.0-linux-amd64.tar.gz"; - sha256 = "1m2w8gsksr36pprxr6v3v4y3n7x5ycbcdfywv67yxmbi4lxyy3ar"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.0-linux-amd64.tar.gz"; + sha256 = "1w4cjgccm29ncqb7jfsf9ajlvq0q8h5mnz4v5lxwyx21n80kq34p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.6.1-linux-amd64.tar.gz"; - sha256 = "01vnbgck1ffj4jg8ghmkjp63xq3r9q3459vy03xpzm14l1i6agwv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.3-linux-amd64.tar.gz"; + sha256 = "0imqwx4v6qsk10anxvnaxpxg87mm34x0qcq30c435mcfrly728sp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.2.0-linux-amd64.tar.gz"; - sha256 = "1g05kqymbkrxf48iskn9w12kxy880allhqm9a7p4g7mx0174yfhm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-linux-amd64.tar.gz"; + sha256 = "0zrza0i73ld16szbbsz3h9p9z09ws2pf380kzb1358g70ayvzga3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.2.1-linux-amd64.tar.gz"; - sha256 = "1fa5i283nisa6cq02fcrsgwkw7bwnh2j3agjbqyvv2xiss34i7hw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.2-linux-amd64.tar.gz"; + sha256 = "12gs049074vn5s0njza0r48bk5z8d7bfc50j2mbbylkdrlrl87ci"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.6.0-linux-amd64.tar.gz"; - sha256 = "0ihiag248c30dz4z2b559689zqwp52p0m7pv7jqpk86xwvimbsn1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.9.0-linux-amd64.tar.gz"; + sha256 = "1vqzl72q939i381vy6dkn75xv09vjs2mg2prbmx63j3hylgb9m6r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.1.0-linux-amd64.tar.gz"; - sha256 = "0jwvdsb26bhsqcbrsw9ss54xgpccl830hhbwnbz8ql8yndd35srg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-linux-amd64.tar.gz"; + sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.4.0-linux-amd64.tar.gz"; - sha256 = "1wr4p312xwqi0icn153iv2j88rp37wkf8hc5y4pmdr61vd0kpw7w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.2-linux-amd64.tar.gz"; + sha256 = "1xxhc5sy3z391dgzzb4s6wzad2n2j3f5g158wffcj8jss2ylbh1x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.3.1-linux-amd64.tar.gz"; - sha256 = "0xq3as94i9ah9dv1cabgdqjg68yg7laksfzpf81s6kcv742cnnqi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.4.2-linux-amd64.tar.gz"; + sha256 = "02xq4mph35fnziz6fb230cvd828yfs030nmi3a4hwh4w1xbr24iw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v2.4.0-linux-amd64.tar.gz"; - sha256 = "1av7fj1jlhhqplqq60d6hzzidlhsvr41z9p1x3mvz5frwijxr1ab"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0avlf8gyh52zc11a87izy2v8iy4zvbfv6zrm8zg1i5ar43xqg3pm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.10.0-linux-amd64.tar.gz"; - sha256 = "1bgw5xw6f01whxlm5358xn6v9wqz9mxg3dvb5vi7rfs9wwxykr4g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.2-linux-amd64.tar.gz"; + sha256 = "1wb953vm990c4dsb757msmz7ws844alad3g68sfy029cgmnf8q5i"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.10.2-darwin-x64.tar.gz"; - sha256 = "1fzqylx7pmrpvsxrmhlx56v9i9zkid96zrj9hsc26qhx5w7k600w"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.15.0-darwin-x64.tar.gz"; + sha256 = "08hyk06qwm1aibpyqb07h83gc6nfp0cwf6hikf8mc18b2mrwr27r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.1.0-darwin-amd64.tar.gz"; - sha256 = "05dxpdwdg8cd1a6d3xh8dkns5wkvpr0v11bb4zdzv38x6wxnqx0z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.3.0-darwin-amd64.tar.gz"; + sha256 = "0ih9l3pkqxfslc11qcgwshxqxbcwy5wfpjczahny6mkgqwmxixnx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.4.0-darwin-amd64.tar.gz"; - sha256 = "1jbnx1wpzh2k127ixh9j0ghlqhj3sc1s17cp3ax3q9gq3cadcl5i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.19.0-darwin-amd64.tar.gz"; + sha256 = "0yqm66av2yb9qndpkxxisjml66dyg3zhzkb9fr6kywx8xar4gfdp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.6.0-darwin-amd64.tar.gz"; - sha256 = "0lpf3cqi3kss7hmr8a3y6gmwjl854vmva4f9p9q7147rxr8aw5f9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.8.0-darwin-amd64.tar.gz"; + sha256 = "02is7mfbzhv8bkyn4vk1x9b6m1v9c21chihpry6cjdhpq46bfssf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.5.0-darwin-amd64.tar.gz"; - sha256 = "0qwjrhmspibjr17kgswfcgbdhmkicqrjd1md6azingdr5wp7cwwm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.6.2-darwin-amd64.tar.gz"; + sha256 = "09z1kn5gbgda0d4sfyd17qv1p9ldvxn8jbd049s46gvalmqbfwpd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.8.0-darwin-amd64.tar.gz"; - sha256 = "0rwgbpif7l3ayh363cz0k2dir36a87x0bszspq3nm3xbwmd190f0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.11.0-darwin-amd64.tar.gz"; + sha256 = "1r0r6hpchkiq6bg3z6bqnqqz8s96pijsp6rn1dby9f2kaqmar23c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v2.8.0-darwin-amd64.tar.gz"; - sha256 = "0943r8x70gxxkfn0rhcx2b9zya44k28j5s8z2m8jn2i1fvqvahq5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.1.1-darwin-amd64.tar.gz"; + sha256 = "1nrj3lh2asw6169pddjp83q6ll3w5fjp854bdrx99zajpv7gd0gm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.3.0-darwin-amd64.tar.gz"; - sha256 = "1nvqjc1zrxfn2r1wdh2sdr2vimar5836bhscqsiaw4i6mjdsggfy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.4.1-darwin-amd64.tar.gz"; + sha256 = "0y76cy3h0n004lfch37gf9vi8glxnxixwmf1zby3izxd34pyri17"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.25.0-darwin-amd64.tar.gz"; - sha256 = "05x0qlv3xkkvs71ixzmc21ck85w9f4a4dxrwmgkq6c0nhy3npbnj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.4.0-darwin-amd64.tar.gz"; + sha256 = "09zc0sg2h07c97bqbh3ma4pgs232nbd0q5l43992nqa4mn5b8w14"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.0.0-darwin-amd64.tar.gz"; - sha256 = "1m80l75r2w46m7191igjan4ipfkhc9ld1xlybncd628qlcf2jpqz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.3.0-darwin-amd64.tar.gz"; + sha256 = "08crawyaa26llqc3hj2grba0546ny8zwj8dfg6i46ad3kx1nmycq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v2.6.0-darwin-amd64.tar.gz"; - sha256 = "0dan0qqvaxfh90db14s7adjjy670lz15bbm6a8fjfyj4fdhsbwyn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "12ny0kmly1blj8hd8dlzqbg1pbfh37259x3k2kxx2zcqvcw9y4z9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.2.0-darwin-amd64.tar.gz"; - sha256 = "1gznv5d10pxbkyl4hbd4c9skkgkypfs1xg0jjmszkwxcjzvhc4l3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.4.0-darwin-amd64.tar.gz"; + sha256 = "0svbnv3axy397w2hi3g1mghcahq88aj4jsnipn3lyxrm29n4wna7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.6.1-darwin-amd64.tar.gz"; - sha256 = "08w8by7h9nlgvyap2in6yy21dk46fxvl93h4ghaw7xxjjs2l3dfi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.7.3-darwin-amd64.tar.gz"; + sha256 = "1viwi0ji1qqy4ysl4a9dhv8sfpg8sp3w4i9ndvxs2m7zq0hbndbs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.2.0-darwin-amd64.tar.gz"; - sha256 = "0qjszd30r3094p5m7v5gynx2kxh9xf9878mxdc2wnswpkpw3v5pb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.3.1-darwin-amd64.tar.gz"; + sha256 = "1382c66vfkzr4hinqi45g7w9s7zv8yhj4in5wnd20s3cg5890mr1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.2.1-darwin-amd64.tar.gz"; - sha256 = "1a19lmxi8r8h4yfll0k97kvq0lgkzwvrwf52ny4zl67bc9g4jr5p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.3.2-darwin-amd64.tar.gz"; + sha256 = "1fb6p0nafs3s0kablwyq8v5kf5bs0fi9hkgwkz8hl0ydijzpasl4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.6.0-darwin-amd64.tar.gz"; - sha256 = "11vfjkmhrq7q4j6h5d2sdzan3ziyhl5qhc0fhfnsz2pxss549zab"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.9.0-darwin-amd64.tar.gz"; + sha256 = "0dhxhsjb3vbc1bq4pgidadiyfr3gasj0h344prcjzcaxymb3609f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "1ny1m6pb44k77gqf97km3gkb7dwhilkmqi2zy4hdl20js1ijsh7p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.2.2-darwin-amd64.tar.gz"; + sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.4.0-darwin-amd64.tar.gz"; - sha256 = "1vm2pfj93wi6q7kcrqwy9190mx0jn2p96algcd5gms48a4m8bgpb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.5.2-darwin-amd64.tar.gz"; + sha256 = "0mf7a33ldvfx3yiprprh0cdb4bcnjcp7dhl0bifwyi644v94ffm1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.3.1-darwin-amd64.tar.gz"; - sha256 = "0mnmlvyppfndq1rwy4k40j0syy590v2lg75kg0rnf16qlpffskn9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.4.2-darwin-amd64.tar.gz"; + sha256 = "0f77ja9cvhcl86654a3gmb399c7ybigznmxxd8f6f2m7x44pih4q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v2.4.0-darwin-amd64.tar.gz"; - sha256 = "0q9qbqalask628cbi3347pjbnm3304c8qhx7h8icqxxh59mjnhr7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "18i81mdws02kfil8zcrnjl3i4gjxqix9n04flz67mqw730mhr3ss"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.10.0-darwin-amd64.tar.gz"; - sha256 = "1gxiqq6hk77s1n3q3p92p0yykpihw2k8lv01dra015fjha6pyl19"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.11.2-darwin-amd64.tar.gz"; + sha256 = "1mw70j1iky98k09739mq1b7lsarvlqp2kcm26555520z78ifiibh"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 5e0c721959c3..80acc33322d0 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,31 +3,31 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="2.10.2" +VERSION="2.15.0" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - "auth0=1.1.0" - "aws=3.4.0" - "cloudflare=2.6.0" - "consul=2.5.0" - "datadog=2.8.0" - "digitalocean=2.8.0" - "docker=2.3.0" - "gcp=3.25.0" - "github=2.0.0" - "gitlab=2.6.0" - "hcloud=0.2.0" - "kubernetes=2.6.1" - "mailgun=2.2.0" - "mysql=2.2.1" - "openstack=2.6.0" - "packet=3.1.0" - "postgresql=2.4.0" - "random=2.3.1" - "vault=2.4.0" - "vsphere=2.10.0" + "auth0=1.3.0" + "aws=3.19.0" + "cloudflare=2.8.0" + "consul=2.6.2" + "datadog=2.11.0" + "digitalocean=3.1.1" + "docker=2.4.1" + "gcp=4.4.0" + "github=2.3.0" + "gitlab=3.3.0" + "hcloud=0.4.0" + "kubernetes=2.7.3" + "mailgun=2.3.1" + "mysql=2.3.2" + "openstack=2.9.0" + "packet=3.2.2" + "postgresql=2.5.2" + "random=2.4.2" + "vault=3.1.0" + "vsphere=2.11.2" ); function genMainSrc() { 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/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index 41a04d018355..695a45d81ffc 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,5 +1,5 @@ -{ clangStdenv, fetchFromGitHub, fetchpatch, which, ninja, python, gyp, pkgconfig -, protobuf, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese }: +{ stdenv, fetchFromGitHub, which, ninja, python, pkgconfig, protobuf +, ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }: let japanese_usage_dictionary = fetchFromGitHub { @@ -8,11 +8,11 @@ let rev = "e5b3425575734c323e1d947009dd74709437b684"; sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; }; -in clangStdenv.mkDerivation rec { +in stdenv.mkDerivation rec { name = "ibus-mozc-${version}"; - version = "2.23.2815.102"; + version = "2.23.4206.102"; - meta = with clangStdenv.lib; { + meta = with stdenv.lib; { isIbusEngine = true; description = "Japanese input method from Google"; homepage = "https://github.com/google/mozc"; @@ -21,37 +21,28 @@ in clangStdenv.mkDerivation rec { maintainers = with maintainers; [ gebner ericsagnes ]; }; - nativeBuildInputs = [ which ninja python gyp pkgconfig qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ which ninja python3Packages.python python3Packages.six + python3Packages.gyp pkgconfig qt5.wrapQtAppsHook ]; buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ]; src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "afb03ddfe72dde4cf2409863a3bfea160f7a66d8"; - sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx"; + rev = "91cc1e19ef34aeb12888b697fefa52907f1a834d"; + sha256 = "1fyy9g1pnaq6s5nkf56aqmp5mgyibbmp1ylc64fqc6g1plg90zk2"; + fetchSubmodules = true; }; - patches = [ - # https://github.com/google/mozc/pull/444 - fix for gcc8 STL - (fetchpatch { - url = "https://github.com/google/mozc/commit/82d38f929882a9c62289b179c6fe41efed249987.patch"; - sha256 = "07cja1b7qfsd3i76nscf1zwiav74h7d6h2g9g2w4bs3h1mc9jwla"; - }) - # Support dates after 2019 - (fetchpatch { - url = "https://salsa.debian.org/debian/mozc/-/raw/master/debian/patches/add_support_new_japanese_era.patch"; - sha256 = "1dsiiglrmm8i8shn2hv0j2b8pv6miysjrimj4569h606j4lwmcw2"; - }) - ]; - postUnpack = '' - rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/ + rm -rf $sourceRoot/src/third_party/japanese_usage_dictionary/ ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary + '' + stdenv.lib.optionalString stdenv.isLinux '' + sed -i 's/-lc++/-lstdc++/g' $sourceRoot/src/gyp/common.gypi ''; configurePhase = '' export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model" - cd src && python build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc + cd src && python build_mozc.py gyp --gypdir=${python3Packages.gyp}/bin --server_dir=$out/lib/mozc ''; buildPhase = '' diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 0316a9b08a40..676467c9b67d 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.198"; + version = "1.199"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "1b57pk10wf667aag3mhh397sfra44gilnyyg7fm532qaw3xapv2i"; + sha256 = "0qs0qrdagvnh4z20wp4v3v4ry6j5jihlpv3iqzzhdzzxjfrw9m9y"; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 53b89a072247..fb8e2508294a 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.0.7"; + version = "1.0.8"; src = fetchCrate { inherit pname version; - sha256 = "0rxk6dsbn960ikmp6f8a98g3dlibzfy9gcbdina37403kxv8bs6v"; + sha256 = "06881c8qnh917y2mn5q5qlf86idz17xi2dapsad3m1zbdr53c25j"; }; - cargoSha256 = "14fc53xl8f19z8cjrgn6qafiymgirmsin2nzh4i3qprmcc52all8"; + cargoSha256 = "1k5qm4h028172r7i2pz5l8886qviy7ni83qxn10a8d5hsgalarvx"; nativeBuildInputs = [ makeWrapper 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/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 31e925af6ce2..58a7ce619c5a 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.148.0"; + version = "0.149.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "11dzh5scfwf8lm0rw5f3z0plix5p4mmvgigzav2g59p0wdw3v3jy"; + sha256 = "14yvxnl2ap1hizpk3pfzlh36399df1z2zgsc63qdh1h4ixyav6cy"; }; vendorSha256 = "17l15z2wyxzh7h7hvb1fysdnyg8wr8ww827vvmki73s1plfgr80d"; 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/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index 7c3d6a4f70a2..56c9541c2e03 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "1ga632c86l30n6wjj8rc3gz43v93mb7kcl9f8vhig16ycgiw8v09"; + sha256 = "0cvzkfyljgxhmn456f2rn0vq2bhm1ishr4jg4dnwjjfgmjg3w908"; }; - cargoSha256 = "0bgm29v9vmd1xcdazg1psrx6hb1z3zfzr1c4iy8j1r28csbmm6kq"; + cargoSha256 = "1aymhbfzcncrbc5n8rf62bdgi95b4bjhw6p716vhca5p6c7wfxcb"; buildInputs = [ llvmPackages.libclang expat freetype ] ++ lib.optionals stdenv.isLinux [ libxcb ] 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/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 62816b227964..04a11a922041 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "15ad30svvr775dxp5gwlq73xydsqwfpw650c3c3ma4jshw36w0x4"; + sha256 = "1bpq4zki98vw793rvrk9qwgh62f1qwzh0cm4a3h0bif43kg836n0"; }; - cargoSha256 = "0bwy2y44czhvckipvjn28j6ds1pnbj38i29hvlv4f782imfn92hz"; + cargoSha256 = "1486pfiv4lfzdz3hj5z6s7q8lhzrldffji3fsf10z50sm4fhq73q"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/wacomtablet/default.nix b/pkgs/tools/misc/wacomtablet/default.nix index aa631d441148..5ff2800496a7 100644 --- a/pkgs/tools/misc/wacomtablet/default.nix +++ b/pkgs/tools/misc/wacomtablet/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, extra-cmake-modules, qtx11extras, +{ lib, mkDerivation, fetchurl, fetchpatch, extra-cmake-modules, qtx11extras, plasma-workspace, libwacom, xf86_input_wacom }: @@ -9,6 +9,12 @@ mkDerivation rec { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; sha256 = "197pwpl87gqlnza36bp68jvw8ww25znk08acmi8bpz7n84xfc368"; }; + patches = [ + (fetchpatch { + url = "https://invent.kde.org/system/wacomtablet/commit/4f73ff02b3efd5e8728b18fcf1067eca166704ee.patch"; + sha256 = "0185gbh1vywfz8a3wnvncmzdk0dd189my4bzimkbh85rlrqq2nf8"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ @@ -22,7 +28,7 @@ mkDerivation rec { This module implements a GUI for the Wacom Linux Drivers and extends it with profile support to handle different button / pen layouts per profile. ''; - homepage = "https://cgit.kde.org/wacomtablet.git/about/"; + homepage = "https://invent.kde.org/system/wacomtablet"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.Thra11 ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a7b42471494b..b037a982edcf 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.12.02"; + version = "2020.12.05"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "0wkslmqiydlzrla4wx67757b18r4l9h42fkfzdcxx6n0ygiv4qbi"; + sha256 = "065s45l8qz7wlkaxw9bj20gq9647zpwdj9vc6chhqjscl63z1aqm"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; 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/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index ece9c47ae684..fdf5c9ad704b 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.0.1-post2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "v${version}"; - sha256 = "0cvbwxvq1cj9xcjc3hnxrpq9yrmfkapy533cbjzsjmvgiqk11hps"; + sha256 = "10hvzgn98qbzs7mmql9wlbll814mkki29lvg71lbvr81wlbdn6mr"; }; - cargoSha256 = "0vdhincvfassj7gbiplwbi43yyic3l6wlc32s6ci68b2wjmff8pn"; + cargoSha256 = "0kkfrdzyy5068k8nz08pfc4cl1dvn0vd6i01gax5dblk122ybbag"; meta = with lib; { description = "Ping, but with a graph"; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 9d254a055109..1413ca72a105 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "0zk1lvjramahjpq94axdic8sgvvmgyg1fmcb89lynqqvh66qsv12"; + sha256 = "0lky68fjrqjsd62g97jkn5a9hzj53g8wb6d2ncx8s21rknpncdar"; }; preConfigure = '' 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/hcxdumptool/default.nix b/pkgs/tools/security/hcxdumptool/default.nix index 4ffc4133c140..afc08d88a590 100644 --- a/pkgs/tools/security/hcxdumptool/default.nix +++ b/pkgs/tools/security/hcxdumptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxdumptool"; - version = "6.1.3"; + version = "6.1.4"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; rev = version; - sha256 = "1bbf617islljmcw665vqwlplbkpa36w2n4fc4avy7blj773lxp6y"; + sha256 = "14rwcchqpsxyzvk086d7wbi5qlcxj4jcmafzgvkwzrpbspqh8p24"; }; buildInputs = [ openssl ]; 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/security/thc-ipv6/default.nix b/pkgs/tools/security/thc-ipv6/default.nix index 1bc7bc4ce6b7..b8175ef6dbac 100644 --- a/pkgs/tools/security/thc-ipv6/default.nix +++ b/pkgs/tools/security/thc-ipv6/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, libpcap, openssl, libnetfilter_queue, libnfnetlink }: stdenv.mkDerivation rec { pname = "thc-ipv6"; - version = "3.6"; + version = "3.8"; src = fetchFromGitHub { owner = "vanhauser-thc"; repo = pname; rev = "v${version}"; - sha256 = "1xjg30z0wzm3xvccv9cgh000i1m79p3m8f0b3s741k0mzyrk8lln"; + sha256 = "07kwika1zdq62s5p5z94xznm77dxjxdg8k0hrg7wygz50151nzmx"; }; buildInputs = [ diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 4e47b8f568b3..e0dc69de0e43 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.24"; + version = "3.25"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "0wkbs8gzfvclsn576fcx5sqzb5qs7annn7ra4kk2i578a32q4sxw"; + sha256 = "1f20ihynwnz8jqqlr73i5glr8ziplz4mmcjgk340mj2yqqcnsqag"; }; buildInputs = [ python zlib ] diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 59636fb5dc80..1b826e6fab4f 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nvtop"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; rev = version; - sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4"; + sha256 = "1h24ppdz7l6l0znwbgir49f7r1fshzjavc6i5j33c6bvr318dpqb"; }; cmakeFlags = [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 28b5614a80cb..8009208739a6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -189,6 +189,10 @@ mapAliases ({ gnuradio-limesdr = gr-limesdr; # added 2019-05-27 gnuradio-rds = gr-rds; # added 2019-05-27 gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27 + # added 20-10-2020 + gnuradio-with-packages = gnuradio3_7.override { + extraPackages = [ gr-nacl gr-gsm gr-ais gr-limesdr gr-rds gr-osmosdr ]; + }; gnustep-make = gnustep.make; # added 2016-7-6 gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12 go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 @@ -365,6 +369,7 @@ mapAliases ({ openjpeg_2_1 = openjpeg_2; # added 2018-10-25 opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 + onnxruntime = throw "onnxruntime has been removed due to poor maintainability"; # added 2020-12-04 osquery = throw "osquery has been removed."; # added 2019-11-24 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # added 2020-02-02 owncloudclient = owncloud-client; # added 2016-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ee84e482e99a..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 { @@ -2478,8 +2482,6 @@ in oneshot = callPackage ../tools/networking/oneshot { }; - onnxruntime = callPackage ../development/libraries/onnxruntime { }; - xkbd = callPackage ../applications/misc/xkbd { }; libpsm2 = callPackage ../os-specific/linux/libpsm2 { }; @@ -3042,8 +3044,7 @@ in m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { }; mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc { - python = python2; - inherit (python2Packages) gyp; + stdenv = clangStdenv; protobuf = pkgs.protobuf3_8.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; @@ -3546,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 { }; @@ -12787,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; @@ -14321,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 { }; @@ -14410,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 { }; @@ -15744,7 +15754,13 @@ in qm-dsp = callPackage ../development/libraries/audio/qm-dsp { }; - qradiolink = callPackage ../applications/radio/qradiolink { }; + qradiolink = callPackage ../applications/radio/qradiolink { + # 3.8 support is not ready yet: + # https://github.com/qradiolink/qradiolink/issues/67#issuecomment-703222573 + # The non minimal build is used because the 'qtgui' component is needed. + # gr-osmosdr is using the same gnuradio as of now. + gnuradio = gnuradio3_7-unwrapped; + }; qrupdate = callPackage ../development/libraries/qrupdate { }; @@ -16877,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 { @@ -18399,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; @@ -21024,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 { }; @@ -21155,34 +21177,80 @@ in gksu = callPackage ../applications/misc/gksu { }; - gnss-sdr = callPackage ../applications/radio/gnss-sdr { boost=boost166; }; + gnss-sdr = callPackage ../applications/radio/gnss-sdr { + boost = boost166; + gnuradio = gnuradio3_7-unwrapped; + }; - gnuradio = callPackage ../applications/radio/gnuradio { - inherit (python2Packages) cheetah lxml Mako matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; + gnuradio-unwrapped = callPackage ../applications/radio/gnuradio { inherit (darwin.apple_sdk.frameworks) CoreAudio; - fftw = fftwFloat; - qwt = qwt6_qt4; + python = python3; }; - - gnuradio-with-packages = callPackage ../applications/radio/gnuradio/wrapper.nix { - inherit (python2Packages) python; - extraPackages = [ gr-nacl gr-osmosdr gr-ais gr-rds ] - ++ lib.optionals stdenv.isLinux [ gr-gsm gr-limesdr ]; + # A build without gui components and other utilites not needed for end user + # libraries + gnuradioMinimal = gnuradio-unwrapped.override { + features = { + gnuradio-companion = false; + python-support = false; + gr-ctrlport = false; + examples = false; + gr-qtgui = false; + gr-utils = false; + gr-modtool = false; + sphinx = false; + doxygen = false; + }; + }; + gnuradio = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = gnuradio-unwrapped; + }; + gnuradio3_7-unwrapped = callPackage ../applications/radio/gnuradio/3.7.nix { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + python = python2; + }; + # A build without gui components and other utilites not needed if gnuradio is + # used as a c++ library. + gnuradio3_7Minimal = gnuradio3_7-unwrapped.override { + features = { + gnuradio-companion = false; + python-support = false; + gr-ctrlport = false; + gr-qtgui = false; + gr-utils = false; + sphinx = false; + doxygen = false; + gr-wxgui = false; + }; + }; + gnuradio3_7 = callPackage ../applications/radio/gnuradio/wrapper.nix { + unwrapped = gnuradio3_7-unwrapped; }; grandorgue = callPackage ../applications/audio/grandorgue { }; - gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { }; + gr-nacl = callPackage ../applications/radio/gnuradio/nacl.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { }; + gr-gsm = callPackage ../applications/radio/gnuradio/gsm.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { }; + gr-ais = callPackage ../applications/radio/gnuradio/ais.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { }; + gr-limesdr = callPackage ../applications/radio/gnuradio/limesdr.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { }; + gr-rds = callPackage ../applications/radio/gnuradio/rds.nix { + gnuradio = gnuradio3_7-unwrapped; + }; - gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; + gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { + gnuradio = gnuradio3_7-unwrapped; + }; goldendict = libsForQt514.callPackage ../applications/misc/goldendict { inherit (darwin) libiconv; @@ -21221,7 +21289,14 @@ in gpx = callPackage ../applications/misc/gpx { }; - gqrx = libsForQt514.callPackage ../applications/radio/gqrx { }; + gqrx = libsForQt514.callPackage ../applications/radio/gqrx { + gnuradio = gnuradio3_7Minimal; + # Use the same gnuradio for gr-osmosdr as well + gr-osmosdr = gr-osmosdr.override { + gnuradio = gnuradio3_7Minimal; + pythonSupport = false; + }; + }; gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; @@ -21987,7 +22062,9 @@ in inkscape-extensions = recurseIntoAttrs (callPackages ../applications/graphics/inkscape/extensions.nix {}); - inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { }; + inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { + gnuradio = gnuradioMinimal; + }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; @@ -22670,6 +22747,9 @@ in ympd = callPackage ../applications/audio/ympd { }; + # a somewhat more maintained fork of ympd + mympd = callPackage ../applications/audio/mympd { }; + nload = callPackage ../applications/networking/nload { }; normalize = callPackage ../applications/audio/normalize { }; @@ -22757,6 +22837,8 @@ in pythonPackages = python3Packages; }; + n8n = callPackage ../applications/networking/n8n {}; + neap = callPackage ../applications/misc/neap { }; neomutt = callPackage ../applications/networking/mailreaders/neomutt { }; @@ -22820,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 { }; @@ -26233,6 +26313,7 @@ in dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; + easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { }; emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { }; freon = callPackage ../desktops/gnome-3/extensions/freon { }; gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; @@ -28276,7 +28357,7 @@ in vttest = callPackage ../tools/misc/vttest { }; - wacomtablet = libsForQt514.callPackage ../tools/misc/wacomtablet { }; + wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; wasmer = callPackage ../development/interpreters/wasmer { }; 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..08cb32a94080 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 { }; @@ -5322,6 +5343,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 +5644,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 +5661,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 +5829,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 +6251,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 { }; |