diff options
Diffstat (limited to 'pkgs')
106 files changed, 1930 insertions, 1010 deletions
diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/applications/audio/hqplayer-desktop/default.nix index 2551c610c57..a0443aa9a6a 100644 --- a/pkgs/applications/audio/hqplayer-desktop/default.nix +++ b/pkgs/applications/audio/hqplayer-desktop/default.nix @@ -3,6 +3,7 @@ , autoPatchelfHook , fetchurl , flac +, gcc11 , lib , libmicrohttpd , llvmPackages_10 @@ -17,13 +18,11 @@ mkDerivation rec { pname = "hqplayer-desktop"; - version = "4.12.1-35"; + version = "4.12.2-36"; src = fetchurl { - # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs - # c.f. https://github.com/NixOS/nixpkgs/pull/111616 - url = "https://www.signalyst.eu/bins/hqplayer/fc33/hqplayer4desktop-${version}.fc33.x86_64.rpm"; - sha256 = "sha256-DLnZNX+uAan9dhPLMvINeXsIn3Yv2CgsvyTcX0hbEK8="; + url = "https://www.signalyst.eu/bins/hqplayer/fc34/hqplayer4desktop-${version}.fc34.x86_64.rpm"; + sha256 = "sha256-ng0Tkx6CSnzTxuunStaBhUYjxUmzx31ZaOY2gBWnH6Q="; }; unpackPhase = '' @@ -35,11 +34,12 @@ mkDerivation rec { buildInputs = [ alsa-lib flac + gcc11.cc.lib libmicrohttpd llvmPackages_10.openmp - qtquickcontrols2 qtcharts qtdeclarative + qtquickcontrols2 qtwebengine qtwebview wavpack diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index a1cba439c49..6cc55650220 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -19,18 +19,19 @@ , protobuf , sqlite , taglib -, libpulseaudio ? null -, libselinux ? null -, libsepol ? null -, p11-kit ? null -, util-linux ? null +, libpulseaudio +, libselinux +, libsepol +, p11-kit +, util-linux , qtbase , qtx11extras , qttools , withGstreamer ? true -, gst_all_1 ? null +, glib-networking +, gst_all_1 , withVlc ? true -, libvlc ? null +, libvlc }: mkDerivation rec { @@ -61,20 +62,18 @@ mkDerivation rec { taglib qtbase qtx11extras - ] - ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ libpulseaudio libselinux libsepol p11-kit - ] - ++ lib.optionals withGstreamer (with gst_all_1; [ + ] ++ lib.optionals withGstreamer (with gst_all_1; [ + glib-networking gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly - ]) - ++ lib.optional withVlc libvlc; + ]) ++ lib.optional withVlc libvlc; nativeBuildInputs = [ cmake @@ -85,8 +84,11 @@ mkDerivation rec { util-linux ]; - postInstall = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + postInstall = lib.optionalString withGstreamer '' + qtWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" + ) ''; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix index 5d4c438bce9..c2ea756a06e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix @@ -2,10 +2,10 @@ let pkgs = import ../../../../.. { }; src = pkgs.fetchgit { - url = "https://github.com/ttuegel/emacs2nix.git"; + url = "https://github.com/nix-community/emacs2nix.git"; fetchSubmodules = true; - rev = "860da04ca91cbb69c9b881a54248d16bdaaf9923"; - sha256 = "1r3xmyk9rfgx7ln69dk8mgbnh3awcalm3r1c5ia2shlsrymvv1df"; + rev = "703b144eeb490e87133c777f82e198b4e515c312"; + sha256 = "sha256-YBbRh/Cb8u9+Pn6/Bc0atI6knKVjr8jiTGgFkD2FNGI="; }; in pkgs.mkShell { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix new file mode 100644 index 00000000000..0ab44fccc8e --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -0,0 +1,93 @@ +{ callPackage }: + { + caml = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "caml"; + ename = "caml"; + version = "4.7.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/caml-4.7.1.tar"; + sha256 = "1bv2fscy7zg7r1hyg4rpvh3991vmhy4zid7bv1qbhxa95m9c49j3"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/caml.html"; + license = lib.licenses.free; + }; + }) {}; + markdown-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "markdown-mode"; + ename = "markdown-mode"; + version = "2.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/markdown-mode-2.4.tar"; + sha256 = "002nvc2p7jzznr743znbml3vj8a3kvdd89rlbi28f5ha14g2567z"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/markdown-mode.html"; + license = lib.licenses.free; + }; + }) {}; + org-contrib = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }: + elpaBuild { + pname = "org-contrib"; + ename = "org-contrib"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/org-contrib-0.1.tar"; + sha256 = "07hzywvgj11wd21dw4lbkvqv32da03407f9qynlzgg1qa7wknm2k"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-contrib.html"; + license = lib.licenses.free; + }; + }) {}; + request = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "request"; + ename = "request"; + version = "0.3.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/request-0.3.3.tar"; + sha256 = "168yy902bcjfdaahsbzhzb4wgqbw1mq1lfwdjh66fpzqs75c5q00"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/request.html"; + license = lib.licenses.free; + }; + }) {}; + sly = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "sly"; + ename = "sly"; + version = "1.0.43"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/sly-1.0.43.tar"; + sha256 = "0qgji539qwk7lv9g1k11w0i2nn7n7nk456gwa0bh556mcqz2ndr8"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sly.html"; + license = lib.licenses.free; + }; + }) {}; + tuareg = callPackage ({ caml, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "tuareg"; + ename = "tuareg"; + version = "2.3.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/tuareg-2.3.0.tar"; + sha256 = "0a24q64yk4bbgsvm56j1y68zs9yi25qyl83xydx3ff75sk27f1yb"; + }; + packageRequires = [ caml emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/tuareg.html"; + license = lib.licenses.free; + }; + }) {}; + } diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix new file mode 100644 index 00000000000..c3459448c28 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-packages.nix @@ -0,0 +1,32 @@ +/* + +# Updating + +To update the list of packages from nongnu (ELPA), + +1. Run `./update-nongnu`. +2. Check for evaluation errors: `nix-instantiate ../../../../.. -A emacs.pkgs.nongnuPackages`. +3. Run `git commit -m "org-packages $(date -Idate)" -- nongnu-generated.nix` + +*/ + +{ lib }: + +self: let + + generateNongnu = lib.makeOverridable ({ + generated ? ./nongnu-generated.nix + }: let + + imported = import generated { + inherit (self) callPackage; + }; + + super = imported; + + overrides = { + }; + + in super // overrides); + +in generateNongnu { } diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-nongnu b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu new file mode 100755 index 00000000000..dc43a86efbe --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/update-nongnu @@ -0,0 +1,4 @@ +#! /usr/bin/env nix-shell +#! nix-shell --show-trace ./emacs2nix.nix -i bash + +exec nongnu-packages.sh --names $EMACS2NIX/names.nix -o nongnu-generated.nix diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index 26c6a8cbc70..e8f329ecb0d 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "formatter"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Djaler"; repo = "Formatter"; rev = version; - sha256 = "0da1dvzsvbwg1ys19yf0n080xc0hjwin9zacjndb24jvphy3bxql"; + sha256 = "sha256-8lZ0jUwHuc3Kntz73Btj6dJvkW2bvShu2KWTSQszbJo="; }; patches = [ diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index f281ab5a4cb..7367d18ddf8 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.2.3"; + version = "0.2.6"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "LTwgLG/jUVOSR29LkLJ9q5wpPMK78yFvGtglzMG0ZC0="; + sha256 = "/tpegRGyGPviYpaSbWw7fH9ntvR7vUSD5rmwDMST5+Y="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/misc/mnamer/default.nix b/pkgs/applications/misc/mnamer/default.nix new file mode 100644 index 00000000000..dd634ae7f13 --- /dev/null +++ b/pkgs/applications/misc/mnamer/default.nix @@ -0,0 +1,46 @@ +{ python3Packages, fetchFromGitHub, lib }: + +python3Packages.buildPythonApplication rec { + pname = "mnamer"; + version = "2.5.3"; + + src = fetchFromGitHub { + owner = "jkwill87"; + repo = "mnamer"; + rev = version; + sha256 = "1frrvfhp85fh82yw9yb6n61by8qp1v7f3c0f623njxk1afawhccd"; + }; + + propagatedBuildInputs = with python3Packages; [ + babelfish + requests + appdirs + teletype + requests-cache + guessit + ]; + + patches = [ + # requires specific old versions of dependencies which have been updated in nixpkgs + ./remove_requirements.patch + + # author reads a private property that changed between versions + ./update_hack.patch + ]; + + checkInputs = [ python3Packages.pytestCheckHook ]; + + # disable test that fail (networking, etc) + disabledTests = [ + "network" + "e2e" + "test_utils.py" + ]; + + meta = with lib; { + homepage = "https://github.com/jkwill87/mnamer"; + description = "An intelligent and highly configurable media organization utility"; + license = licenses.mit; + maintainers = with maintainers; [ urlordjames ]; + }; +} diff --git a/pkgs/applications/misc/mnamer/remove_requirements.patch b/pkgs/applications/misc/mnamer/remove_requirements.patch new file mode 100644 index 00000000000..46fc0571ce5 --- /dev/null +++ b/pkgs/applications/misc/mnamer/remove_requirements.patch @@ -0,0 +1,21 @@ +diff --git a/setup.py b/setup.py +index 245c1dd..fdc17ab 100755 +--- a/setup.py ++++ b/setup.py +@@ -7,16 +7,12 @@ from mnamer.__version__ import VERSION + with open("readme.md", "r", encoding="utf8") as fp: + LONG_DESCRIPTION = fp.read() + +-with open("requirements.txt", "r", encoding="utf8") as fp: +- REQUIREMENTS = fp.read().splitlines() +- + setup( + author="Jessy Williams", + author_email="jessy@jessywilliams.com", + description="A media file organiser", + entry_points={"console_scripts": ["mnamer=mnamer.__main__:main"]}, + include_package_data=True, +- install_requires=REQUIREMENTS, + license="MIT", + long_description=LONG_DESCRIPTION, + long_description_content_type="text/markdown", diff --git a/pkgs/applications/misc/mnamer/update_hack.patch b/pkgs/applications/misc/mnamer/update_hack.patch new file mode 100644 index 00000000000..56c83a20a9c --- /dev/null +++ b/pkgs/applications/misc/mnamer/update_hack.patch @@ -0,0 +1,13 @@ +diff --git a/mnamer/utils.py b/mnamer/utils.py +index 636b596..e52bd37 100644 +--- a/mnamer/utils.py ++++ b/mnamer/utils.py +@@ -280,7 +280,7 @@ def request_json( + "like Gecko) Chrome/79.0.3945.88 Safari/537.36" + ) + +- initial_cache_state = session._is_cache_disabled # yes, i'm a bad person ++ initial_cache_state = session._disabled # yes, i'm a bad person + try: + session._is_cache_disabled = not cache + response = session.request( diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix new file mode 100644 index 00000000000..4e6518c6ffd --- /dev/null +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, pkg-config +, cairo +, gobject-introspection +, gtk3 +, gtk-layer-shell +}: + +buildGoModule rec { + pname = "nwg-drawer"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YjMuXSBAgRh6vZUxKHLTqT2lEU/f+AuI/dX4PHfftZg="; + }; + + vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; + + meta = with lib; { + description = "Application drawer for sway Wayland compositor"; + homepage = "https://github.com/nwg-piotr/nwg-drawer"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ plabadens ]; + }; +} diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index e41bc6bd20d..d669b97c44d 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "unstable-2021-07-10"; + version = "unstable-2021-07-14"; src = fetchFromGitHub { owner = "getzola"; repo = pname; # unstable because the latest release fails to build - rev = "8c3ce7d7fbc0d585d4cbf27598ac7dfe5acd96f1"; - sha256 = "sha256-Tw3u96ZPb0yUXvtJ+rna6nnb0a+KfTEiR/PPEadFxDA="; + rev = "312ffcb04c06c5f157b9fd2b944b858703238592"; + sha256 = "0i5zqs1gwxhvsynb540c3azfi4357igr4i5p0bi3h7ras2asas8w"; }; - cargoSha256 = "sha256-mOO39LK7lQ5IxwMgfJpNwX/H5MZ3qKqfeDmnY8zXOx4="; + cargoSha256 = "0g5z0s837cfwzral2zz0avp0xywyaa3l1adxg520qrnga7z0kbh8"; nativeBuildInputs = [ cmake pkg-config installShellFiles]; buildInputs = [ openssl oniguruma ] @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { description = "A fast static site generator with everything built-in"; homepage = "https://www.getzola.org/"; license = licenses.mit; - maintainers = with maintainers; [ dywedir _0x4A6F ]; + maintainers = with maintainers; [ dandellion dywedir _0x4A6F ]; # set because of unstable-* version mainProgram = "zola"; }; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 8da48f8485f..89d07da7482 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.13"; + version = "0.24.14"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-5gMRjnrk1FyTj3Lzp+6scLuqfP8rCUvDDBK33/RzG28="; + sha256 = "sha256-Kw3TT8IeJT0y2vSd38/y7BRq7PxMH2tiXV4/lOn5INA="; }; buildFlagsArray = '' diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 5d3b251089c..1b6bcd6758f 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.6.0-beta.6"; + version = "5.6.0"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-Q1HSAEVcaxFyOq7oWqa6AJJpsBKRxbsKb9ydyK/gH/A="; + sha256 = "sha256-yaAYNQAvbtArw9qAtbTDD11a9nH2OQEPE8QLg1E79Yc="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index 4918a4d91f8..ced0c77a96a 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-07-04"; + version = "unstable-2021-07-17"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "5d3cddc47773b49d4a801d031c1de96c38617908"; - sha256 = "1sah27pvdkilnyj41xf4awri9ya14gxayr99qksllz92ywd9lxad"; + rev = "9e5fe2dc856795d0d3d8b6a3adf3fdd3015d9158"; + sha256 = "12arcrnpacq2fbjbzs6a9yz6lfsj2dkga9chpld1ran3v6by58z9"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/applications/science/misc/toil/default.nix new file mode 100644 index 00000000000..a25fbe7565c --- /dev/null +++ b/pkgs/applications/science/misc/toil/default.nix @@ -0,0 +1,39 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "toil"; + version = "5.4.0"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "73c0648828bd3610c07b7648dd06d6ec27efefdb09473bf01d05d91eb899c9fd"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "docker = " "docker = 'docker' #" \ + --replace "addict = " "addict = 'addict' #" + ''; + + propagatedBuildInputs = with python3Packages; [ + addict + docker + pytz + pyyaml + enlighten + psutil + python-dateutil + dill + ]; + checkInputs = with python3Packages; [ pytestCheckHook ]; + + pytestFlagsArray = [ "src/toil/test" ]; + pythonImportsCheck = [ "toil" ]; + + meta = with lib; { + homepage = "https://toil.ucsc-cgl.org/"; + license = with licenses; [ asl20 ]; + description = "Workflow engine written in pure Python"; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/coreterminal/default.nix b/pkgs/applications/terminal-emulators/coreterminal/default.nix new file mode 100644 index 00000000000..e358fae0716 --- /dev/null +++ b/pkgs/applications/terminal-emulators/coreterminal/default.nix @@ -0,0 +1,42 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, cmake +, ninja +, qtbase +, qtserialport +, qtermwidget +, libcprime +}: + +mkDerivation rec { + pname = "coreterminal"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YXs6VTem3AaK4n1DYwKP/jqNuf09Srn2THHyJJnArlc="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtserialport + qtermwidget + libcprime + ]; + + meta = with lib; { + description = "A terminal emulator from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreterminal"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 3dd241840c7..531d5a547e6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.2.1"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1sw6b1jaddacfm4kvvhgxn743khmsi1c4b4f5mgvm3rabv0h473h"; + sha256 = "0mq6hmb3wvj0ash27h4zyl46l3fikpf0mv3ng330lcy6v7bhy5b8"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/video/kodi-packages/certifi/default.nix b/pkgs/applications/video/kodi-packages/certifi/default.nix index b99a64f3eec..1088f560adf 100644 --- a/pkgs/applications/video/kodi-packages/certifi/default.nix +++ b/pkgs/applications/video/kodi-packages/certifi/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1z49b8va7wdyr714c8ixb2sldi0igffcjj3xpbmga58ph0z985vy"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.certifi"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.certifi"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/chardet/default.nix b/pkgs/applications/video/kodi-packages/chardet/default.nix index cfe3d501cbd..fe482447cfa 100644 --- a/pkgs/applications/video/kodi-packages/chardet/default.nix +++ b/pkgs/applications/video/kodi-packages/chardet/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1jsd165mb1b8jdan2jbjd3y3xa0xam2cxcccmwazkybpa0r6a7dj"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.chardet"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.chardet"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/dateutil/default.nix b/pkgs/applications/video/kodi-packages/dateutil/default.nix index 665858d3d57..54a22cedf90 100644 --- a/pkgs/applications/video/kodi-packages/dateutil/default.nix +++ b/pkgs/applications/video/kodi-packages/dateutil/default.nix @@ -14,8 +14,11 @@ buildKodiAddon rec { six ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.dateutil"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.dateutil"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/idna/default.nix b/pkgs/applications/video/kodi-packages/idna/default.nix index c90f52ffdc9..01f16696fae 100644 --- a/pkgs/applications/video/kodi-packages/idna/default.nix +++ b/pkgs/applications/video/kodi-packages/idna/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "0pm86m8kh2p0brps3xzxcmmabvb4izkglzkj8dsn33br3vlc7cm7"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.idna"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.idna"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix index 4ca45f8b7b9..fcf53e7a169 100644 --- a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "0y4xn3ygwv1kb7gya7iwdga0g9sa89snpnram0wwqzqn8wn2lyb4"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.inputstreamhelper"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.inputstreamhelper"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/kodi-six/default.nix b/pkgs/applications/video/kodi-packages/kodi-six/default.nix index b4f1169b36d..24404ef349e 100644 --- a/pkgs/applications/video/kodi-packages/kodi-six/default.nix +++ b/pkgs/applications/video/kodi-packages/kodi-six/default.nix @@ -10,8 +10,11 @@ buildKodiAddon rec { sha256 = "14m232p9hx925pbk8knsg994m1nbpa5278zmcrnfblh4z84gjv4x"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.kodi-six"; + passthru = { + pythonPath = "libs"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.kodi-six"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/myconnpy/default.nix b/pkgs/applications/video/kodi-packages/myconnpy/default.nix index bd0c98137a5..e39625545f6 100644 --- a/pkgs/applications/video/kodi-packages/myconnpy/default.nix +++ b/pkgs/applications/video/kodi-packages/myconnpy/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1cx3qdzw9lkkmbyvyrmc2i193is20fihn2sfl7kmv43f708vam0k"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.myconnpy"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.myconnpy"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/pdfreader/default.nix b/pkgs/applications/video/kodi-packages/pdfreader/default.nix index 8896a94c9c3..62a5853c796 100644 --- a/pkgs/applications/video/kodi-packages/pdfreader/default.nix +++ b/pkgs/applications/video/kodi-packages/pdfreader/default.nix @@ -11,6 +11,8 @@ buildKodiAddon rec { sha256 = "0nkqhlm1gyagq6xpdgqvd5qxyr2ngpml9smdmzfabc8b972mwjml"; }; + passthru.pythonPath = "lib/api"; + meta = with lib; { homepage = "https://forum.kodi.tv/showthread.php?tid=187421"; description = "A comic book reader"; diff --git a/pkgs/applications/video/kodi-packages/requests/default.nix b/pkgs/applications/video/kodi-packages/requests/default.nix index 0f2d5044f04..c5759fcc325 100644 --- a/pkgs/applications/video/kodi-packages/requests/default.nix +++ b/pkgs/applications/video/kodi-packages/requests/default.nix @@ -16,8 +16,11 @@ buildKodiAddon rec { urllib3 ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.requests"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.requests"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/signals/default.nix b/pkgs/applications/video/kodi-packages/signals/default.nix index bba7b112e9f..b66b1e99a8b 100644 --- a/pkgs/applications/video/kodi-packages/signals/default.nix +++ b/pkgs/applications/video/kodi-packages/signals/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1qcjbakch8hvx02wc01zv014nmzgn6ahc4n2bj5mzr114ppd3hjs"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.signals"; + passthru= { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.signals"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/urllib3/default.nix b/pkgs/applications/video/kodi-packages/urllib3/default.nix index 12d8e60d67b..de0fbb99765 100644 --- a/pkgs/applications/video/kodi-packages/urllib3/default.nix +++ b/pkgs/applications/video/kodi-packages/urllib3/default.nix @@ -9,8 +9,11 @@ buildKodiAddon rec { sha256 = "1d2k6gbsnhdadcl1xc7igz4m71z2fcnpln5ppfjv455cmkk110vf"; }; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.urllib3"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.urllib3"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/websocket/default.nix b/pkgs/applications/video/kodi-packages/websocket/default.nix index 3c83e1f9b00..423dfa73f34 100644 --- a/pkgs/applications/video/kodi-packages/websocket/default.nix +++ b/pkgs/applications/video/kodi-packages/websocket/default.nix @@ -14,8 +14,11 @@ buildKodiAddon rec { six ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.websocket"; + passthru = { + pythonPath = "lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.websocket"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/youtube/default.nix b/pkgs/applications/video/kodi-packages/youtube/default.nix index 65613658e0f..8e57adbfb1a 100644 --- a/pkgs/applications/video/kodi-packages/youtube/default.nix +++ b/pkgs/applications/video/kodi-packages/youtube/default.nix @@ -16,8 +16,11 @@ buildKodiAddon rec { inputstreamhelper ]; - passthru.updateScript = addonUpdateScript { - attrPath = "kodi.packages.youtube"; + passthru = { + pythonPath = "resources/lib"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.youtube"; + }; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi/wrapper.nix b/pkgs/applications/video/kodi/wrapper.nix index 86164682138..7377e638676 100644 --- a/pkgs/applications/video/kodi/wrapper.nix +++ b/pkgs/applications/video/kodi/wrapper.nix @@ -1,8 +1,19 @@ -{ lib, makeWrapper, buildEnv, kodi, addons }: +{ lib, makeWrapper, buildEnv, kodi, addons, callPackage }: let + kodiPackages = callPackage ../../../top-level/kodi-packages.nix { inherit kodi; }; + # linux distros are supposed to provide pillow and pycryptodome - requiredPythonPackages = with kodi.pythonPackages; [ pillow pycryptodome] ++ addons; + requiredPythonPath = with kodi.pythonPackages; makePythonPath ([ pillow pycryptodome ]); + + # each kodi addon can potentially export a python module which should be included in PYTHONPATH + # see any addon which supplies `passthru.pythonPath` and the corresponding entry in the addons `addon.xml` + # eg. `<extension point="xbmc.python.module" library="lib" />` -> pythonPath = "lib"; + additionalPythonPath = + let + addonsWithPythonPath = lib.filter (addon: addon ? pythonPath) addons; + in + lib.concatMapStringsSep ":" (addon: "${addon}${kodiPackages.addonDir}/${addon.namespace}/${addon.pythonPath}") addonsWithPythonPath; in buildEnv { @@ -18,7 +29,7 @@ buildEnv { for exe in kodi{,-standalone} do makeWrapper ${kodi}/bin/$exe $out/bin/$exe \ - --prefix PYTHONPATH : ${kodi.pythonPackages.makePythonPath requiredPythonPackages} \ + --prefix PYTHONPATH : ${requiredPythonPath}:${additionalPythonPath} \ --prefix KODI_HOME : $out/share/kodi \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath (lib.concatMap diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix deleted file mode 100644 index 37f03d8772f..00000000000 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, python2Packages, intltool, libxml2Python }: - -with lib; - -let version = "0.600.4"; in - -stdenv.mkDerivation rec { - pname = "virtinst"; - inherit version; - - src = fetchurl { - url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz"; - sha256 = "175laiy49dni8hzi0cn14bbsdsigvgr9h6d9z2bcvbpa29spldvf"; - }; - - pythonPath = with python2Packages; - [ setuptools eventlet greenlet gflags netaddr carrot routes - PasteDeploy m2crypto ipy twisted - distutils_extra simplejson cheetah lockfile httplib2 - # !!! should libvirt be a build-time dependency? Note that - # libxml2Python is a dependency of libvirt.py. - libvirt libxml2Python urlgrabber - ]; - - buildInputs = - [ python2Packages.python - python2Packages.wrapPython - python2Packages.mox - intltool - ] ++ pythonPath; - - buildPhase = "python setup.py build"; - - installPhase = - '' - python setup.py install --prefix="$out"; - wrapPythonPrograms - ''; - - meta = { - homepage = "http://virt-manager.org"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [qknight]; - description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix index 965b8d8189a..08257ff2542 100644 --- a/pkgs/build-support/emacs/elpa.nix +++ b/pkgs/build-support/emacs/elpa.nix @@ -28,7 +28,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ emacs --batch -Q -l ${./elpa2nix.el} \ -f elpa2nix-install-package \ - "${src}" "$out/share/emacs/site-lisp/elpa" + "$src" "$out/share/emacs/site-lisp/elpa" runHook postInstall ''; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index bf85fd35335..0f19b19b604 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -11,8 +11,8 @@ let major = "11"; minor = "0"; - update = "11"; - build = "9"; + update = "12"; + build = "7"; openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; @@ -22,7 +22,7 @@ let owner = "openjdk"; repo = "jdk${major}u"; rev = "jdk-${version}"; - sha256 = "0jncsj424340xjfwv6sx5hy9sas80qa3ymkx0ng3by3z01y5rgfx"; + sha256 = "0s8g6gj5vhm7hbp05cqaxasjrkwr41fm634qim8q6slklm4pkkli"; }; nativeBuildInputs = [ pkg-config autoconf unzip ]; diff --git a/pkgs/development/compilers/rasm/default.nix b/pkgs/development/compilers/rasm/default.nix index 0feaabc92e6..0f617d0f661 100644 --- a/pkgs/development/compilers/rasm/default.nix +++ b/pkgs/development/compilers/rasm/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.117"; src = fetchurl { - url = "www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip"; + url = "http://www.roudoudou.com/export/cpc/rasm/${pname}_v0117_src.zip"; sha256 = "1hwily4cfays59qm7qd1ax48i7cpbxhs5l9mfpyn7m2lxsfqrl3z"; }; diff --git a/pkgs/development/libraries/libcprime/default.nix b/pkgs/development/libraries/libcprime/default.nix new file mode 100644 index 00000000000..4db6ac1b46b --- /dev/null +++ b/pkgs/development/libraries/libcprime/default.nix @@ -0,0 +1,40 @@ +{ mkDerivation +, lib +, fetchFromGitLab +, libnotify +, cmake +, ninja +, qtbase +, qtconnectivity +}: + +mkDerivation rec { + pname = "libcprime"; + version = "4.2.2"; + + src = fetchFromGitLab { + owner = "cubocore"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtconnectivity + libnotify + ]; + + meta = with lib; { + description = "A library for bookmarking, saving recent activites, managing settings of C-Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/libcprime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index aa42edfeadb..04eca2759a8 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.19"; + version="0.3.20"; name="${baseName}-${version}"; - hash="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8="; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.19/libmwaw-0.3.19.tar.xz"; - sha256="sha256-snLiNO78goxLuDRK8PBHpi4HD1MOni+6EbBMjbjtpa8="; + hash="sha256-FMOLBiFPJ3zNFFDiLm4yZIlVAY12lYlrxWAWV0jIzSE="; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.20/libmwaw-0.3.20.tar.xz"; + sha256="sha256-FMOLBiFPJ3zNFFDiLm4yZIlVAY12lYlrxWAWV0jIzSE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index c676f8f0174..c2a8ae0337a 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tidyp"; version = "1.04"; - src = fetchFromGitHub { - owner = "petdance"; - repo = "tidyp"; - rev = version; - sha256 = "0jslskziwzk4hb6i640fvpnbv2zxrvim6pdx2gwx5wyc64aviskc"; + src = fetchurl { + # downloads from a legacy GitHub download page from ~11 years ago + # project does not work with autoconf anymore and the configure script cannot be generated from the source download + url = "https://github.com/downloads/petdance/tidyp/${pname}-${version}.tar.gz"; + sha256 = "0f5ky0ih4vap9c6j312jn73vn8m2bj69pl2yd3a5nmv35k9zmc10"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index 735cc278deb..5340306de79 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation { propagatedBuildInputs = packages; preferLocalBuild = true; -} // { + # For compatability with XFree86. - buildClientLibs = true; + passthru.buildClientLibs = true; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 7e17928d7dc..e2c4d441417 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -178,6 +178,7 @@ , "np" , "npm" , "npm-check-updates" +, "npm-merge-driver" , {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"} , "ocaml-language-server" , "parcel-bundler" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 1f759991413..79425525bb0 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -310,13 +310,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.14.5" = { + "@babel/cli-7.14.8" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.5.tgz"; - sha512 = "poegjhRvXHWO0EAsnYajwYZuqcz7gyfxwfaecUESxDujrqOivf3zrjFbub8IJkrqEaz3fvJWh001EzxBub54fg=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.14.8.tgz"; + sha512 = "lcy6Lymft9Rpfqmrqdd4oTDdUx9ZwaAhAfywVrHG4771Pa6PPT0danJ1kDHBXYqh4HHSmIdA+nlmfxfxSDPtBg=="; }; }; "@babel/code-frame-7.10.4" = { @@ -364,13 +364,13 @@ let sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/core-7.14.6" = { + "@babel/core-7.14.8" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.14.6.tgz"; - sha512 = "gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz"; + sha512 = "/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q=="; }; }; "@babel/core-7.9.0" = { @@ -382,13 +382,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.14.5" = { + "@babel/generator-7.14.8" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.5.tgz"; - sha512 = "y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz"; + sha512 = "cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg=="; }; }; "@babel/helper-annotate-as-pure-7.14.5" = { @@ -418,13 +418,13 @@ let sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw=="; }; }; - "@babel/helper-create-class-features-plugin-7.14.6" = { + "@babel/helper-create-class-features-plugin-7.14.8" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz"; - sha512 = "Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz"; + sha512 = "bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ=="; }; }; "@babel/helper-create-regexp-features-plugin-7.14.5" = { @@ -499,13 +499,13 @@ let sha512 = "SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ=="; }; }; - "@babel/helper-module-transforms-7.14.5" = { + "@babel/helper-module-transforms-7.14.8" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz"; - sha512 = "iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz"; + sha512 = "RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA=="; }; }; "@babel/helper-optimise-call-expression-7.14.5" = { @@ -553,13 +553,13 @@ let sha512 = "3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow=="; }; }; - "@babel/helper-simple-access-7.14.5" = { + "@babel/helper-simple-access-7.14.8" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz"; - sha512 = "nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz"; + sha512 = "TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.14.5" = { @@ -580,13 +580,13 @@ let sha512 = "hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA=="; }; }; - "@babel/helper-validator-identifier-7.14.5" = { + "@babel/helper-validator-identifier-7.14.8" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz"; - sha512 = "5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz"; + sha512 = "ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow=="; }; }; "@babel/helper-validator-option-7.14.5" = { @@ -607,13 +607,13 @@ let sha512 = "YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ=="; }; }; - "@babel/helpers-7.14.6" = { + "@babel/helpers-7.14.8" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.6.tgz"; - sha512 = "yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz"; + sha512 = "ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw=="; }; }; "@babel/highlight-7.14.5" = { @@ -634,13 +634,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.14.7" = { + "@babel/parser-7.14.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.7.tgz"; - sha512 = "X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz"; + sha512 = "syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = { @@ -1399,13 +1399,13 @@ let sha512 = "9PMijx8zFbCwTHrd2P4PJR5nWGH3zWebx2OcpTjqQrHhCiL2ssSR2Sc9ko2BsI2VmVBfoaQmPrlMTCui4LmXQg=="; }; }; - "@babel/preset-env-7.14.7" = { + "@babel/preset-env-7.14.8" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.7.tgz"; - sha512 = "itOGqCKLsSUl0Y+1nSfhbuuOlTs0MJk2Iv7iSH+XT/mR8U1zRLO7NjWlYXB47yhK4J/7j+HYty/EhFZDYKa/VA=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.8.tgz"; + sha512 = "a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg=="; }; }; "@babel/preset-flow-7.14.5" = { @@ -1489,13 +1489,13 @@ let sha512 = "aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA=="; }; }; - "@babel/runtime-7.14.6" = { + "@babel/runtime-7.14.8" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.14.6"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.6.tgz"; - sha512 = "/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz"; + sha512 = "twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg=="; }; }; "@babel/runtime-7.9.0" = { @@ -1507,22 +1507,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.14.7" = { + "@babel/runtime-corejs3-7.14.8" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.7.tgz"; - sha512 = "Wvzcw4mBYbTagyBVZpAJWI06auSIj033T/yNE0Zn1xcup83MieCddZA7ls3kme17L4NOGBrQ09Q+nKB41RLWBA=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz"; + sha512 = "4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w=="; }; }; - "@babel/standalone-7.14.7" = { + "@babel/standalone-7.14.8" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.7.tgz"; - sha512 = "7RlfMPR4604SbYpj5zvs2ZK587hVhixgU9Pd9Vs8lB8KYtT3U0apXSf0vZXhy8XRh549eUmJOHXhWKTO3ObzOQ=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.14.8.tgz"; + sha512 = "5Aa1Bhis4oZD23iLJE5CDYHEs1zSC3ejppHE5aim0OWjGCWTa9Oq1PwopK4u1++ao6B6POW/PqNZjOCZNTSx0Q=="; }; }; "@babel/template-7.14.5" = { @@ -1534,13 +1534,13 @@ let sha512 = "6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g=="; }; }; - "@babel/traverse-7.14.7" = { + "@babel/traverse-7.14.8" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.14.7"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.7.tgz"; - sha512 = "9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz"; + sha512 = "kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg=="; }; }; "@babel/types-7.13.12" = { @@ -1552,13 +1552,13 @@ let sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; }; }; - "@babel/types-7.14.5" = { + "@babel/types-7.14.8" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.14.5"; + version = "7.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.14.5.tgz"; - sha512 = "M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz"; + sha512 = "iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -2497,13 +2497,13 @@ let sha512 = "d4VSA86eL/AFTe5xtyZX+ePUjE8dIFu2T8zmdeNBSa5/kNgXPCx/o/wbFNHAGLJdGnk1vddRuMESD9HbOC8irw=="; }; }; - "@google-cloud/pubsub-2.16.0" = { + "@google-cloud/pubsub-2.16.1" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.16.0"; + version = "2.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.0.tgz"; - sha512 = "1cZveyznm9qHXzRqlbS3GLeDiaFp8JVN6Urkrt5hgJGWP/IY9kxuJ0ZCnCeZE4x9O/+a5hWgKaQtBKseJYw//Q=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.16.1.tgz"; + sha512 = "+uO7r9uRfD/x0BzBI67clbIu0VIdqYLZ5NINuGEsMiAXIGWQWmceuLMixMEb/JOxeaqKygH1mL2rshkDisUmGg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -4171,13 +4171,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-15.11.5" = { + "@netlify/build-16.0.1" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "15.11.5"; + version = "16.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-15.11.5.tgz"; - sha512 = "qsL1bvVAa5ZPIkYxo1Z4vdOcq8sDxQhyKjDqPAEasLqfX3ZTABctze3WdD6WmpyR9wzQEJLpCy1s3ncTDeiU0w=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-16.0.1.tgz"; + sha512 = "DRuFNlK309541EbnY4xHBXrYTgn4K59IpzbE9+ACCuOOav0lJHrVXTeZCzl2dAg/dvEp0/9YwDncmyjr4uKqWQ=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -4189,13 +4189,13 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-12.6.0" = { + "@netlify/config-13.0.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "12.6.0"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-12.6.0.tgz"; - sha512 = "L+ZmoGsO2Gql+T6+147G7ZctcXgViuh8Q1ReADICM4xdaYVmipRFC+ICU4iJ8I9UQnc0M7qM0ZHzKuhTdPJfiA=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-13.0.0.tgz"; + sha512 = "d7NNG3lbvZN/w9eCRdlFKBY21Vpjxlwis08v5NJjkZpNTuuAuemNFrhZv2y5zmy33TM+zTrkaoEAk6vJ96R5cQ=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4261,13 +4261,13 @@ let sha512 = "Z2RNrNhO7fsNFmpUQ+eNawgtfHwbGH/4Hji2g+GCRYL7W60kgK5rsWxveky1Nrye45I2OQn/4ZGapKqB1IqTaw=="; }; }; - "@netlify/routing-local-proxy-0.30.2" = { + "@netlify/routing-local-proxy-0.31.0" = { name = "_at_netlify_slash_routing-local-proxy"; packageName = "@netlify/routing-local-proxy"; - version = "0.30.2"; + version = "0.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.2.tgz"; - sha512 = "rQnv383/vFF1x3iKnY/2Q2i7Z7RhugfoVfAIbEJ2bIaWFMQ2YcGMVpwj1w8rK+4MGH5uwvlNNlfE0gGYQOq+4Q=="; + url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.31.0.tgz"; + sha512 = "SSlWic9za/0QtfCP7GllJcOV98BWlx2goOF9bLLhmsHGiPfrhlhZfemqdMtKM4BIs+G70wzUqaIYeyjtxVh37A=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -4639,13 +4639,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-8.3.0" = { + "@octokit/openapi-types-9.0.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "8.3.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-8.3.0.tgz"; - sha512 = "ZFyQ30tNpoATI7o+Z9MWFUzUgWisB8yduhcky7S4UYsRijgIGSnwUKzPBDGzf/Xkx1DuvUtqzvmuFlDSqPJqmQ=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.0.0.tgz"; + sha512 = "GSpv5VUFqarOXZl6uWPsDnjChkKCxnaMALmQhzvCWGiMxONQxX7ZwlomCMS+wB1KqxLPCA5n6gYt016oEMkHmQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4675,13 +4675,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.4.1" = { + "@octokit/plugin-rest-endpoint-methods-5.4.2" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.4.1.tgz"; - sha512 = "Nx0g7I5ayAYghsLJP4Q1Ch2W9jYYM0FlWWWZocUro8rNxVwuZXGfFd7Rcqi9XDWepSXjg1WByiNJnZza2hIOvQ=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.4.2.tgz"; + sha512 = "imNDDvUMy9YzECcP6zTcKNjwutSwqCYGMZjLPnBHF0kdb3V9URrHWmalD0ZvNEYjwbpm2zw8RPewj3ebCpMBRw=="; }; }; "@octokit/request-5.6.0" = { @@ -4702,22 +4702,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.6.7" = { + "@octokit/rest-18.6.8" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.6.7"; + version = "18.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.7.tgz"; - sha512 = "Kn6WrI2ZvmAztdx+HEaf88RuJn+LK72S8g6OpciE4kbZddAN84fu4fiPGxcEu052WmqKVnA/cnQsbNlrYC6rqQ=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.8.tgz"; + sha512 = "n2aT0mJL9N/idCPmnBynCino1qNScfRHvr8OeskQdBNhUYAMc7cxoc8KLlv1DMWxlZUNhed+5kVdu7majVdVag=="; }; }; - "@octokit/types-6.19.0" = { + "@octokit/types-6.19.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.19.0"; + version = "6.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.19.0.tgz"; - sha512 = "9wdZFiJfonDyU6DjIgDHxAIn92vdSUBOwAXbO2F9rOFt6DJwuAkyGLu1CvdJPphCbPBoV9iSDMX7y4fu0v6AtA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.19.1.tgz"; + sha512 = "hMI2EokQzMG8ABWcnvcrabqQFuFHqUdN0HUOG4DPTaOtnf/jqhzhK1SHOGu5vDlI/x+hWJ60e28VxB7QhOP0CQ=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -5476,13 +5476,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.13.4" = { + "@serverless/components-3.14.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.13.4"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.13.4.tgz"; - sha512 = "Qv0hDwj5dG2WaCnVvfzZ4LggMWPfONVtCUWIM7LbCGwVq+K3nnkdql1nJqrfCMkqc3rz2hjxck35ckOPxDiVRQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.14.0.tgz"; + sha512 = "Ssuu+OcyWvisGIMZD4Lr9Uj20Ndgb9a8Z/Jw4VbhFS+grc89uK7vZR3pS9I4LTfTUKH4HUbMJXxDndNEFGgLAA=="; }; }; "@serverless/core-1.1.2" = { @@ -5557,13 +5557,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.4.0" = { + "@serverless/utils-5.5.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.4.0.tgz"; - sha512 = "abEYhQ8Bgh48w/8uzvv8hlfOXsbkvTns3vuMU4THpb0nhbhqL7Y4AWf6z4wJFxcMd0yffkgUQWwSzYHwGJp3kA=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.5.0.tgz"; + sha512 = "cn1eoSla6/hbytPgwh3tiUCeBjVBHt3nKgFwYtF0Aj3B1V+qaBMLOcXmXop+WHhWUil8rP4R9HJ4buR5BgLYWw=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -7213,6 +7213,15 @@ let sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; }; }; + "@types/node-16.4.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.4.0.tgz"; + sha512 = "HrJuE7Mlqcjj+00JqMWpZ3tY8w7EUd+S0U3L1+PQSWiXZbOgyQDvi+ogoUxaHApPJq5diKxYBQwA3iIlNcPqOg=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -11254,13 +11263,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.949.0" = { + "aws-sdk-2.950.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.949.0"; + version = "2.950.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.949.0.tgz"; - sha512 = "n9vqtsLPmSvJcvYvBLBbI1n4GZokwc/5zgHZD7VxdioLNXo1nHQ3VUi4MiW+3kIN40NUNf+Gc5vpc82yNYCvsw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.950.0.tgz"; + sha512 = "iFC5fKLuFLEV27xeKmxDHDZzIDj4upm5+Ts3NpYYRbwPlOG0nE0gZzf9fRYkLkLgTr0TQq26CbKorgeo+6ailw=="; }; }; "aws-sign2-0.6.0" = { @@ -14674,13 +14683,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001245" = { + "caniuse-lite-1.0.30001246" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001245"; + version = "1.0.30001246"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz"; - sha512 = "768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001246.tgz"; + sha512 = "Tc+ff0Co/nFNbLOrziBXmMVtpt9S2c2Y+Z9Nk9Khj09J+0zR9ejvIW5qkZAErCbOrVODCx/MN+GpB5FNBs5GFA=="; }; }; "canvas-2.8.0" = { @@ -17365,13 +17374,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.98" = { + "constructs-3.3.99" = { name = "constructs"; packageName = "constructs"; - version = "3.3.98"; + version = "3.3.99"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.98.tgz"; - sha512 = "VvDuJMqDUb16jB4EsCHthVb74yJcnD/5XWkybYgK5Ieee5o54eyxEzM9jFbZEasysPX4zR05Z/ygEzdlj+QZPg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.99.tgz"; + sha512 = "uX3bZtp6Zn53Utyurp4DrKolIDUuiDddHVTgsQ39KhVRkQ8TRMtl0nyXllysMtu78t8zLo9QygeyQ0QOBy3LHw=="; }; }; "consume-http-header-1.0.0" = { @@ -18140,13 +18149,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.9.0" = { + "create-gatsby-1.10.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.9.0.tgz"; - sha512 = "KYQnXV2uaZCUt3y4Kkh4hlBGg4LYc6XCEdp99CEfMKOCu34rte5+6c1EZRpphATLqdKIitdFlPp5dJm3knBeMA=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.10.0.tgz"; + sha512 = "EiN8bJepWMN4itheoQ9ul1jNrSWoWy5Cw+kAfF1sN0J7ZWtuYCFfRZX97VRTt6C7bvlHkTw7gew2pUbFS8La+Q=="; }; }; "create-graphback-1.0.1" = { @@ -21857,13 +21866,13 @@ let sha512 = "07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g=="; }; }; - "duplexify-4.1.1" = { + "duplexify-4.1.2" = { name = "duplexify"; packageName = "duplexify"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz"; - sha512 = "DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA=="; + url = "https://registry.npmjs.org/duplexify/-/duplexify-4.1.2.tgz"; + sha512 = "fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw=="; }; }; "duration-0.2.2" = { @@ -22055,13 +22064,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.780" = { + "electron-to-chromium-1.3.782" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.780"; + version = "1.3.782"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.780.tgz"; - sha512 = "2KQ9OYm9WMUNpAPA/4aerURl3hwRc9tNlpsiEj3Y8Gf7LVf26NzyLIX2v0hSagQwrS9+cWab+28A2GPKDoVNRA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.782.tgz"; + sha512 = "6AI2se1NqWA1SBf/tlD6tQD/6ZOt+yAhqmrTlh4XZw4/g0Mt3p6JhTQPZxRPxPZiOg0o7ss1EBP/CpYejfnoIA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -25000,13 +25009,13 @@ let sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; - "file-type-16.5.1" = { + "file-type-16.5.2" = { name = "file-type"; packageName = "file-type"; - version = "16.5.1"; + version = "16.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-16.5.1.tgz"; - sha512 = "Pi1G43smrCy82Q3be3sfKaeS5uHdfj905dP88YqhroG6TYbVY2ljTdDXeXqa6Cn5nOk6znOjWM2uZptA8vH/qQ=="; + url = "https://registry.npmjs.org/file-type/-/file-type-16.5.2.tgz"; + sha512 = "lnHRZj2USLF3v4C5ZY7/vQQeoTVA1YV9TtD6UUCr9z5Cd0uyutqxPBJxkXzM6lufPNuSfefq/yFmnSPz0C3wNw=="; }; }; "file-type-3.9.0" = { @@ -26602,31 +26611,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.9.0" = { + "gatsby-core-utils-2.10.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.9.0.tgz"; - sha512 = "LKmkk4B/VnSEYKR9W/C8Lp9lwk/l/qY5jbsoiChc43F67VM667gITWH0noSUdcGzbEsN8xi0Wuc8dMA6BvKkvg=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.10.0.tgz"; + sha512 = "xvVebKSrjHkZQQkeEjuAekCAg17KT2l44d/yn7w2dzBGay244m8hoY8LRtLRdsrSp30ix89QklefuP9frEfhbA=="; }; }; - "gatsby-recipes-0.20.0" = { + "gatsby-recipes-0.21.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.20.0"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.20.0.tgz"; - sha512 = "GsQOovAFImV3MtZVTTjv6utMRRo5QDC1+7l3Je3kqHz425J7UcmjMH/ZzHdzIZ1hO2/RUgGoFXAbWgqhipJp2g=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.21.0.tgz"; + sha512 = "oo9ci5G6TiXc5wVnRrTfJhX92ZsjICVa0ldX7aQ/8JR77HelfO3MFfQuIkswla+o0MGcbyxgVoLX45kgzY7aaA=="; }; }; - "gatsby-telemetry-2.9.0" = { + "gatsby-telemetry-2.10.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.9.0.tgz"; - sha512 = "Ji40by9qHm9Zz2vKIBACT77awt0FpqKES9uT9nLmaqyiOZ/7Hs1dKwMrZ2yCkHNBh6S9RplcgfUQLq2LE4oeaA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.10.0.tgz"; + sha512 = "uon+KRo6NQqkc6Qk/QTw+RmaxIjFFIK7cSU8XXE3y353il2Tk04Kxct2hMHn8Zdl4TYyKla1T5UIvVV/EfpBcg=="; }; }; "gauge-1.2.7" = { @@ -33435,13 +33444,13 @@ let sha512 = "Heu6D+yI5mmUklLQdX3PdDvHUQm14618Fj4PQM9seKa4cohxzJ7EHopfRObKYHMko9awopx4Qr7Gtu6u/QPqfw=="; }; }; - "jsii-srcmak-0.1.301" = { + "jsii-srcmak-0.1.302" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.301"; + version = "0.1.302"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.301.tgz"; - sha512 = "RmUimAPVkk1QflCGjJVUsQsv+W+lD6yZMLpHEHkNEdUvlYSUkZIM2VXjF7LUw7HnS9gFFBftUd6W02OVGbd9Bg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.302.tgz"; + sha512 = "UsXZ6LGLqP/nUNyq0ey3xOLpNDpkye5HeNAnJCVqw4vsT9o5EX7MHv9ca/JDlt7fWn+cUdo/Bcj5UZJvg+Chfg=="; }; }; "json-bigint-0.2.3" = { @@ -33750,13 +33759,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.270" = { + "json2jsii-0.1.272" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.270"; + version = "0.1.272"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.270.tgz"; - sha512 = "blBOb7+GDWTLv6jxye684joWzQyuFM6HT+NsPQPuASkT7pABBt3Xx2wsVm/qMJeg7ITufgSfeh1TnNrFROicMg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.272.tgz"; + sha512 = "OUZqjQhnRalQmQx3kFM3mG5DQcfEYzmUYBWGdb6QwGLuvwB/eJ2PhXuLEkGF+PhRwOrW5IyEcF8U+O39mh3G5Q=="; }; }; "json3-3.2.6" = { @@ -35101,13 +35110,13 @@ let sha512 = "yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw=="; }; }; - "lighthouse-logger-1.2.0" = { + "lighthouse-logger-1.3.0" = { name = "lighthouse-logger"; packageName = "lighthouse-logger"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.2.0.tgz"; - sha512 = "wzUvdIeJZhRsG6gpZfmSCfysaxNEr43i+QT+Hie94wvHDKFLi4n7C2GqZ4sTC+PH5b5iktmXJvU87rWvhP3lHw=="; + url = "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.3.0.tgz"; + sha512 = "BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA=="; }; }; "lightning-3.3.12" = { @@ -35137,6 +35146,15 @@ let sha512 = "z/bfkDEAKyN0HtN7rkiyVlDA3J5L/jxXsE4YuGfQPa8TyPWovyLdo6/aHP0mMy8n+G4tq0g2oKZ/1Z5ONJAVqA=="; }; }; + "lightning-3.4.0" = { + name = "lightning"; + packageName = "lightning"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-3.4.0.tgz"; + sha512 = "lD6PgHipqedfFcTEf/9mDF3s4KGO/lecr02W6zHBJHohNphuBUZS1z68kKRJAl3N4iHmDEfLxt+G86PBP0jhHw=="; + }; + }; "lilconfig-2.0.3" = { name = "lilconfig"; packageName = "lilconfig"; @@ -35281,6 +35299,15 @@ let sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA=="; }; }; + "ln-service-51.10.0" = { + name = "ln-service"; + packageName = "ln-service"; + version = "51.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.10.0.tgz"; + sha512 = "k6wGBB6RfyHhMY296MsHhZrVuJSqNsqx3nF3WM5lkKAg+58OdU6bLzqVttpit9uHamc6tssD2GDxNS6gdUzOYQ=="; + }; + }; "ln-service-51.8.2" = { name = "ln-service"; packageName = "ln-service"; @@ -35317,6 +35344,15 @@ let sha512 = "FMfcEISlboFVz+wLTAJ+FnEIQkoMR7IHcUg4l5JNwsU/UOijM1vTQDFhHVqg5fEQAFboZe3lNd7Rh1uxxqs47Q=="; }; }; + "ln-sync-0.4.7" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "0.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-0.4.7.tgz"; + sha512 = "2yqc59OhK0affnkwhgw7iY4x2tKZTb8y8KSWxRHn6cSXL3clUJgXdTNOGr4Jp8j1TkTl0iRVnLSNZlRbtU4vVA=="; + }; + }; "ln-telegram-3.2.9" = { name = "ln-telegram"; packageName = "ln-telegram"; @@ -45265,6 +45301,15 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; + "peek-readable-3.1.4" = { + name = "peek-readable"; + packageName = "peek-readable"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.4.tgz"; + sha512 = "DX7ec7frSMtCWw+zMd27f66hcxIz/w9LQTY2RflB4WNHCVPAye1pJiP2t3gvaaOhu7IOhtPbHw8MemMj+F5lrg=="; + }; + }; "peek-readable-4.0.0" = { name = "peek-readable"; packageName = "peek-readable"; @@ -51584,13 +51629,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.53.2" = { + "rollup-2.53.3" = { name = "rollup"; packageName = "rollup"; - version = "2.53.2"; + version = "2.53.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz"; - sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz"; + sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -55202,13 +55247,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.21" = { + "sscaff-1.2.22" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.21"; + version = "1.2.22"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.21.tgz"; - sha512 = "X9Ei1liwS+LljdRsWz/QbgYK2sByLbDpvLTwVlL8+fGSz9Oh1D85WU3TR8kCCuPKLvfdGWIRimSQWvJ8zh5riw=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.22.tgz"; + sha512 = "aEkcIR+UIro2xsDASNy/K0v7hxGi18jgFshHpGrJ/tfB0GlQHQJR0W9y23mNxfDmFg/lbTaR0BdEsgC0znNEGA=="; }; }; "ssh-config-1.1.6" = { @@ -56480,6 +56525,15 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; + "strtok3-6.1.3" = { + name = "strtok3"; + packageName = "strtok3"; + version = "6.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.3.tgz"; + sha512 = "ssWSKFOeUTurMSucgyUf+a6Z9mVTYrsYiyEK5RLnh8BM6sFrKSljVlnjZXIDxMguYfdQI+mUPFHo88FYTxq1XA=="; + }; + }; "strtok3-6.2.2" = { name = "strtok3"; packageName = "strtok3"; @@ -58623,6 +58677,15 @@ let sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; + "token-types-3.1.0" = { + name = "token-types"; + packageName = "token-types"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/token-types/-/token-types-3.1.0.tgz"; + sha512 = "WhoeIW7UTn7NC7L0t/4x3vU/YYSS1oeUxYgiGXQLd82Kaf1qtlxOex3ETY0+o2QuRgAdyursMlUhQBKDCfMUkQ=="; + }; + }; "toml-2.3.6" = { name = "toml"; packageName = "toml"; @@ -66429,7 +66492,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -66743,7 +66806,7 @@ in sources."pump-3.0.0" (sources."pumpify-2.0.1" // { dependencies = [ - sources."duplexify-4.1.1" + sources."duplexify-4.1.2" sources."readable-stream-3.6.0" ]; }) @@ -66934,7 +66997,7 @@ in ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -66959,7 +67022,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.49" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -66998,7 +67061,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -67025,7 +67088,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -67273,12 +67336,12 @@ in sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.14.5" @@ -67287,20 +67350,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -67367,7 +67430,7 @@ in sources."@babel/plugin-transform-typescript-7.14.6" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.7" + sources."@babel/preset-env-7.14.8" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.14.5" @@ -67378,10 +67441,10 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -67434,7 +67497,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -67577,7 +67640,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -67705,7 +67768,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -68598,12 +68661,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/generator-7.14.8" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/types-7.14.5" + sources."@babel/types-7.14.8" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -68679,12 +68742,12 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -68695,19 +68758,19 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -68715,7 +68778,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -68726,7 +68789,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -68820,7 +68883,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -68855,9 +68918,9 @@ in }; dependencies = [ sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."colorette-1.2.2" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."escalade-3.1.1" sources."fraction.js-4.1.1" sources."node-releases-1.1.73" @@ -68884,14 +68947,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.949.0" // { + (sources."aws-sdk-2.950.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -69095,10 +69158,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.7.0"; + version = "10.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.0.tgz"; - sha512 = "rJ29qKw5UMS5WM9hdur696oXNiuszSJLhYKMBQuHDuwITeuwNk9GYhXyXRVFFOKVNetjsP/HruSU6tZ3jBq4kQ=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.1.tgz"; + sha512 = "V3LVbkFNTiy+ctpvCDgEgP8e0myUC/Iupm8D9URkS76SFYibAoMX3elcLVtsOXXqM4QyRrg29iGZj+HB+sQCHg=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -69111,7 +69174,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -69478,32 +69541,60 @@ in sources."ws-7.5.0" ]; }) - (sources."ln-service-51.9.0" // { + (sources."ln-service-51.10.0" // { dependencies = [ - sources."@grpc/grpc-js-1.3.5" + sources."@grpc/grpc-js-1.3.6" sources."@grpc/proto-loader-0.6.4" sources."@types/express-4.17.13" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/request-2.48.6" - sources."@types/ws-7.4.6" + sources."@types/ws-7.4.7" sources."bn.js-5.2.0" sources."form-data-2.5.1" - sources."lightning-3.3.16" + sources."lightning-3.4.0" sources."ws-7.5.3" ]; }) - (sources."ln-sync-0.4.6" // { + (sources."ln-sync-0.4.7" // { dependencies = [ - sources."@grpc/grpc-js-1.3.4" - sources."@grpc/proto-loader-0.6.3" - sources."@types/node-15.12.5" - sources."@types/ws-7.4.5" + sources."@grpc/grpc-js-1.3.6" + sources."@grpc/proto-loader-0.6.4" + sources."@types/express-4.17.13" + sources."@types/node-16.3.3" + sources."@types/request-2.48.6" + sources."@types/ws-7.4.7" + sources."bn.js-5.2.0" + sources."form-data-2.5.1" + sources."lightning-3.4.0" + ]; + }) + (sources."ln-telegram-3.2.9" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.5" + sources."@grpc/proto-loader-0.6.4" + sources."@types/express-4.17.13" + sources."@types/node-16.3.2" + sources."@types/request-2.48.6" + sources."@types/ws-7.4.6" sources."bn.js-5.2.0" sources."cbor-7.0.5" - sources."lightning-3.3.12" + sources."form-data-2.5.1" + sources."lightning-3.3.16" + sources."ln-service-51.9.0" + (sources."ln-sync-0.4.6" // { + dependencies = [ + sources."@grpc/grpc-js-1.3.4" + sources."@grpc/proto-loader-0.6.3" + sources."@types/express-4.17.12" + sources."@types/node-15.12.5" + sources."@types/request-2.48.5" + sources."@types/ws-7.4.5" + sources."lightning-3.3.12" + ]; + }) + sources."ws-7.5.3" ]; }) - sources."ln-telegram-3.2.9" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -69626,7 +69717,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" ]; }) sources."proxy-addr-2.0.7" @@ -70344,10 +70435,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/parser-7.14.8" + sources."@babel/types-7.14.8" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" @@ -70806,7 +70897,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -71240,7 +71331,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.98" + sources."constructs-3.3.99" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -71313,13 +71404,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.301" // { + (sources."jsii-srcmak-0.1.302" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.270" + sources."json2jsii-0.1.272" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -71355,7 +71446,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.21" + sources."sscaff-1.2.22" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -71470,7 +71561,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" - sources."constructs-3.3.98" + sources."constructs-3.3.99" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -71589,7 +71680,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.301" // { + (sources."jsii-srcmak-0.1.302" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -71672,7 +71763,7 @@ in sources."slice-ansi-3.0.0" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.21" + sources."sscaff-1.2.22" sources."stack-utils-2.0.3" sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { @@ -72147,10 +72238,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.3.tgz"; - sha512 = "St4Vg5DSHaBW0zqXoSKlKL0KJiASSGMIKDUX2zp/l8ImJd6YI5+SoEwYjCxA2c5x01hZ7k3prXDdfgpKp304RA=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.4.tgz"; + sha512 = "6/dloBU+OuRHO/YxX/vWYEFykCQSyN+ASTiwIw0O/l5CyDh9E967sLtodN9uH/MAyExOYfl5i65zI20CMZ6zDQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -72473,7 +72564,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -72552,7 +72643,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -72650,7 +72741,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -73607,31 +73698,31 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -73661,7 +73752,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -73699,7 +73790,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -73986,7 +74077,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -74101,7 +74192,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -75159,14 +75250,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -75537,7 +75628,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -76852,7 +76943,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -77447,12 +77538,12 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { dependencies = [ @@ -77464,17 +77555,17 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -77482,15 +77573,15 @@ in sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.5" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -77525,7 +77616,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -77562,7 +77653,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -77805,7 +77896,7 @@ in src = ../../applications/video/epgstation; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -79507,7 +79598,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -79668,7 +79759,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -79856,7 +79947,7 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -79864,7 +79955,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -79877,24 +79968,24 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.14.5" @@ -79976,10 +80067,10 @@ in }) sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.17" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" sources."@expo/config-5.0.5" @@ -80399,7 +80490,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -80668,7 +80759,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -81741,7 +81832,7 @@ in ]; }) sources."ripemd160-2.0.2" - sources."rollup-2.53.2" + sources."rollup-2.53.3" (sources."rollup-plugin-terser-7.0.2" // { dependencies = [ sources."commander-2.20.3" @@ -82274,7 +82365,7 @@ in sources."workbox-broadcast-update-6.1.5" (sources."workbox-build-6.1.5" // { dependencies = [ - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -82390,8 +82481,8 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" @@ -82399,17 +82490,17 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-object-rest-spread-7.14.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -82417,10 +82508,10 @@ in sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.5" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -82447,7 +82538,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -82472,7 +82563,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -82664,17 +82755,17 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" (sources."@heroku-cli/color-1.1.14" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -83292,7 +83383,7 @@ in sources."@google-cloud/precise-date-2.0.3" sources."@google-cloud/projectify-2.1.0" sources."@google-cloud/promisify-2.0.3" - (sources."@google-cloud/pubsub-2.16.0" // { + (sources."@google-cloud/pubsub-2.16.1" // { dependencies = [ sources."google-auth-library-7.3.0" ]; @@ -83326,7 +83417,7 @@ in sources."@types/json-schema-7.0.8" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -83542,7 +83633,7 @@ in ]; }) sources."duplexer3-0.1.4" - sources."duplexify-4.1.1" + sources."duplexify-4.1.2" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" @@ -84252,7 +84343,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -84432,7 +84523,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -85119,10 +85210,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.9.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.9.0.tgz"; - sha512 = "mfd+e5dNzQ8CkjggrYw3PkQwizJmK1+hR6VWmstDkc5+h1c6xFFNFfauexllDFi8H1SMokAEV4TQRDYDilpByw=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.10.0.tgz"; + sha512 = "RgHTA2qdxhdUugoi+S6BCv6LFDYxuV7P8QfbG0QRmmIAybtmpgfse6oLspWgtXwR4liRDZh/hRgwVA4y48JmlA=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -85132,13 +85223,13 @@ in }) sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -85154,22 +85245,22 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" @@ -85177,11 +85268,11 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-transform-parameters-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.5" - sources."@babel/runtime-7.14.6" - sources."@babel/standalone-7.14.7" + sources."@babel/runtime-7.14.8" + sources."@babel/standalone-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" sources."@hapi/address-2.1.4" @@ -85217,7 +85308,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/node-fetch-2.5.11" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -85284,7 +85375,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -85345,7 +85436,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.9.0" + sources."create-gatsby-1.10.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -85380,7 +85471,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -85392,13 +85483,12 @@ in sources."escape-string-regexp-1.0.5" sources."estree-util-is-identifier-name-1.1.0" sources."etag-1.8.1" - (sources."execa-3.4.0" // { + (sources."execa-5.1.1" // { dependencies = [ sources."cross-spawn-7.0.3" - sources."get-stream-5.2.0" + sources."get-stream-6.0.1" sources."is-stream-2.0.0" sources."npm-run-path-4.0.1" - sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -85433,7 +85523,7 @@ in }) sources."fast-copy-2.1.1" sources."figures-3.2.0" - sources."file-type-16.5.1" + sources."file-type-16.5.2" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" (sources."finalhandler-1.1.2" // { @@ -85452,22 +85542,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.9.0" - (sources."gatsby-recipes-0.20.0" // { + sources."gatsby-core-utils-2.10.0" + (sources."gatsby-recipes-0.21.0" // { dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-4.1.0" - sources."get-stream-5.2.0" - sources."is-stream-2.0.0" - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" sources."strip-ansi-6.0.0" - sources."which-2.0.2" ]; }) - sources."gatsby-telemetry-2.9.0" + sources."gatsby-telemetry-2.10.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" @@ -85498,7 +85579,7 @@ in sources."inherits-2.0.3" ]; }) - sources."human-signals-1.1.1" + sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."import-lazy-2.1.0" @@ -85661,7 +85742,7 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" - sources."peek-readable-4.0.0" + sources."peek-readable-3.1.4" sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" @@ -85791,7 +85872,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.2.2" + sources."strtok3-6.1.3" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" @@ -85801,7 +85882,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."token-types-2.1.1" + sources."token-types-3.1.0" sources."trim-0.0.1" sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" @@ -86156,7 +86237,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86513,7 +86594,7 @@ in dependencies = [ sources."@ardatan/aggregate-error-0.0.6" sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86607,7 +86688,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -89693,7 +89774,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.949.0" // { + (sources."aws-sdk-2.950.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -90410,7 +90491,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -91717,7 +91798,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -92739,7 +92820,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -92861,19 +92942,19 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-8.3.0" + sources."@octokit/openapi-types-9.0.0" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.4.1" + sources."@octokit/plugin-rest-endpoint-methods-5.4.2" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.7" - sources."@octokit/types-6.19.0" + sources."@octokit/rest-18.6.8" + sources."@octokit/types-6.19.1" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -94404,12 +94485,12 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" sources."@babel/helper-compilation-targets-7.14.5" - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" sources."@babel/helper-define-polyfill-provider-0.2.3" sources."@babel/helper-explode-assignable-expression-7.14.5" @@ -94418,24 +94499,24 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" @@ -94502,13 +94583,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.14.7" + sources."@babel/preset-env-7.14.8" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -94529,7 +94610,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -94702,7 +94783,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -94826,7 +94907,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96074,7 +96155,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -96732,20 +96813,20 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "4.4.4"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.4.4.tgz"; - sha512 = "vDyRF0MxUCccnk/nttQtWSE+KrcHgqjT0s/SyK7Hw06dAKg9X5kDyvDXjHQl2Dmc8Nc68050xc9ql36xUid2dQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.0.0.tgz"; + sha512 = "bOXs3BRJ/3wC9aAIMw3r7IwQFDSDz+BG69nERTH11YqFLP45SLpro1lhGUIY4M28AdiX6DbHdC3zBZb2+4QONw=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -96753,7 +96834,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -96766,18 +96847,18 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -96787,7 +96868,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -96850,16 +96931,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.7" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@bugsnag/browser-7.10.5" sources."@bugsnag/core-7.10.0" sources."@bugsnag/cuid-3.0.0" @@ -96869,7 +96950,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-15.11.5" // { + (sources."@netlify/build-16.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -96891,7 +96972,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-12.6.0" // { + (sources."@netlify/config-13.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -96927,7 +97008,7 @@ in ]; }) sources."@netlify/plugins-list-2.19.3" - sources."@netlify/routing-local-proxy-0.30.2" + sources."@netlify/routing-local-proxy-0.31.0" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" @@ -97060,18 +97141,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-8.3.0" + sources."@octokit/openapi-types-9.0.0" sources."@octokit/plugin-paginate-rest-2.14.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.4.1" + sources."@octokit/plugin-rest-endpoint-methods-5.4.2" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.7" - sources."@octokit/types-6.19.0" + sources."@octokit/rest-18.6.8" + sources."@octokit/types-6.19.1" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -97108,7 +97189,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/node-fetch-2.5.11" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -97267,7 +97348,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."cardinal-2.1.1" (sources."chalk-4.1.1" // { dependencies = [ @@ -97533,7 +97614,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -98351,7 +98432,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.53.2" + sources."rollup-2.53.3" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -99237,7 +99318,7 @@ in sha512 = "r+wpPLWySuj/toc1mMkR8++mpFoTm9RZwsqe6guFc/IwEpQdDpmYkT11OGmTqjUqr8WdteOP+MNvdgNgtTzyxQ=="; }; dependencies = [ - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@mapbox/node-pre-gyp-1.0.5" sources."@node-red/editor-api-2.0.1" sources."@node-red/editor-client-2.0.1" @@ -99262,7 +99343,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -99374,7 +99455,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - (sources."duplexify-4.1.1" // { + (sources."duplexify-4.1.2" // { dependencies = [ sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" @@ -99996,7 +100077,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -100022,7 +100103,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -100901,6 +100982,24 @@ in bypassCache = true; reconstructLock = true; }; + npm-merge-driver = nodeEnv.buildNodePackage { + name = "npm-merge-driver"; + packageName = "npm-merge-driver"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-merge-driver/-/npm-merge-driver-2.3.6.tgz"; + sha512 = "uPjCEWZ93f379zw0AMEgFtZIlpSSnpXc8BEIcs8yYHEZs5Y3d85OZHisLjNhjbYnbdAznxTq+VbyBWAQZDEm9w=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "git merge driver for automatically merging lockfiles"; + homepage = "https://github.com/npm/npm-merge-driver#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0" = nodeEnv.buildNodePackage { name = "npm2nix"; packageName = "npm2nix"; @@ -101127,14 +101226,14 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -101146,7 +101245,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -101159,20 +101258,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -101239,16 +101338,16 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.7" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -101370,7 +101469,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -101508,7 +101607,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103173,7 +103272,7 @@ in sha512 = "/DGG+QcSPraMAIxaoGCNqb2A6Xkm2jBQMsj2mjb4ag236ByTY9Xhpikvj5ixwlSQV0euuJw4fphKCd5YHRPS8w=="; }; dependencies = [ - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/parser-7.13.13" sources."@babel/types-7.13.12" sources."@nodelib/fs.scandir-2.1.5" @@ -104508,15 +104607,15 @@ in sha512 = "coA9MuNPfN+8TyFj7aOycw2e5W9t+sSgFOUyK30oDrh2MWWWHLjY0I4V1puyCconC2arggfDE2GYXvqOTCGv9Q=="; }; dependencies = [ - sources."@babel/cli-7.14.5" + sources."@babel/cli-7.14.8" sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - (sources."@babel/core-7.14.6" // { + (sources."@babel/core-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.14.5" + sources."@babel/generator-7.14.8" sources."@babel/helper-annotate-as-pure-7.14.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5" (sources."@babel/helper-compilation-targets-7.14.5" // { @@ -104524,7 +104623,7 @@ in sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.14.6" + sources."@babel/helper-create-class-features-plugin-7.14.8" sources."@babel/helper-create-regexp-features-plugin-7.14.5" (sources."@babel/helper-define-polyfill-provider-0.2.3" // { dependencies = [ @@ -104537,20 +104636,20 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-skip-transparent-expression-wrappers-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" sources."@babel/plugin-proposal-async-generator-functions-7.14.7" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -104625,7 +104724,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.14.7" // { + (sources."@babel/preset-env-7.14.8" // { dependencies = [ sources."semver-6.3.0" ]; @@ -104634,16 +104733,16 @@ in sources."@babel/preset-react-7.14.5" sources."@babel/preset-stage-0-7.8.3" sources."@babel/register-7.14.5" - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.8" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -104831,7 +104930,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -105060,7 +105159,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106423,7 +106522,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - (sources."@babel/generator-7.14.5" // { + (sources."@babel/generator-7.14.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -106434,13 +106533,13 @@ in sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-module-imports-7.14.5" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.14.7" - sources."@babel/runtime-7.14.6" + sources."@babel/parser-7.14.8" + sources."@babel/runtime-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" @@ -106930,10 +107029,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.53.2"; + version = "2.53.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.53.2.tgz"; - sha512 = "1CtEYuS5CRCzFZ7SNW5528SlDlk4VDXIRGwbm/2POQxA/G4+7/crIqJwkmnj8Q/74hGx4oVlNvh4E1CJQ5hZ6w=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.53.3.tgz"; + sha512 = "79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -106955,7 +107054,7 @@ in src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -107259,7 +107358,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.53.2" + sources."rollup-2.53.3" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -107673,7 +107772,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.13.4" // { + (sources."@serverless/components-3.14.0" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -107716,7 +107815,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.4.0" // { + (sources."@serverless/utils-5.5.0" // { dependencies = [ sources."get-stream-6.0.1" sources."jwt-decode-3.1.2" @@ -107734,7 +107833,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.171" sources."@types/long-4.0.1" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/request-2.48.6" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -107795,7 +107894,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.949.0" // { + (sources."aws-sdk-2.950.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -107977,7 +108076,7 @@ in sources."dotenv-10.0.0" sources."dotenv-expand-5.1.0" sources."duplexer3-0.1.4" - sources."duplexify-4.1.1" + sources."duplexify-4.1.2" sources."duration-0.2.2" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" @@ -108024,7 +108123,7 @@ in sources."fd-slicer-1.1.0" sources."fecha-4.2.1" sources."figures-3.2.0" - sources."file-type-16.5.1" + sources."file-type-16.5.2" sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" @@ -108270,7 +108369,7 @@ in sources."path-loader-1.0.10" sources."path-type-4.0.0" sources."path2-0.1.0" - sources."peek-readable-4.0.0" + sources."peek-readable-3.1.4" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -108381,7 +108480,7 @@ in sources."strip-dirs-2.1.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.2.2" + sources."strtok3-6.1.3" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" @@ -108442,7 +108541,7 @@ in sources."to-buffer-1.1.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."token-types-2.1.1" + sources."token-types-3.1.0" sources."tough-cookie-2.5.0" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" @@ -109911,7 +110010,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -111177,7 +111276,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.949.0" // { + (sources."aws-sdk-2.950.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -111961,31 +112060,31 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.14.7" - sources."@babel/core-7.14.6" - sources."@babel/generator-7.14.5" + sources."@babel/core-7.14.8" + sources."@babel/generator-7.14.8" sources."@babel/helper-compilation-targets-7.14.5" sources."@babel/helper-function-name-7.14.5" sources."@babel/helper-get-function-arity-7.14.5" sources."@babel/helper-hoist-variables-7.14.5" sources."@babel/helper-member-expression-to-functions-7.14.7" sources."@babel/helper-module-imports-7.14.5" - sources."@babel/helper-module-transforms-7.14.5" + sources."@babel/helper-module-transforms-7.14.8" sources."@babel/helper-optimise-call-expression-7.14.5" sources."@babel/helper-replace-supers-7.14.5" - sources."@babel/helper-simple-access-7.14.5" + sources."@babel/helper-simple-access-7.14.8" sources."@babel/helper-split-export-declaration-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helpers-7.14.6" + sources."@babel/helpers-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.14.7" + sources."@babel/parser-7.14.8" sources."@babel/template-7.14.5" - sources."@babel/traverse-7.14.7" - sources."@babel/types-7.14.5" + sources."@babel/traverse-7.14.8" + sources."@babel/types-7.14.8" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -112015,7 +112114,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -112053,7 +112152,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -112295,7 +112394,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -113643,7 +113742,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -114453,7 +114552,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -115991,7 +116090,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -116391,7 +116490,7 @@ in sources."buffer-from-1.1.1" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" (sources."chalk-4.1.1" // { dependencies = [ sources."supports-color-7.2.0" @@ -116431,7 +116530,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -116981,7 +117080,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" sources."@babel/highlight-7.14.5" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -116998,7 +117097,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -117921,7 +118020,7 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.14.7" + sources."@babel/runtime-corejs3-7.14.8" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -118144,7 +118243,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/helper-validator-identifier-7.14.8" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -118170,7 +118269,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -118470,7 +118569,7 @@ in sources."lcid-3.1.1" sources."levn-0.4.1" sources."lie-3.3.0" - sources."lighthouse-logger-1.2.0" + sources."lighthouse-logger-1.3.0" sources."lines-and-columns-1.1.6" sources."lodash.clonedeep-4.5.0" sources."lodash.includes-4.3.0" @@ -118733,7 +118832,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -118756,11 +118855,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001245" + sources."caniuse-lite-1.0.30001246" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.780" + sources."electron-to-chromium-1.3.782" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -118898,7 +118997,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -119552,7 +119651,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -119988,7 +120087,7 @@ in sha512 = "dbHkO8dp4/KDsU5V7akSWVdWB+yyfadR0q3vGxRKXxg1umiYlFUrPuiu66Iy4IpRRr2Qrqx495kInkZJIJtqmA=="; }; dependencies = [ - sources."@babel/runtime-7.14.6" + sources."@babel/runtime-7.14.8" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -120926,7 +121025,7 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.3" + sources."@types/node-16.4.0" sources."@types/node-fetch-2.5.11" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" diff --git a/pkgs/development/python-modules/addict/default.nix b/pkgs/development/python-modules/addict/default.nix new file mode 100644 index 00000000000..2bb531cff90 --- /dev/null +++ b/pkgs/development/python-modules/addict/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "addict"; + version = "2.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "addict" ]; + + meta = with lib; { + description = "Module that exposes a dictionary subclass that allows items to be set like attributes"; + homepage = "https://github.com/mewwts/addict"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/enlighten/default.nix b/pkgs/development/python-modules/enlighten/default.nix new file mode 100644 index 00000000000..8f58720bd26 --- /dev/null +++ b/pkgs/development/python-modules/enlighten/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, blessed +, prefixed +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "enlighten"; + version = "1.10.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "3391916586364aedced5d6926482b48745e4948f822de096d32258ba238ea984"; + }; + + propagatedBuildInputs = [ + blessed + prefixed + ]; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "enlighten" ]; + disabledTests = + # https://github.com/Rockhopper-Technologies/enlighten/issues/44 + lib.optional stdenv.isDarwin "test_autorefresh" + ; + + meta = with lib; { + description = "Enlighten Progress Bar for Python Console Apps"; + homepage = "https://github.com/Rockhopper-Technologies/enlighten"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/homepluscontrol/default.nix b/pkgs/development/python-modules/homepluscontrol/default.nix index 680c4a5a726..7870247e2fd 100644 --- a/pkgs/development/python-modules/homepluscontrol/default.nix +++ b/pkgs/development/python-modules/homepluscontrol/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "homepluscontrol"; - version = "0.0.5"; + version = "0.0.61"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "chemaaa"; repo = pname; rev = version; - sha256 = "1nd3a7nhh1xb70cdh2h2bimwbffvpc3457smyzr9fqkjwfbcrr93"; + sha256 = "1g61xj417dz1nz5g5ic8rs34fp424zvbgsymry1zldg3gskaqgvk"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/prefixed/default.nix b/pkgs/development/python-modules/prefixed/default.nix new file mode 100644 index 00000000000..d5837fd90a1 --- /dev/null +++ b/pkgs/development/python-modules/prefixed/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "prefixed"; + version = "0.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ca48277ba5fa8346dd4b760847da930c7b84416387c39e93affef086add2c029"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "prefixed" ]; + + meta = with lib; { + description = "Prefixed alternative numeric library"; + homepage = "https://github.com/Rockhopper-Technologies/prefixed"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix index 0ce28e57492..2e178163c10 100644 --- a/pkgs/development/python-modules/pybtex/default.nix +++ b/pkgs/development/python-modules/pybtex/default.nix @@ -1,11 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, latexcodec, pyyaml }: +{ lib +, buildPythonPackage +, fetchPypi +, latexcodec +, pyyaml +, setuptools +}: buildPythonPackage rec { version = "0.24.0"; pname = "pybtex"; doCheck = false; - propagatedBuildInputs = [ latexcodec pyyaml ]; + pythonImportsCheck = [ "pybtex" ]; + + propagatedBuildInputs = [ + latexcodec + pyyaml + setuptools + ]; src = fetchPypi { inherit version pname; diff --git a/pkgs/development/python-modules/requests-futures/default.nix b/pkgs/development/python-modules/requests-futures/default.nix new file mode 100644 index 00000000000..cc6eb312431 --- /dev/null +++ b/pkgs/development/python-modules/requests-futures/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage, fetchPypi, requests, lib }: + +buildPythonPackage rec { + pname = "requests-futures"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "35547502bf1958044716a03a2f47092a89efe8f9789ab0c4c528d9c9c30bc148"; + }; + + propagatedBuildInputs = [ requests ]; + + # tests are disabled because they require being online + doCheck = false; + + pythonImportsCheck = [ "requests_futures" ]; + + meta = with lib; { + description = "Asynchronous Python HTTP Requests for Humans using Futures"; + homepage = "https://github.com/ross/requests-futures"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ applePrincess ]; + }; +} diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index edadde8995e..af222674130 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.22.6"; + version = "0.23.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "06qar4syi6g3x84klnk0mg6w5ryl50c5k3s1hag4rimbkap3x6ks"; + sha256 = "15q82fq10d162xanypn1k51y15r38l7sj0417jzbjx40zz6c93f7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix index 39be204a3d3..e983dfc0e7f 100644 --- a/pkgs/development/python-modules/surepy/default.nix +++ b/pkgs/development/python-modules/surepy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "surepy"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "benleb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU="; + sha256 = "04ywkbgs1lnnlhxakbr96crwc8hl97px8w7yigps2ki69md0xf60"; }; postPatch = '' @@ -35,7 +35,9 @@ buildPythonPackage rec { --replace 'attrs = "^20.3.0"' 'attrs = "*"' ''; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiodns @@ -53,6 +55,7 @@ buildPythonPackage rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ "surepy" ]; meta = with lib; { diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index 1cb27f7b8c5..586d93151e2 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "3.12.5"; + version = "3.40.14"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "1xgxyfwwghy9l17i6y40axdrpp4fgxgdr5y97flwmfivif01ifs1"; + sha256 = "1bmkkmi1gx5kc39cjnz5bzwqaicxs0zb6bcv4iny9qccbqf3icrd"; }; nativeBuildInputs = [ diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 75220507747..9b4d36fd372 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-07-17"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f83a1f70d542ac885b72d1161140d6d999e2d7b2"; - sha256 = "0mx9g2j32hbpg5gyxn4apkfm28myzpasj4w7dpq6p61c90hwhgq4"; + rev = "5ad4fdd583116ec253aaf43e2d457cd3e3aa5587"; + sha256 = "178c60ckgkr4ivgi1b21f1cndx9d64spydc8z75gcyz3r6lcbrmm"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -425,12 +425,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-19"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "7ae9ada3866e05a25be1899dfb68fa2dc17f5466"; - sha256 = "0plydss60in6zsgjrgrsvxgkz59bmn89ngm015prqp1w8izlwc82"; + rev = "f768ee24fd8b8b3ee6751361b9ac09f7c8f381d8"; + sha256 = "1rdfjz2l2v1hzsp8pfiv0c7kbmf7221a90pak7w7mncaabrzlnxr"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -533,12 +533,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-07-17"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "75b97dfdd641d530b86dee603308aea0079736e9"; - sha256 = "1rmlz74ssf9mpg4fbxinrmxnqcb4p37wi4pz96d6niiii0vj71b2"; + rev = "d3ddb34d124c2fce9afa56342e67732a267d6b42"; + sha256 = "1px4fny0m272jl4vvhhv317j4wh5kfb89rdlrrpqwg8dl2si24rq"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -569,12 +569,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-07-16"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "9c3c84735c9bcfd62507d6e2a137f90b1ddaa98a"; - sha256 = "0g479ffpiqz15wwam4vwi8x0w7hbdnk2dxcwzryaf1cqnn6ip6in"; + rev = "576f3c972aa9c4458d3dbac2794bd8643ae16e4a"; + sha256 = "09cndvz8dcasn35bclhqc4i72dw93sczivvfi0zw9ncgsdl22r6g"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -690,12 +690,12 @@ final: prev: compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-07-16"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "fcb7c80bc6b3df11d5c0d8cde4f12aa9d3653cdd"; - sha256 = "18v1g8l11caqlag3d55vvn1v7k99600jzlzzmp6bv5pmi4lmhq0g"; + rev = "82d2139de0279a20a70da61320042adf31b94798"; + sha256 = "06dyrknc6gap8ybsjai4ndr4cdhzkwz1hnxilz9ffcbplzwldhs5"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -822,12 +822,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-07-19"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "9c1aa175762884812b9f3c3436ef6e26639b9589"; - sha256 = "1xhbnad098a6h3vf05rkha7qpj4nb4jaxjcnll91wzvf4lngq4p0"; + rev = "2cad943df739c1fcf4d923854ae642fde38b477f"; + sha256 = "1j761zpa41p9hmh4bxapaqjvxx9d3nhcf2bifsibcjghcxblj1xb"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1400,12 +1400,12 @@ final: prev: editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2021-04-04"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "f305bc77faef4b418aee65682d7d147f64cfd5a9"; - sha256 = "1yr8jni3z9sf348d8zw532vj4s1ww62yfslfcdgkgwhba1l2vy53"; + rev = "1c4f781f2439469e5342217131886260c9445fc6"; + sha256 = "0m39if0n4kijqzxk91r1a1fnyhr2p4b9nx1yzvwzkj21snysi4w8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -1619,12 +1619,12 @@ final: prev: floating-nvim = buildVimPluginFrom2Nix { pname = "floating-nvim"; - version = "2021-05-08"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "fhill2"; repo = "floating.nvim"; - rev = "c47af010aa8e88758995858f0ed2771a99cd3e98"; - sha256 = "0cvs6c903bq4jk4l197vvdrk8q85rl7z7iy7cvd5m4k7yd937r50"; + rev = "11e75c2a201b9d73f03bd3c2db1fc94021c231eb"; + sha256 = "172ak3macqmkz4jvic1xcnfpp6wafq33afyvcx4za170qh30sydj"; }; meta.homepage = "https://github.com/fhill2/floating.nvim/"; }; @@ -1859,12 +1859,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-07-19"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "66638c929c61f950246f3d292b6157a9596241de"; - sha256 = "1wqspsx83sy2qmmg0idi7j66swm23hnhxx630j114vh6a70vai00"; + rev = "c3b63ec2ffedc7e7199265852eab13ec8c02b6e0"; + sha256 = "1l8yilf0fqi16lrgpp8i8irq3fb1a73j17gvhff7m6fyzilwahjj"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2436,12 +2436,12 @@ final: prev: lazygit-nvim = buildVimPluginFrom2Nix { pname = "lazygit-nvim"; - version = "2021-07-14"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "3dc36a82276d4ff88badadf3dfdcc34b57d0e0fd"; - sha256 = "18sl35wi7zq2y4y4bny5pz160m584c8mli1b6vjvr84gvjmyg7sv"; + rev = "c1840692c17b6994bb3b96b33e48040d0cb2da99"; + sha256 = "07mwa2bbny73s60as5s1schk4zhk6m6rv26ljbcl14mx45z9m8r8"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; @@ -2724,12 +2724,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-07-12"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "d7638d0a72686ca3e0e2ff019aae8cb9073d7980"; - sha256 = "0fsd4azmmjjqqm6sb492bp02fvddalklmbyn1a07xql35fj5cq89"; + rev = "d4ddebdb4f4bc44e731e808d794bd8c429dc9e07"; + sha256 = "01lsxak9hl2shhhzqjypdjpkasrppn6v8xlzxi28c7973c5jn629"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -2820,12 +2820,12 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap-vim"; - version = "2021-07-16"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "2d61b880aba6e4e0b730303e0e980bf0afd73961"; - sha256 = "01az8gkhhvndnrjavk7jzi5wy03ybca97cbxpdimx2wpvxly484j"; + rev = "d389e2b0c67f5cedd5ec5edfe53afc847f8daf61"; + sha256 = "180grx6317ic6ip98awvqnfjc4zkzqh91rglls5pvwcq1w5m5vwb"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3132,12 +3132,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-06-30"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "3fdfd45119be64945e635bf2406fdb0430cb85df"; - sha256 = "1sd45xvvw4wgmzixlmaq6j0kvv25l561678q24l23swh77x617r4"; + rev = "f9fa0e31f9e5c7aaa2ea2091ca64b28d84d485c0"; + sha256 = "1bv75ijvs63r88nghjk5ljjz06r6xbp3923r3c17p1d3ks2qsfxa"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -3408,12 +3408,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-07-17"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "02a07af329b9cb42187a2dd74aef8563f5957bfc"; - sha256 = "10yzlv3433dfdm5n1q8r4yzwx0h73nd81w60fqkfx4cl4l7l9085"; + rev = "994cb6b4efa481ac1a64aa3ac5c9e8cfea806783"; + sha256 = "1wssns3iwgfkf73vgln4msv8l5gw724wyalqzv8w8ckhf68dbz4j"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3444,12 +3444,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-07-14"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "56d4b76203d2b442353e25c247f49fa5ca70f42e"; - sha256 = "0kmgln5ra2lpdvj9866a11l9h04zc1dmvxcw8gbra6f72ars3jwr"; + rev = "fa50b4ce297599dc22b1b4bb8550eff4d791f9e4"; + sha256 = "0fhp6qxwykb1hz4xgaj4sq1h1qlfdr855fyaigw171nz0p7ki7ws"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3540,12 +3540,12 @@ final: prev: nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-07-17"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "b90cbdef2d7eab5fa8b3693bb321305e4455f329"; - sha256 = "16n168z9gdy0p0yljpx3lv958ix1369qgqc65pjs9ib5sij03q2s"; + rev = "47fc74b5b3aafd2e3028c69ab96cb215c5f6c8bc"; + sha256 = "0mr0dh8picgd8ghm9gvgyg08cihr4k1x8l2brfahpnxha6aghx58"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3600,12 +3600,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-07-14"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "344b6f0b581dd72e40bbbb78b4f147e5003e0ce6"; - sha256 = "1xdcdwjqk2r2cg47gxld2c06yfnbpj6nnm2j5nskqa3nbyrpf27c"; + rev = "e3e23d257c9a36e3d189d6b57e6c6b7e91bfa14f"; + sha256 = "09rk3s6swwng78cpj1f2rlww2vkqai9sx72sqihk09sc16prp6cc"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3648,12 +3648,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-07-06"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "85c931fa18cb9a7c54b0a6bde54924741bdb296c"; - sha256 = "0fw59qgfaskwv8k8pjq1xb8b4k55rgr04311xma4arki9gjrv128"; + rev = "8e1d114f3d855653bc71fba9e5a22a05d3a1b1a2"; + sha256 = "1dm6rwx3w8hbgg20ay4bcdd3c87bqpqvl64zfc673p81m76b3s86"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -3708,12 +3708,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-07-18"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "38e0003d0c40d506e9e46ff55978b78220a76b71"; - sha256 = "0r3zicx8gkj5jd0kxs1i5inxpi9jmg3nwb0km4xcj55fb3x2vbky"; + rev = "4f72377143fc0961391fb0e42e751b9f677fca4e"; + sha256 = "1w9gjnv98gv8jwkkw1x5jsnc8366w1jcllipxlrij97z6hspqc8m"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3756,12 +3756,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-07-07"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "2216837c0178dc81cca3d47aff9699ac1b2aec8e"; - sha256 = "0n1p7abd08k28c30pzk51vm1j3wghyjxbw0c8j0jwxiyzaf3p865"; + rev = "b7ca5298fd75700cc74b122654241f5ed24ecf96"; + sha256 = "0pywghia4hv9pa8g1irmqc1qrbvbhhibazx8z6kcqrrmsb3026g5"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3780,11 +3780,11 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-07-12"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "96af0fa98252ab3543ff1464c6452930f242c615"; + rev = "0e11e0322c1730559cb74f728300de2912bf9a61"; sha256 = "10r9zqmkhh3bpjhjhrr24vssy5wazd4499sxsyqsr6p9bb1mkhqh"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; @@ -3792,24 +3792,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-07-10"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "f178c8c8c5cb994326578a24d3296dde6f2e9bd3"; - sha256 = "1xdakhjsjfx7y3dqi99ldgwmh69jyyvisqainlkiz63g0nsy81ay"; + rev = "d3e76b81e5b169af192dea4da0bd6f64faad2c36"; + sha256 = "0hw50yyikndx1260a50j6izjsa4m709r7v3qzrpwz482d7fq700j"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-19"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "17cf76de8a16c1e459fbe916491f258371837a8d"; - sha256 = "1fzm655q6xw3qqpvzx36wj5v9js1jiwb8295cccdc65irg8r6zfw"; + rev = "e473630fe0872cb0ed97cd7085e724aa58bc1c84"; + sha256 = "1l6cv9znpwnk4hmg3vh8gy26s8hvlbg03wmd7snjwxcpfyj6vi84"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3852,12 +3852,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-07-08"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "379bc8f48256c07139241e1c7a70f22dd4344c4f"; - sha256 = "0bmy6rzmh3jfqd567wiavwfm9j2dpb0asmcgkyvj5j5qy2xfmi5l"; + rev = "7f36db566c66998e04ea569723174c42d8190903"; + sha256 = "1j2vjlfrvvvxzqq2z6z9mdlanq8q8zhfhffbrygv1zgrp6izhhkx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -4465,12 +4465,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-07-17"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "a22eec84aaa5b31b5c708eed24a5c09f21ca46c0"; - sha256 = "14lwhdbpjrq2xyy9kfihjasvqg83bb13fl0r7aw95hngayx69l7k"; + rev = "11f232c7a82c3fd5d34654c6b02abae4f56ac5e6"; + sha256 = "1xyrf6s8szd1lpz70ng1whhysjvnn7pxi80knyrjrkqzkqpimiac"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4815,24 +4815,24 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-07-17"; + version = "2021-07-19"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "76277236829ca77dd41d285c794ab8878129e3f8"; - sha256 = "1vqxn02xy8j7ij4zm7x55zzch1bl8k6313l06mb60zxvw77i5a81"; + rev = "9983108bc9941af842d3b847b60564d180fc8e4b"; + sha256 = "1f1f1v107w61b86pdrs9qvchyg286nif31c5cp3yx6rq22fynbgd"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-07-19"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "b2780ad5078c24519ba1e6ae3a1b3bd2218870cc"; - sha256 = "1r0v4l9rvb3w42fnj1fmcfvy04gyp0lv3mis7jl716r8kvbaqwpj"; + rev = "d313ed0f8f39a7fd09da65c4f02191368680387f"; + sha256 = "1z9r2x58g212jy2sl981s7f8pj2nbqfgjbfi471yqafbxlynfzdw"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -4863,12 +4863,12 @@ final: prev: suda-vim = buildVimPluginFrom2Nix { pname = "suda-vim"; - version = "2021-02-20"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "suda.vim"; - rev = "fbb138f5090c3db4dabeba15326397a09df6b73b"; - sha256 = "01kys8q3gycxqf760ydq1k8wq20brjvl1gxpl8j87jvnyx87kmnf"; + rev = "bfafa2722178bdb8898e014a7e95b60d497960d9"; + sha256 = "1cjj6d6zkd2b9hv77saz8p7xcw06rj0svdhycc4df8bcdrvvmi39"; }; meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; @@ -4921,6 +4921,18 @@ final: prev: meta.homepage = "https://github.com/keith/swift.vim/"; }; + symbols-outline-nvim = buildVimPluginFrom2Nix { + pname = "symbols-outline-nvim"; + version = "2021-07-21"; + src = fetchFromGitHub { + owner = "simrat39"; + repo = "symbols-outline.nvim"; + rev = "7414f30365a342e1d89072d474a35913643b6eec"; + sha256 = "19c9dv8dc72nnb1dx7wdraihpzf5b42wwq3c9vn0na8k1xy26h8y"; + }; + meta.homepage = "https://github.com/simrat39/symbols-outline.nvim"; + }; + syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; version = "2021-07-19"; @@ -5141,12 +5153,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-19"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "46e03a935f1d080a9bd856d5a8acfcc093cd1461"; - sha256 = "14ra8p9alnmvzry3iw3ghyk7nx44dh0qm82lvg6wfg5bhw1hpnnj"; + rev = "664690029fdb302bee8d3f27a458383e8477add7"; + sha256 = "1aaq9lmfxxxpirkbj3py76qnyfd1qhsq9msfw689zgzjqahk7zhz"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5262,24 +5274,24 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight-nvim"; - version = "2021-07-09"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "e3ad6032a7e2c54dd7500335b43c7d353a19ede9"; - sha256 = "1slb67kirb0jfgjsw09dhimmxagsk2aii6w461y1w8nj3fkl6p28"; + rev = "0ee0bcf14d8c7c70081a0e9967c211121c4300c7"; + sha256 = "0rkw544dzgyp76ag3zrh8d3n0mri5c0cjpy8mvbfpgyj87w18m8d"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2021-07-18"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "360361b093d21531c0781c5c4a61a1e6cb3edfac"; - sha256 = "052kbzx2rqpw5mhh6w1zcj5il642w1a2wi6w4nbcw7scj4gq85pd"; + rev = "896f2bed6b982ce5ca2c5bd454b8eb8af312e5a1"; + sha256 = "1pwlw8gq0vd8zc3xqmp8r2s2wka9m9i85w08av59rmwnizk6vkza"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -6018,12 +6030,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-07-19"; + version = "2021-07-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "3aa42d211ebae7471e8f9926aaeef5a1df475f2f"; - sha256 = "0f1adjn9x5jv541yzgqf67v9613xvkxzgc5bmkgqrfxn2l5j3vjn"; + rev = "2e287bd7e73198408d73b7183e3019a3aff6c19b"; + sha256 = "1n1hipxim9d1shh9ch414yy15vdr8yc5ppgk7msv6zzgsw10qyaw"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7616,12 +7628,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-06-16"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "fb0a72306e1fc42c1ce8909aa1e420ddfccf6fbf"; - sha256 = "0dzy7cvpmzvx6z5pifzj4y7biln5gcn4iic35ha58ixwgwcw784m"; + rev = "7ba553effb021293c9ff5176b91e76da71797825"; + sha256 = "1phfqzn94m2j7g10aifh12a4gyyrhqnj1vn2bpdp29lpm1n179yg"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -8299,6 +8311,18 @@ final: prev: meta.homepage = "https://github.com/haya14busa/vim-poweryank/"; }; + vim-prettier = buildVimPluginFrom2Nix { + pname = "vim-prettier"; + version = "2021-07-21"; + src = fetchFromGitHub { + owner = "prettier"; + repo = "vim-prettier"; + rev = "0e61e4a5b55d2740aa118db91a6671dcb11307e8"; + sha256 = "0d83lx6kfpsi3d4q9wz8zwsgdn0vn16psqyngml6wspjyibh6pnf"; + }; + meta.homepage = "https://github.com/prettier/vim-prettier"; + }; + vim-prettyprint = buildVimPluginFrom2Nix { pname = "vim-prettyprint"; version = "2016-07-16"; @@ -8397,12 +8421,12 @@ final: prev: vim-qf = buildVimPluginFrom2Nix { pname = "vim-qf"; - version = "2021-06-08"; + version = "2021-07-20"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-qf"; - rev = "4fe7e33a514874692d6897edd1acaaa46d9fb646"; - sha256 = "054p9f3a3yljng3r51asgyq2ifmmrr35ws5f8dv8ssmby2f7an1l"; + rev = "65f115c350934517382ae45198a74232a9069c2a"; + sha256 = "0pylxkmhcanks59imah3q2xyn8lp5735xm17p13yx9vx90779nwp"; }; meta.homepage = "https://github.com/romainl/vim-qf/"; }; @@ -9729,6 +9753,18 @@ final: prev: meta.homepage = "https://github.com/preservim/vimux/"; }; + vimway-lsp-diag-nvim = buildVimPluginFrom2Nix { + pname = "vimway-lsp-diag-nvim"; + version = "2021-07-21"; + src = fetchFromGitHub { + owner = "onsails"; + repo = "vimway-lsp-diag.nvim"; + rev = "dee2f59a45f72fb2ba0dd29cb06ed5357097ee07"; + sha256 = "16da94g367sb07d1xn55cvyi48zjgjv2c1p7mzabpidm9c7r99pm"; + }; + meta.homepage = "https://github.com/onsails/vimway-lsp-diag.nvim/"; + }; + vimwiki = buildVimPluginFrom2Nix { pname = "vimwiki"; version = "2020-05-26"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 8ee937359cb..dffb5dd798b 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -635,7 +635,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-D54R7LK4CH5S7x0g+3K1EJ4b10P7wRAIkHYwCOFJtfg="; + cargoSha256 = "046c5w47isnz5l23kpk8zkbw312yp5dz9wq9dc2kmpklai71fc1a"; }; in '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 39e2a2bd47a..c3c89b5af46 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -506,6 +506,7 @@ Olical/aniseed Olical/conjure olimorris/onedark.nvim onsails/lspkind-nvim +onsails/vimway-lsp-diag.nvim OrangeT/vim-csharp osyo-manga/shabadou.vim osyo-manga/vim-anzu @@ -537,6 +538,7 @@ preservim/tagbar preservim/vim-pencil preservim/vim-wordy preservim/vimux +prettier/vim-prettier psliwka/vim-smoothie ptzz/lf.vim puremourning/vimspector @@ -628,6 +630,7 @@ sickill/vim-pasta SidOfc/mkdx simnalamburt/vim-mundo simrat39/rust-tools.nvim +simrat39/symbols-outline.nvim sindrets/diffview.nvim@main SirVer/ultisnips sjl/gundo.vim diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 74716408c3b..6507a603b86 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -85,6 +85,23 @@ let }; }; + angular.ng-template = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ng-template"; + publisher = "Angular"; + version = "12.1.2"; + sha256 = "sha256-fIHh1eRmu4zSgrtZr0XwLB+1Ad6a/0ABC55akGr0DOA="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; + description = "Editor services for Angular templates"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Angular.ng-template"; + homepage = "https://github.com/angular/vscode-ng-language-service"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; + }; + antfu.icons-carbon = buildVscodeMarketplaceExtension { mktplcRef = { name = "icons-carbon"; @@ -403,8 +420,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "11.5.1"; - sha256 = "sha256-Ic7eT8WX2GDYIj/aTu1d4m+fgPtXe4YQx04G0awbwnM="; + version = "11.6.0"; + sha256 = "sha256-JxCNE/IL/v94xWmhebsRZo1Gw+nSSpDgZ41ZGongGVI="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -514,6 +531,12 @@ let }; foam.foam-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "foam-vscode"; + publisher = "foam"; + version = "0.14.1"; + sha256 = "sha256-w9xGkezS3A9z6sTk8WWgW7g8qYX6mJFfRV0lv5cu160="; + }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; description = "A personal knowledge management and sharing system for VSCode "; @@ -522,12 +545,6 @@ let license = licenses.mit; maintainers = with maintainers; [ ratsclub ]; }; - mktplcRef = { - name = "foam-vscode"; - publisher = "foam"; - version = "0.13.7"; - sha256 = "Y2pcd4iXPiuhJdD/9d+tbTJN18O4+kRMqUdOtbx8xy8="; - }; }; formulahendry.auto-close-tag = buildVscodeMarketplaceExtension { @@ -1227,8 +1244,8 @@ let mktplcRef = { name = "markdown-memo"; publisher = "svsool"; - version = "0.3.8"; - sha256 = "eFiCCXxrOnXwJK1AOMfIDsPGsFG3ArLD1X/uAEH5lRY="; + version = "0.3.9"; + sha256 = "sha256-BsKFHR3wkSRHS8QOi63vLwGj3T2CPzvqXhgtEOq6gJM="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/svsool.markdown-memo/changelog"; diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 04c17eac255..758f6fd998a 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.13.1"; + version = "5.13.4"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,7 +12,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-QC2BgsbytpKQs7TyuXt4aan8hUwd43pHj2ApYXv0HAA="; + sha256 = "sha256-jSV5dL6myB4WeokYBwoBtQaOfLaUgvseYtReyjLGOhU="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 0a342997530..38293e65f70 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, windows, fetchurl }: let - version = "6.0.0"; + version = "9.0.0"; in stdenv.mkDerivation { pname = "mingw-w64"; inherit version; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; - sha256 = "1w28mynv500y03h92nh87rgw3fnp82qwnjbxrrzqkmr63q812pl0"; + sha256 = "10a15bi4lyfi0k0haj0klqambicwma6yi7vssgbz8prg815vja8r"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index ea6cd9ae04c..594085d422e 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -4,6 +4,7 @@ , cairo , fetchurl , flac +, gcc11 , gnome , gssdp , gupnp @@ -16,13 +17,11 @@ stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.24.1-62"; + version = "4.24.2-63"; src = fetchurl { - # FIXME: use the fc34 sources when we get glibc 2.33 in nixpkgs - # c.f. https://github.com/NixOS/nixpkgs/pull/111616 - url = "https://www.signalyst.eu/bins/${pname}/fc33/${pname}-${version}.fc33.x86_64.rpm"; - sha256 = "sha256-lnejPkw6X3wRtjXTsdipEy6yZCEsDARhLPnySIltHXs="; + url = "https://www.signalyst.eu/bins/${pname}/fc34/${pname}-${version}.fc34.x86_64.rpm"; + sha256 = "sha256-6JUgHDO+S73n/IVQhkmC0Nw4GQVzTLtiBbz/wZiflRg="; }; unpackPhase = '' @@ -35,6 +34,7 @@ stdenv.mkDerivation rec { alsa-lib cairo flac + gcc11.cc.lib gnome.rygel gssdp gupnp @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { # misc service support files mkdir -p $out/var/lib/hqplayerd - cp -r ./var/hqplayer/web $out/var/lib/hqplayerd + cp -r ./var/lib/hqplayer/web $out/var/lib/hqplayer runHook postInstall ''; diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 4ce0d63f6be..04be8c63599 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -2,7 +2,6 @@ , lib , fakeroot , fetchurl -, fetchpatch , libfaketime , substituteAll ## runtime dependencies @@ -70,11 +69,7 @@ stdenv.mkDerivation { }; patches = [ # adjust configure check to work with libtiff > 4.1 - (fetchpatch { - name = "libtiff-4.2.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/net-misc/hylafaxplus/files/hylafaxplus-7.0.2-tiff-4.2.patch?id=82e3eefd5447f36e5bb00068a54b91d8c891ccf6"; - sha256 = "0hhf4wpgj842gz4nxq8s55vnzmciqkyjjaaxdpqawns2746vx0sw"; - }) + ./libtiff-4.patch ]; # Note that `configure` (and maybe `faxsetup`) are looking # for a couple of standard binaries in the `PATH` and diff --git a/pkgs/servers/hylafaxplus/libtiff-4.patch b/pkgs/servers/hylafaxplus/libtiff-4.patch new file mode 100644 index 00000000000..daf7b4f7d05 --- /dev/null +++ b/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/706154 +--- a/configure ++++ b/configure +@@ -2583,7 +2583,7 @@ EOF + echo '#define TIFFSTRIPBYTECOUNTS uint32' + echo '#define TIFFVERSION TIFF_VERSION' + echo '#define TIFFHEADER TIFFHeader';; +- 4.[01]) tiff_runlen_t="uint32" ++ 4.[0-9]) tiff_runlen_t="uint32" + tiff_offset_t="uint64" + echo '#define TIFFSTRIPBYTECOUNTS uint64' + echo '#define TIFFVERSION TIFF_VERSION_CLASSIC' diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index ff676b27763..feab959a2df 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,24 +12,22 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.4.4805-186bae04e"; + version = "1.23.5.4841-549599676"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "161baz4klwb8wyvc3mnbvvwjcmdfp38rn270jwvmwzp6b70jclyx"; + sha256 = "168aill68fcq3cv3a78yhqnfxziww8r80is179y9jxmhymnmzp9q"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0vj7k81fl8chaxqz287arvn9vva4cd4wcnybc5yvls3589h9x1zq"; + sha256 = "0cp2likx2dqy6j5icp5n07kg1md9qvq9vsh4818m86r2p015qlvb"; }; outputs = [ "out" "basedb" ]; nativeBuildInputs = [ dpkg ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ]; - unpackPhase = '' dpkg-deb -R $src . ''; diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index bf408551a44..2cdd33a245e 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -26,12 +26,15 @@ let mixFodDeps = beamPackages.fetchMixDeps { pname = "${pname}-deps"; inherit src version; - sha256 = "18h3hs69nw06msvs3nnymf6p94qd3x1f4d2zawqriy9fr5fz7zx6"; + sha256 = "1x0if0ifk272vcqjlgf097pxsw13bhwy8vs0b89l0bssx1bzygsi"; # We need ecto 3.6 as this version checks whether the database exists before # trying to create it. The creation attempt would always require super-user privileges # and since 3.6 this isn't the case anymore. - patches = [ ./ecto_sql-fix.patch ]; + patches = [ + ./ecto_sql-fix.patch + ./plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch + ]; }; yarnDeps = mkYarnModules { diff --git a/pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch b/pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch new file mode 100644 index 00000000000..b8aa7319a21 --- /dev/null +++ b/pkgs/servers/web-apps/plausible/plausible-Bump-clickhouse_ecto-dependency-to-be-compatible-with-ecto-3.6.patch @@ -0,0 +1,26 @@ +From 127a77882879e5cdf32d908ee3b1b6cbdc9e482e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me> +Date: Wed, 14 Jul 2021 01:20:29 +0200 +Subject: [PATCH] Bump `clickhouse_ecto` dependency to be compatible with ecto + 3.6 + +--- + mix.lock | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mix.lock b/mix.lock +index ecae8ac..d42af1e 100644 +--- a/mix.lock ++++ b/mix.lock +@@ -12,7 +12,7 @@ + "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"}, + "cachex": {:hex, :cachex, "3.3.0", "6f2ebb8f27491fe39121bd207c78badc499214d76c695658b19d6079beeca5c2", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "d90e5ee1dde14cef33f6b187af4335b88748b72b30c038969176cd4e6ccc31a1"}, + "certifi": {:hex, :certifi, "2.6.1", "dbab8e5e155a0763eea978c913ca280a6b544bfa115633fa20249c3d396d9493", [:rebar3], [], "hexpm", "524c97b4991b3849dd5c17a631223896272c6b0af446778ba4675a1dff53bb7e"}, +- "clickhouse_ecto": {:git, "https://github.com/plausible/clickhouse_ecto.git", "b30ccc93a4101a25ff0bba92113e18d8a9a8b28e", []}, ++ "clickhouse_ecto": {:git, "https://github.com/plausible/clickhouse_ecto.git", "1969f14ecef7c357b2bd8bdc3e566234269de58c", []}, + "clickhousex": {:git, "https://github.com/plausible/clickhousex", "0832dd4b1af1f0eba1d1018c231bf0d8d281f031", []}, + "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"}, + "comeonin": {:hex, :comeonin, "5.3.2", "5c2f893d05c56ae3f5e24c1b983c2d5dfb88c6d979c9287a76a7feb1e1d8d646", [:mix], [], "hexpm", "d0993402844c49539aeadb3fe46a3c9bd190f1ecf86b6f9ebd71957534c95f04"}, +-- +2.31.1 + diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index bf0b7472c57..bec59404103 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -52,8 +52,6 @@ in stdenv.mkDerivation rec { makeFlags = [ "deps" ]; - phases = [ "unpackPhase" "configurePhase" "buildPhase" "installPhase" ]; - installPhase = '' for i in deps/*; do ( cd $i diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix index ebfd6c21772..a1558248f80 100644 --- a/pkgs/tools/admin/virtscreen/default.nix +++ b/pkgs/tools/admin/virtscreen/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, x11vnc, xrandr, libGL }: +{ lib +, stdenv +, fetchFromGitHub +, python3Packages +, x11vnc +, xrandr +, libGL +, qt5 +}: python3Packages.buildPythonApplication rec { pname = "virtscreen"; @@ -16,6 +24,8 @@ python3Packages.buildPythonApplication rec { sha256 = "005qach6phz8w17k8kqmyd647c6jkfybczybxq0yxi5ik0s91a08"; }; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = with python3Packages; [ netifaces pyqt5 @@ -24,10 +34,17 @@ python3Packages.buildPythonApplication rec { xrandr ]; - postPatch = let - ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + # import Qt.labs.platform failed without this + "--prefix QML2_IMPORT_PATH : ${qt5.qtquickcontrols2.bin}/${qt5.qtbase.qtQmlPrefix}" + ]; + + postPatch = '' substituteInPlace virtscreen/__main__.py \ - --replace "'GL'" "'${libGL}/lib/libGL${ext}'" \ + --replace "'GL'" "'${libGL}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}'" \ ''; meta = with lib; { diff --git a/pkgs/tools/archivers/arj/default.nix b/pkgs/tools/archivers/arj/default.nix new file mode 100644 index 00000000000..e09e390fa47 --- /dev/null +++ b/pkgs/tools/archivers/arj/default.nix @@ -0,0 +1,150 @@ +{stdenv, lib, fetchurl, fetchpatch, autoreconfHook}: + +stdenv.mkDerivation rec { + pname = "arj"; + version = "3.10.22"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1nx7jqxwqkihhdmdbahhzqhjqshzw1jcsvwddmxrwrn8rjdlr7jq"; + }; + + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/001_arches_align.patch"; + sha256 = "0i3qclm2mh98c04rqpx1r4qagd3wpxlkj7lvq0ddpkmr8bm0fh0m"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/002_no_remove_static_const.patch"; + sha256 = "0zfjqmjsj0y1kfzxbp29v6nxq5qwgazhb9clqc544sm5zn0bdp8n"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/003_64_bit_clean.patch"; + sha256 = "0mda9fkaqf2s1xl6vlbkbq20362h3is9dpml9kfmacpbifl4dx3n"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/004_parallel_build.patch"; + sha256 = "0gam6k7jknzmbjlf1r6c9kjh5s5h76pd31v59cnaqiycwiy8z6q9"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/005_use_system_strnlen.patch"; + sha256 = "0q0ypm8mdsxd0rl1k0id6fdx5m7mvqgwcla4r250cmc6zqzpib6d"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/006_use_safe_strcpy.patch"; + sha256 = "1garad95s34cix3kd77lz37andrcnz19glzkfdnkjaq7ldvzwikc"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/hurd_no_fcntl_getlk.patch"; + sha256 = "0b3hpn4qypimrw9ar2n4h24886sl6pmim4lb4ly1wqcq0f73arva"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security_format.patch"; + sha256 = "0q67cvln55p38bm0xwd2cgppqmkp2nfar2pg1zj78f7ncn35lbvf"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/doc_refer_robert_k_jung.patch"; + sha256 = "1wxdx0m6a9vdvjlaycwsissn75l1ni7grg8n6qmkynz2vrcvgzb1"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_fix.patch"; + sha256 = "19ycp1rak7l6ql28m50v95ls621w3sl8agw5r5va73svkgh8hc3g"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_flags.patch"; + sha256 = "1jw1y9i9lw1idgi4l9cycwsql1hcz1m4f3k2iybwsgx0acaw695q"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_strip.patch"; + sha256 = "1b18khj6cxnjyqk2ycygwqlcs20hrsbf4h6bckl99dxnpbq5blxi"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_pie.patch"; + sha256 = "1jqswxgc1plipblf055n9175fbanfi6fb67lnzk8dcvxjn227fs3"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/self_integrity_64bit.patch"; + sha256 = "0s5zdq81a0f83hdg9hy6lqn3xvckx9y9r20awczm9mbf11vi01cb"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-afl.patch"; + sha256 = "0yajcwpghij8wg21a0kkp3f9x7anz5m121jx2vnkyn04bvi9541a"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-traversal-dir.patch"; + sha256 = "10lv3867k0wm2s0cyf40hkxfqbjaxm4aph5ivk2q2rjkracrn2y4"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/security-traversal-symlink.patch"; + sha256 = "095pdfskxwh0jnyy31dpz10s2ppv8n7lvvn4q722y3g71d0c79qq"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/out-of-bounds-read.patch"; + sha256 = "0ps9lqkbqzlhzr2bnr47sir431z1nywr7nagkmk42iki4d96v0jq"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/remove_build_date.patch"; + sha256 = "1vjlfq6firxpj068l9acyqs77mfydn1rwgr2jmxgsy9mq0fw1dsc"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/reproducible_help_archive.patch"; + sha256 = "0l3qi9f140pwc6fk8qdbxx4g9d8zlf45asimmr8wfpbi4pf59n8i"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_cross.patch"; + sha256 = "1vb0vbh3jbxj192q47vg3f41l343ghcz2ypbrrm2bkbpwm5cl8qr"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/fix-time_t-usage.patch"; + sha256 = "012c6pnf5y4jwn715kxn3vjy088rm905959j6yh8bslyx84qaijv"; + }) + + (fetchpatch { + url = "https://sources.debian.org/data/main/a/arj/3.10.22-24/debian/patches/gnu_build_fix_autoreconf.patch"; + sha256 = "0yhxbdasnbqcg1nyx2379fpbr7fmdlv4n2nlxrv1z1vbc7rlvw9d"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook ]; + + preAutoreconf = '' + cd gnu + ''; + + postConfigure = '' + cd .. + ''; + + meta = with lib; { + description = "Open-source implementation of the world-famous ARJ archiver"; + longDescription = '' + This version of ARJ has been created with an intent to preserve maximum + compatibility and retain the feature set of the original ARJ archiver as + provided by ARJ Software, Inc. + ''; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sander ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/archivers/lha/default.nix b/pkgs/tools/archivers/lha/default.nix new file mode 100644 index 00000000000..f6b5c2bd135 --- /dev/null +++ b/pkgs/tools/archivers/lha/default.nix @@ -0,0 +1,27 @@ +{stdenv, lib, fetchFromGitHub, autoreconfHook}: + +stdenv.mkDerivation { + pname = "lha"; + version = "unstable-2021-01-07"; + + src = fetchFromGitHub { + owner = "jca02266"; + repo = "lha"; + rev = "03475355bc6311f7f816ea9a88fb34a0029d975b"; + sha256 = "18w2x0g5yq89yxkxh1fmb05lz4hw7a3b4jmkk95gvh11mwbbr5lm"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "LHa is an archiver and compressor using the LZSS and Huffman encoding compression algorithms"; + platforms = platforms.unix; + maintainers = [ maintainers.sander ]; + # Some of the original LhA code has been rewritten and the current author + # considers adopting a "true" free and open source license for it. + # However, old code is still covered by the original LHa license, which is + # not a free software license (it has additional requirements on commercial + # use). + license = licenses.unfree; + }; +} diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index af0cbc4fe22..dfac5af0980 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fetchpatch , staticOnly ? stdenv.hostPlatform.isStatic }: @@ -11,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "google"; repo = "brotli"; - rev = "v" + version; + rev = "v${version}"; sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; @@ -24,8 +28,7 @@ stdenv.mkDerivation rec { sha256 = "sOeXNVsCaBSD9i82GRUDrkyreGeQ7qaJWjjy/uLL0/0="; }); - cmakeFlags = [] - ++ lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; + cmakeFlags = lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; outputs = [ "out" "dev" "lib" ]; @@ -36,13 +39,13 @@ stdenv.mkDerivation rec { # This breaks on Darwin because our cmake hook tries to make a build folder # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) prePatch = '' - rm BUILD + rm BUILD - # Upstream fixed this reference to runtime-path after the release - # and with this references g++ complains about invalid option -R - sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in - cat scripts/libbrotli*.pc.in - ''; + # Upstream fixed this reference to runtime-path after the release + # and with this references g++ complains about invalid option -R + sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in + cat scripts/libbrotli*.pc.in + ''; # Don't bother with "man" output for now, # it currently only makes the manpages hard to use. @@ -53,10 +56,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit (src.meta) homepage; - + homepage = "https://github.com/google/brotli"; description = "A generic-purpose lossless compression algorithm and tool"; - longDescription = '' Brotli is a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 @@ -69,7 +70,6 @@ stdenv.mkDerivation rec { in the following internet draft: http://www.ietf.org/id/draft-alakuijala-brotli ''; - license = licenses.mit; maintainers = with maintainers; [ freezeboy ]; platforms = platforms.all; diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index ac0c0544f01..93b715f853c 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -1,30 +1,31 @@ -{ lib, stdenv, fetchurl, openmp ? null }: +{ lib, stdenv, fetchFromGitHub, openmp }: stdenv.mkDerivation rec { pname = "bsc"; version = "3.1.0"; - src = fetchurl { - url = "https://github.com/IlyaGrebnov/libbsc/archive/${version}.tar.gz"; - sha256 = "01yhizaf6qjv1plyrx0fcib264maa5qwvgfvvid9rzlzj9fxjib6"; + src = fetchFromGitHub { + owner = "IlyaGrebnov"; + repo = "libbsc"; + rev = version; + sha256 = "0c0jmirh9y23kyi1jnrm13sa3xsjn54jazfr84ag45pai279fciz"; }; enableParallelBuilding = true; buildInputs = lib.optional stdenv.isDarwin openmp; - prePatch = '' + postPatch = '' substituteInPlace makefile \ --replace 'g++' '$(CXX)' ''; - preInstall = '' - makeFlagsArray+=("PREFIX=$out") - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "High performance block-sorting data compression library"; homepage = "http://libbsc.com/"; + maintainers = with maintainers; [ ]; # Later commits changed the licence to Apache2 (no release yet, though) license = with licenses; [ lgpl3Plus ]; platforms = platforms.unix; diff --git a/pkgs/tools/compression/bsdiff/default.nix b/pkgs/tools/compression/bsdiff/default.nix index 8b5dfe919c7..8f8818781ab 100644 --- a/pkgs/tools/compression/bsdiff/default.nix +++ b/pkgs/tools/compression/bsdiff/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.3"; src = fetchurl { - url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; + url = "https://www.daemonology.net/bsdiff/${pname}-${version}.tar.gz"; sha256 = "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq"; }; @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { cp bspatch.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { description = "An efficient binary diff/patch tool"; - homepage = "http://www.daemonology.net/bsdiff"; - license = lib.licenses.bsd2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.thoughtpolice ]; + homepage = "https://www.daemonology.net/bsdiff/"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix index 07b6a5979a4..0dd703035fa 100644 --- a/pkgs/tools/compression/dejsonlz4/default.nix +++ b/pkgs/tools/compression/dejsonlz4/default.nix @@ -1,28 +1,30 @@ { lib, stdenv, fetchFromGitHub }: + stdenv.mkDerivation rec { - pname = "dejsonlz4"; - version = "1.1"; - src = fetchFromGitHub { - owner = "avih"; - repo = pname; - rev = "v${version}"; - sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; - }; + pname = "dejsonlz4"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "avih"; + repo = pname; + rev = "v${version}"; + sha256 = "0ggs69qamaama5mid07mhp95m1x42wljdb953lrwfr7p8p6f8czh"; + }; - buildPhase = '' - ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c - ''; + buildPhase = '' + ${stdenv.cc.targetPrefix}cc -o dejsonlz4 src/dejsonlz4.c src/lz4.c + ''; - installPhase = '' - mkdir -p $out/bin/ - cp dejsonlz4 $out/bin/ - ''; + installPhase = '' + mkdir -p $out/bin/ + cp dejsonlz4 $out/bin/ + ''; - meta = with lib; { - description = "Decompress Mozilla Firefox bookmarks backup files"; - homepage = "https://github.com/avih/dejsonlz4"; - license = licenses.bsd2; - maintainers = with maintainers; [ mt-caret ]; - platforms = platforms.all; - }; - } + meta = with lib; { + description = "Decompress Mozilla Firefox bookmarks backup files"; + homepage = "https://github.com/avih/dejsonlz4"; + license = licenses.bsd2; + maintainers = with maintainers; [ mt-caret ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix index 18efc1b64c2..664c1eb7856 100644 --- a/pkgs/tools/compression/gzrt/default.nix +++ b/pkgs/tools/compression/gzrt/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "gzrt-0.8"; + pname = "gzrt"; + version = "0.8"; src = fetchurl { - url = "https://www.urbanophile.com/arenn/coding/gzrt/${name}.tar.gz"; + url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${version}.tar.gz"; sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh"; }; @@ -15,10 +16,11 @@ stdenv.mkDerivation rec { cp gzrecover $out/bin ''; - meta = { + meta = with lib; { homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; description = "The gzip Recovery Toolkit"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index 73931f6bcae..9072a24b7fb 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -1,25 +1,26 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "kzipmix-20091108"; +stdenv.mkDerivation rec { + pname = "kzipmix"; + version = "20200115"; src = fetchurl { - url = "http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz"; - sha256 = "19gyn8pblffdz1bf3xkbpzx8a8wn3xb0v411pqzmz5g5l6pm5gph"; + url = "http://static.jonof.id.au/dl/kenutils/kzipmix-${version}-linux.tar.gz"; + sha256 = "sha256-ePgye0D6/ED53zx6xffLnYhkjed7SPU4BLOZQr9E3yA="; }; installPhase = '' mkdir -p $out/bin - cp kzip zipmix $out/bin + cp amd64/{kzip,zipmix} $out/bin patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix ''; - meta = { + meta = with lib; { description = "A tool that aggressively optimizes the sizes of Zip archives"; - license = lib.licenses.unfree; + license = licenses.unfree; homepage = "http://advsys.net/ken/utils.htm"; - maintainers = [ lib.maintainers.sander ]; + maintainers = [ maintainers.sander ]; }; } diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index ad36ebb81de..6d4017ac62c 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, gnulib, perl, autoconf, automake }: stdenv.mkDerivation rec { + pname = "lbzip2"; version = "2.5"; - name = "lbzip2-${version}"; src = fetchFromGitHub { owner = "kjn"; repo = "lbzip2"; - sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; rev = "v${version}"; + sha256 = "1h321wva6fp6khz6x0i6rqb76xh327nw6v5jhgjpcckwdarj5jv8"; }; buildInputs = [ gnulib perl ]; diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix index 77df84879b8..4f1ba702831 100644 --- a/pkgs/tools/compression/lhasa/default.nix +++ b/pkgs/tools/compression/lhasa/default.nix @@ -1,21 +1,24 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "lhasa"; + version = "0.3.1"; -stdenv.mkDerivation { - name = "lhasa-0.3.1"; src = fetchurl { - url = "https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz"; + url = "https://soulsphere.org/projects/lhasa/lhasa-${version}.tar.gz"; sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z"; }; - meta = { + + meta = with lib; { description = "Free Software replacement for the Unix LHA tool"; longDescription = '' Lhasa is a Free Software replacement for the Unix LHA tool, for decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for the tool is a library, so that it can be reused for other purposes. ''; - license = lib.licenses.isc; + license = licenses.isc; homepage = "http://fragglet.github.io/lhasa"; - maintainers = with lib; [ maintainers.sander ]; - platforms = with lib.platforms; linux ++ darwin; + maintainers = [ maintainers.sander ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 820389300e3..02f62c3e3c0 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -1,8 +1,8 @@ -{lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl}: +{ lib, stdenv, fetchurl, zlib, lzo, bzip2, lz4, nasm, perl }: stdenv.mkDerivation rec { - version = "0.641"; pname = "lrzip"; + version = "0.641"; src = fetchurl { url = "http://ck.kolivas.org/apps/lrzip/${pname}-${version}.tar.xz"; @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { "--disable-asm" ]; - meta = { + meta = with lib; { homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index be31048c218..8bf58d9cc35 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, lzo}: +{ lib, stdenv, fetchurl, lzo }: stdenv.mkDerivation rec { - name = "lzop-1.04"; + pname = "lzop"; + version = "1.04"; + src = fetchurl { - url = "https://www.lzop.org/download/${name}.tar.gz"; + url = "https://www.lzop.org/download/lzop-${version}.tar.gz"; sha256 = "0h9gb8q7y54m9mvy3jvsmxf21yx8fc3ylzh418hgbbv0i8mbcwky"; }; @@ -12,6 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.lzop.org"; description = "Fast file compressor"; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index a4cdcc08549..6dbe190c400 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,36 +1,34 @@ { lib, stdenv, fetchurl, zlib, util-linux }: -let name = "pigz"; - version = "2.6"; -in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + pname = "pigz"; + version = "2.6"; src = fetchurl { - url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; + url = "https://www.zlib.net/${pname}/${pname}-${version}.tar.gz"; sha256 = "sha256-Lu17DXRJ0dcJA/KmLNYAXSYus6jJ6YaHvIy7WAnbKn0="; }; enableParallelBuilding = true; - buildInputs = [zlib] ++ lib.optional stdenv.isLinux util-linux; + buildInputs = [ zlib ] ++ lib.optional stdenv.isLinux util-linux; makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" ]; doCheck = stdenv.isLinux; checkTarget = "tests"; - installPhase = - '' - install -Dm755 pigz "$out/bin/pigz" - ln -s pigz "$out/bin/unpigz" - install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" - ln -s pigz.1 "$out/share/man/man1/unpigz.1" - install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" + installPhase = '' + install -Dm755 pigz "$out/bin/pigz" + ln -s pigz "$out/bin/unpigz" + install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" + ln -s pigz.1 "$out/share/man/man1/unpigz.1" + install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" ''; meta = with lib; { - homepage = "http://www.zlib.net/pigz/"; + homepage = "https://www.zlib.net/pigz/"; description = "A parallel implementation of gzip for multi-core machines"; + maintainers = with maintainers; [ ]; license = licenses.zlib; platforms = platforms.unix; }; diff --git a/pkgs/tools/compression/pixz/default.nix b/pkgs/tools/compression/pixz/default.nix index bb504e85f61..ec05a44a518 100644 --- a/pkgs/tools/compression/pixz/default.nix +++ b/pkgs/tools/compression/pixz/default.nix @@ -1,25 +1,42 @@ -{ - lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config - , asciidoc, libxslt, libxml2, docbook_xml_dtd_45, docbook_xsl - , libarchive, xz +{ lib +, stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, pkg-config +, asciidoc +, libxslt +, libxml2 +, docbook_xml_dtd_45 +, docbook_xsl +, libarchive +, xz }: + stdenv.mkDerivation rec { - baseName = "pixz"; + pname = "pixz"; version = "1.0.7"; - name = "${baseName}-${version}"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - autoconf automake libtool asciidoc libxslt libxml2 - docbook_xml_dtd_45 docbook_xsl - libarchive xz + autoconf + automake + libtool + asciidoc + libxslt + libxml2 + docbook_xml_dtd_45 + docbook_xsl + libarchive + xz ]; preBuild = '' echo "XML_CATALOG_FILES='$XML_CATALOG_FILES'" ''; src = fetchFromGitHub { owner = "vasi"; - repo = baseName; + repo = pname; rev = "v${version}"; sha256 = "163axxs22w7pghr786hda22mnlpvmi50hzhfr9axwyyjl9n41qs2"; }; @@ -27,10 +44,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with lib; { description = "A parallel compressor/decompressor for xz format"; - license = lib.licenses.bsd2; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.unix; + license = licenses.bsd2; + maintainers = [ maintainers.raskin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch b/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch deleted file mode 100644 index fac8f1fc147..00000000000 --- a/pkgs/tools/compression/pxz/_SC_ARG_MAX.patch +++ /dev/null @@ -1,36 +0,0 @@ -From b8f9827fc4de9296c7a6f5e6fdac46e070cd6cb4 Mon Sep 17 00:00:00 2001 -From: Igor Pashev <pashev.igor@gmail.com> -Date: Sat, 1 Nov 2014 18:10:05 +0300 -Subject: [PATCH] Fixed crash on Linux when stack size is unlimited - ---- - pxz.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/pxz.c b/pxz.c -index 9cb843e..52713e2 100644 ---- a/pxz.c -+++ b/pxz.c -@@ -65,7 +65,7 @@ FILE **ftemp; - char str[0x100]; - char buf[BUFFSIZE]; - char *xzcmd; --size_t xzcmd_max; -+const size_t xzcmd_max = 10240; - - unsigned opt_complevel = 6, opt_stdout, opt_keep, opt_threads, opt_verbose; - unsigned opt_force, opt_stdout; -@@ -243,9 +243,12 @@ int main( int argc, char **argv ) { - lzma_filter filters[LZMA_FILTERS_MAX + 1]; - lzma_options_lzma lzma_options; - -- xzcmd_max = sysconf(_SC_ARG_MAX); - page_size = sysconf(_SC_PAGE_SIZE); - xzcmd = malloc(xzcmd_max); -+ if (!xzcmd) { -+ fprintf(stderr, "Failed to allocate %lu bytes for xz command.\n", xzcmd_max); -+ return -1; -+ } - snprintf(xzcmd, xzcmd_max, XZ_BINARY); - - parse_args(argc, argv); diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index eb1f5d3570b..4ea95a3f78a 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -1,21 +1,18 @@ -{ lib, stdenv, fetchgit, xz }: +{ lib, stdenv, fetchFromGitHub, xz }: -let name = "pxz"; - version = "4.999.9beta+git"; -in -stdenv.mkDerivation { - name = name + "-" + version; +stdenv.mkDerivation rec { + pname = "pxz"; + version = "4.999.9beta+git"; - src = fetchgit { - url = "https://github.com/jnovy/pxz.git"; - rev = "ae808463c2950edfdedb8fb49f95006db0a18667"; - sha256 = "0na2kw8cf0qd8l1aywlv9m3xrxnqlcwxfdwp3f7x9vxwqx3k32kc"; + src = fetchFromGitHub { + owner = "jnovy"; + repo = "pxz"; + rev = "124382a6d0832b13b7c091f72264f8f3f463070a"; + sha256 = "15mmv832iqsqwigidvwnf0nyivxf0y8m22j2szy4h0xr76x4z21m"; }; buildInputs = [ xz ]; - patches = [ ./_SC_ARG_MAX.patch ]; - buildPhase = '' gcc -o pxz pxz.c -llzma \ -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \ @@ -30,15 +27,18 @@ stdenv.mkDerivation { cp pxz.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { homepage = "https://jnovy.fedorapeople.org/pxz/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [pashev]; - description = ''Parallel XZ is a compression utility that takes advantage of + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pashev ]; + description = "compression utility that runs LZMA compression of different parts on multiple cores simultaneously"; + longDescription = '' + Parallel XZ is a compression utility that takes advantage of running LZMA compression of different parts of an input file on multiple cores and processors simultaneously. Its primary goal is to utilize all resources to speed up compression time with minimal possible influence - on compression ratio''; - platforms = with lib.platforms; linux; + on compression ratio + ''; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 60364afa9f3..5f878f8c494 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -1,9 +1,11 @@ -{lib, stdenv, fetchurl, fetchpatch, bzip2}: +{ lib, stdenv, fetchurl, fetchpatch, bzip2 }: + +stdenv.mkDerivation rec { + pname = "rzip"; + version = "2.1"; -stdenv.mkDerivation { - name = "rzip-2.1"; src = fetchurl { - url = "mirror://samba/rzip/rzip-2.1.tar.gz"; + url = "mirror://samba/rzip/rzip-${version}.tar.gz"; sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7"; }; buildInputs = [ bzip2 ]; @@ -16,10 +18,11 @@ stdenv.mkDerivation { }) ]; - meta = { + meta = with lib; { homepage = "https://rzip.samba.org/"; description = "Compression program"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 94921397e30..b92112a4816 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -1,20 +1,21 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "zsync-0.6.2"; + pname = "zsync"; + version = "0.6.2"; src = fetchurl { - url = "http://zsync.moria.org.uk/download/${name}.tar.bz2"; + url = "http://zsync.moria.org.uk/download/${pname}-${version}.tar.bz2"; sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b"; }; makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; - meta = { + meta = with lib; { homepage = "http://zsync.moria.org.uk/"; description = "File distribution system using the rsync algorithm"; - license = lib.licenses.free; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; all; + license = licenses.free; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; all; }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index acb2d41e045..aaef2dd2d08 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-atsfaoA0V9PPwhPTpHI7b7A5JsDiYHfA+0NlNOKYIPg="; + sha256 = "sha256-hdm1ObzN9pFLeO1ujobHxiQYnA+dg9zIp/qho6S0H78="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 560ad460471..cc2d979ca75 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nWfvRrKkUrr2owv9sLgORVPYp68/Ibdu/P1VddMb61s="; + sha256 = "sha256-eCHmMtndcQJqKmjxhkcLvjMUXApkSnH+7qyG7PDfcwo="; }; - cargoSha256 = "sha256-OmWn6Z/r/gXMD4gp/TDo0Hokliq8Qgb354q8ZFpVG2s="; + cargoSha256 = "sha256-wKCANWznOJMlQ8T2q39NNNRmgPYMpbkJhXpxojusNsE="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index a701fbd73b5..beaffadab97 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20210623.0"; + version = "20210719.0"; src = fetchPypi { inherit pname version; - sha256 = "0fc6xgi1naydm3wgk5lljnf6zggzdk6558cpyqlriw031gqnab77"; + sha256 = "sha256-gUZut9FsFHZ0zcTg+QDIdsM3EMvNFBawgBnt/Ia1BIc="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 37c37de8399..69a67a6e918 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "1.19.4"; + version = "1.20.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "029ykjk24h21b0s0gha6kv9pvgallin6marzkb2vfbvr3icsmbz2"; + sha256 = "sha256-saLcTiWqpxnE+li9ojfrEAh/vjB1c3K4kQzkrBJW3t4="; }; patches = [ @@ -36,12 +36,6 @@ with python.pkgs; buildPythonApplication rec { # drop coverage testing sed -i '/--cov/d' pytest.ini - - # migrate use of hypothesis internals to be compatible with hypothesis>=5.32.1 - # https://github.com/esphome/issues/issues/2021 - substituteInPlace tests/unit_tests/strategies.py --replace \ - "@st.defines_strategy_with_reusable_values" \ - "@st.defines_strategy(force_reusable_values=True)" ''; # Remove esptool and platformio from requirements diff --git a/pkgs/tools/misc/fcp/default.nix b/pkgs/tools/misc/fcp/default.nix index db4330e5b0f..7124e907845 100644 --- a/pkgs/tools/misc/fcp/default.nix +++ b/pkgs/tools/misc/fcp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fcp"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "svetlitski"; repo = pname; rev = "v${version}"; - sha256 = "0ahd79dh48hsi4bhs4zs0a7hr55jzsjix9c61lc42ipdbqgifg2d"; + sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x"; }; - cargoSha256 = "1arrw4fz3f3wfjy9nb8vm707vhh4x0vv9wv8z2s07b4qcwwih8k4"; + cargoSha256 = "0gw7gjfwc4r03rg6z65ml0y37sh4yf716isqs0mb4jqkp7rwfbc9"; nativeBuildInputs = [ expect ]; diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index fb69610e4ef..73d86e7dfc6 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -26,8 +26,6 @@ stdenv.mkDerivation { stripRoot = false; }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - buildInputs = [ makeWrapper libGLU libGL diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 1781187481f..aafdfe07ff9 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "system-config-printer"; - version = "1.5.12"; + version = "1.5.15"; src = fetchFromGitHub { owner = "openPrinting"; repo = pname; - rev = version; - sha256 = "1a812jsd9pb02jbz9bq16qj5j6k2kw44g7s1xdqqkg7061rd7mwf"; + rev = "v${version}"; + sha256 = "0a3v8fp1dfb5cwwpadc3f6mv608b5yrrqd8ddkmnrngizqwlswsc"; }; prePatch = '' @@ -26,17 +26,6 @@ stdenv.mkDerivation rec { patches = [ ./detect_serverbindir.patch - - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958104 - # (Fixes will be included in next upstream release.) - (fetchpatch { - url = "https://github.com/OpenPrinting/system-config-printer/commit/cf9903466c1a2d18a701f3b5e8c7e03483e1244d.patch"; - sha256 = "03gpav618w50q90m2kdkgwclc7fv17m493fgjd633zfavb5kqr3n"; - }) - (fetchpatch { - url = "https://github.com/OpenPrinting/system-config-printer/commit/b9289dfe105bdb502f183f0afe7a115ecae5f2af.patch"; - sha256 = "12w47hy3ly4phh8jcqxvdnd5sgbnbp8dnscjd7d5y2i43kxj7b23"; - }) ]; buildInputs = [ @@ -55,6 +44,10 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; + preConfigure = '' + intltoolize --copy --force --automake + ''; + configureFlags = [ "--with-udev-rules" "--with-udevdir=${placeholder "out"}/etc/udev" diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index 2900a64299f..c8d38d826d1 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.3"; + version = "0.4"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - sha256 = "sha256-hUwVp2tpKelbISQU/Q30yUeQfWp56dtgtfF/rpq1h5M="; + sha256 = "sha256-4EDEVSqjQ6Ybqx4BoNwE4pT5yFLYM05FBHc5deQU9f8="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; diff --git a/pkgs/tools/networking/cdpr/default.nix b/pkgs/tools/networking/cdpr/default.nix new file mode 100644 index 00000000000..6ac69b95dba --- /dev/null +++ b/pkgs/tools/networking/cdpr/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, libpcap }: + +stdenv.mkDerivation rec { + pname = "cdpr"; + version = "2.4"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tgz"; + sha256 = "1idyvyafkk0ifcbi7mc65b60qia6hpsdb6s66j4ggqp7if6vblrj"; + }; + + buildInputs = [ libpcap ]; + + installPhase = '' + install -Dm755 cdpr $out/bin/cdpr + ''; + + meta = with lib; { + description = "Cisco Discovery Protocol Reporter"; + homepage = "http://cdpr.sourceforge.net/"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.sgo ]; + }; +} diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 70b663edded..06ec1b5a83f 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-03-23T05-46-11Z"; + version = "2021-06-13T17-48-22Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-AtE9Zy8tRvcE+gYc0pqJDEFnXL4jSbJ4b6l3ZOe69Y4="; + sha256 = "sha256-u0WO7KSalDqlRwbN3b74FOb632fIGPZ2F0T8qLrvt+U="; }; - vendorSha256 = "sha256-cIr8d5jz4EfBFuOBZG4Kz20wSXy1Cni77V+JR6vLHwQ="; - - doCheck = false; + vendorSha256 = "sha256-BadW8AKHcrkCS3sXR7bqdgNhRYkfXIQOteMxIbiLvwg="; subPackages = [ "." ]; @@ -23,10 +21,15 @@ buildGoModule rec { sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/mc --version | grep ${version} > /dev/null + ''; + meta = with lib; { homepage = "https://github.com/minio/mc"; description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; - maintainers = with maintainers; [ eelco bachp ]; + maintainers = with maintainers; [ bachp eelco superherointj ]; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 97c758e19b4..54de621763c 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "telepresence2"; - version = "2.2.1"; + version = "2.3.6"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "0pr6vm68jr5ld7hy2b4dwmjziir59vg137c74rdn1wlhq3n8vr41"; + sha256 = "1bs4h450109vhy18kpyy6y4p5l9kvz4w09m56fxh5z547m5ax6k3"; }; - vendorSha256 = "0d0p879zchhrzrf6f5zc3vdcd5zi1ind7ibvb46y6wx6lp0f1nrp"; + vendorSha256 = "0xmw9mc0iy64kb12lsii4nn63ynh6gab9ls8z6mrizjjqz845sa5"; buildFlagsArray = '' -ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev} diff --git a/pkgs/tools/networking/vpnc-scripts/default.nix b/pkgs/tools/networking/vpnc-scripts/default.nix index 734c6d9f4ec..776e8450d13 100644 --- a/pkgs/tools/networking/vpnc-scripts/default.nix +++ b/pkgs/tools/networking/vpnc-scripts/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , makeWrapper -, nettools, gawk, systemd, openresolv, coreutils, gnugrep +, nettools, gawk, systemd, openresolv, coreutils, gnugrep, iproute2 }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { --replace "/usr/bin/resolvectl" "${systemd}/bin/resolvectl" '' + '' wrapProgram $out/bin/vpnc-script \ - --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv ])}" + --prefix PATH : "${lib.makeBinPath ([ nettools gawk coreutils gnugrep ] ++ lib.optionals stdenv.isLinux [ openresolv iproute2 ])}" ''; meta = with lib; { diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix index bd558b7ab66..e0252dac820 100644 --- a/pkgs/tools/security/ecryptfs/helper.nix +++ b/pkgs/tools/security/ecryptfs/helper.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0gp4m22zc80814ng80s38hp930aa8r4zqihr7jr23m0m2iq4pdpg"; }; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 2444d1f1d72..63f25bc12ef 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -61,7 +61,6 @@ let nativeBuildInputs = [ makeWrapper ]; buildInputs = [dpkg]; - phases = [ "unpackPhase" "installPhase" ]; unpackPhase = "dpkg -X $src ."; installPhase='' diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 37af42e33cc..176cc5e706b 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl ]; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/{bin,share} diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 547265196c6..c50b2a4c84e 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PByW1wj9B6aJhYZYPT1uUDUDVtZHGYC2ingvxdr8Gbc="; + sha256 = "sha256-hf5jTEAN5oOPg2PaAlYjIDMYcwXkaFAqPtWTwZV98N0="; }; vendorSha256 = "sha256-9W1K01PJ+tRLSJ0L7NGHXT5w5oHmlBkT8kwnOLOzSCc="; diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 56befbb1f81..dffbaaa8183 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { runVend = true; vendorSha256 = "06hl1npwmy9dvpf4kljvw8lwwiigm52wf106lmf9k6k2gi5ikprz"; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; preCheck = '' export HOME=$(mktemp -d) @@ -28,6 +28,5 @@ buildGoModule rec { changelog = "https://github.com/xxxserxxx/gotop/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; - platforms = platforms.unix; }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8c59db87b73..eeb6df85462 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -886,6 +886,7 @@ mapAliases ({ virtviewer = virt-viewer; # added 2015-12-24 virtmanager = virt-manager; # added 2019-10-29 virtmanager-qt = virt-manager-qt; # added 2019-10-29 + virtinst = throw "virtinst has been removed, as it's included in virt-manager"; # added 2021-07-21 vorbisTools = vorbis-tools; # added 2016-01-26 webkit = webkitgtk; # added 2019-03-05 webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b64a5bb748e..5f1225f4366 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -931,6 +931,10 @@ in cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; + coreterminal = libsForQt5.callPackage ../applications/terminal-emulators/coreterminal { + inherit (lxqt) qtermwidget; + }; + eterm = callPackage ../applications/terminal-emulators/eterm { }; evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); @@ -1155,6 +1159,8 @@ in argyllcms = callPackage ../tools/graphics/argyllcms {}; + arj = callPackage ../tools/archivers/arj { }; + arp-scan = callPackage ../tools/misc/arp-scan { }; inherit (callPackages ../data/fonts/arphic {}) @@ -3597,6 +3603,8 @@ in cdimgtools = callPackage ../tools/cd-dvd/cdimgtools { }; + cdpr = callPackage ../tools/networking/cdpr { }; + cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; @@ -6353,6 +6361,8 @@ in lf = callPackage ../tools/misc/lf {}; + lha = callPackage ../tools/archivers/lha { }; + lhasa = callPackage ../tools/compression/lhasa {}; libcpuid = callPackage ../tools/misc/libcpuid { }; @@ -6361,6 +6371,8 @@ in libscrypt = callPackage ../development/libraries/libscrypt { }; + libcprime = libsForQt5.callPackage ../development/libraries/libcprime { }; + libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; libcoap = callPackage ../applications/networking/libcoap { @@ -13949,7 +13961,9 @@ in nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; - nexus = callPackage ../development/tools/repository-managers/nexus { }; + nexus = callPackage ../development/tools/repository-managers/nexus { + jre_headless = jre8_headless; + }; nwjs = callPackage ../development/tools/nwjs { gconf = pkgs.gnome2.GConf; @@ -14351,6 +14365,8 @@ in todoist-electron = callPackage ../applications/misc/todoist-electron { }; + toil = callPackage ../applications/science/misc/toil { }; + travis = callPackage ../development/tools/misc/travis { }; tree-sitter = callPackage ../development/tools/parsing/tree-sitter { @@ -25664,6 +25680,8 @@ in mmtc = callPackage ../applications/audio/mmtc { }; + mnamer = callPackage ../applications/misc/mnamer { }; + moc = callPackage ../applications/audio/moc { }; mod-distortion = callPackage ../applications/audio/mod-distortion { }; @@ -25908,6 +25926,8 @@ in nootka = qt5.callPackage ../applications/audio/nootka { }; nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { }; + nwg-drawer = callPackage ../applications/misc/nwg-drawer { }; + nwg-launchers = callPackage ../applications/misc/nwg-launchers { }; nwg-menu = callPackage ../applications/misc/nwg-menu { }; @@ -27705,8 +27725,6 @@ in qtermwidget = lxqt.qtermwidget; }; - virtinst = callPackage ../applications/virtualization/virtinst {}; - virtscreen = callPackage ../tools/admin/virtscreen {}; virtual-ans = callPackage ../applications/audio/virtual-ans {}; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 06d7693006b..1ca8621b711 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -285,24 +285,24 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "*" ]; }; - Nuget = buildDotnetPackage { + Nuget = buildDotnetPackage rec { baseName = "Nuget"; - version = "4.9.1"; + version = "5.6.0.6489"; src = fetchFromGitHub { owner = "mono"; - repo = "nuget-binary"; - rev = "7871fa26914593fdb2f2500df1196df7b8aecb1c"; - sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz"; + repo = "linux-packaging-nuget"; + rev = "upstream/${version}.bin"; + sha256 = "sha256-71vjM7a+F0DNTY+dML3UBSkrVyXv/k5rdl7iXBKSpNM="; }; # configurePhase breaks the binary and results in # `File does not contain a valid CIL image.` dontConfigure = true; dontBuild = true; + dontPlacateNuget = true; outputFiles = [ "*" ]; - dllFiles = [ "NuGet*.dll" ]; exeFiles = [ "nuget.exe" ]; }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 34f99561601..4d4c172296a 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -30,6 +30,10 @@ let inherit lib; }; + mkNongnuPackages = { lib }: import ../applications/editors/emacs/elisp-packages/nongnu-packages.nix { + inherit lib; + }; + # Contains both melpa stable & unstable melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/melpa-packages.nix { inherit lib pkgs; @@ -53,12 +57,14 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ pkgs ? pkgs' , lib ? pkgs.lib , elpaPackages ? mkElpaPackages { inherit pkgs lib; } self + , nongnuPackages ? mkNongnuPackages { inherit lib; } self , melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self , melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self , orgPackages ? mkOrgPackages { inherit lib; } self , manualPackages ? mkManualPackages { inherit pkgs lib; } self }: ({} // elpaPackages // { inherit elpaPackages; } + // nongnuPackages // { inherit nongnuPackages; } // melpaStablePackages // { inherit melpaStablePackages; } // melpaPackages // { inherit melpaPackages; } // orgPackages // { inherit orgPackages; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4654534e6c..320115f6ad2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -199,6 +199,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; }; + addict = callPackage ../development/python-modules/addict { }; + addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; adext = callPackage ../development/python-modules/adext { }; @@ -2297,6 +2299,8 @@ in { enamlx = callPackage ../development/python-modules/enamlx { }; + enlighten = callPackage ../development/python-modules/enlighten { }; + enocean = callPackage ../development/python-modules/enocean { }; enrich = callPackage ../development/python-modules/enrich { }; @@ -5544,6 +5548,8 @@ in { precis-i18n = callPackage ../development/python-modules/precis-i18n { }; + prefixed = callPackage ../development/python-modules/prefixed { }; + pre-commit = callPackage ../development/python-modules/pre-commit { }; pre-commit-hooks = callPackage ../development/python-modules/pre-commit-hooks { }; @@ -7542,6 +7548,8 @@ in { requests-file = callPackage ../development/python-modules/requests-file { }; + requests-futures = callPackage ../development/python-modules/requests-futures { }; + requests-http-signature = callPackage ../development/python-modules/requests-http-signature { }; requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; |