diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3cb4c652e180..2a8852d64cb0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8166,6 +8166,17 @@ githubId = 56316606; name = "Amneesh Singh"; }; + nazarewk = { + name = "Krzysztof Nazarewski"; + email = "3494992+nazarewk@users.noreply.github.com"; + matrix = "@nazarewk:matrix.org"; + github = "nazarewk"; + githubId = 3494992; + keys = [{ + longkeyid = "rsa4096/0x916D8B67241892AE"; + fingerprint = "4BFF 0614 03A2 47F0 AA0B 4BC4 916D 8B67 2418 92AE"; + }]; + }; nbren12 = { email = "nbren12@gmail.com"; github = "nbren12"; diff --git a/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/nixos/modules/programs/zsh/zsh-autosuggestions.nix index a8fcfff95e59..fee324cc7326 100644 --- a/nixos/modules/programs/zsh/zsh-autosuggestions.nix +++ b/nixos/modules/programs/zsh/zsh-autosuggestions.nix @@ -36,6 +36,13 @@ in ''; }; + async = mkOption { + type = types.bool; + default = true; + description = "Whether to fetch suggestions asynchronously"; + example = false; + }; + extraConfig = mkOption { type = with types; attrsOf str; default = {}; @@ -56,6 +63,7 @@ in export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}" export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}") + ${optionalString (!cfg.async) "unset ZSH_AUTOSUGGEST_USE_ASYNC"} ${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)} ''; diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index cfbc8e91903e..88c5774d187c 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -314,6 +314,9 @@ let if [ -e renewed ]; then rm renewed ${data.postRun} + ${optionalString (data.reloadServices != []) + "systemctl --no-block try-reload-or-restart ${escapeShellArgs data.reloadServices}" + } fi ''); }; @@ -474,6 +477,15 @@ let description = "Group running the ACME client."; }; + reloadServices = mkOption { + type = types.listOf types.str; + default = []; + description = '' + The list of systemd services to call systemctl try-reload-or-restart + on. + ''; + }; + postRun = mkOption { type = types.lines; default = ""; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 9e9e5c28e5ef..9dd439fe8e93 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { downloadPage = "https://app-updates.agilebits.com/product_history/CLI"; maintainers = with maintainers; [ joelburget marsam ]; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/misc/cfm/default.nix b/pkgs/applications/misc/cfm/default.nix new file mode 100644 index 000000000000..50442f62b65e --- /dev/null +++ b/pkgs/applications/misc/cfm/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "cfm"; + version = "0.6.6"; + + src = fetchFromGitHub { + owner = "willeccles"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-uXL0RO9P+NYSZ0xCv91KzjHOJJI500YUT8IJkFS86pE="; + }; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ]; + + meta = with lib; { + description = "Simple and fast TUI file manager with no dependencies"; + license = licenses.mpl20; + maintainers = with maintainers; [ legendofmiracles ]; + homepage = "https://github.com/willeccles/cfm"; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/keepass-plugins/charactercopy/default.nix b/pkgs/applications/misc/keepass-plugins/charactercopy/default.nix new file mode 100644 index 000000000000..dbe203566f09 --- /dev/null +++ b/pkgs/applications/misc/keepass-plugins/charactercopy/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, buildEnv, fetchurl, mono }: + +let + version = "1.0.0"; + + drv = stdenv.mkDerivation { + pname = "keepass-charactercopy"; + inherit version; + + src = fetchurl { + url = "https://github.com/SketchingDev/Character-Copy/releases/download/v${version}/CharacterCopy.plgx"; + sha256 = "f8a81a60cd1aacc04c92a242479a8e4210452add019c52ebfbb1810b58d8800a"; + }; + + dontUnpack = true; + installPhase = '' + mkdir -p $out/lib/dotnet/keepass/ + cp $src $out/lib/dotnet/keepass/ + ''; + + meta = with lib; { + description = "Enables KeePass to copy individual characters by index"; + longDescription = '' + Character Copy is a lightweight KeePass plugin that integrates into KeePass' entry menu and + allows users to securely copy individual characters from + an entry's protected string fields, such as the password field + ''; + homepage = "https://github.com/SketchingDev/Character-Copy"; + platforms = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + ]; + # licensing info was found in source files https://github.com/SketchingDev/Character-Copy/search?q=license + license = licenses.gpl2; + maintainers = with maintainers; [ nazarewk ]; + }; + }; +in + # Mono is required to compile plugin at runtime, after loading. + buildEnv { name = drv.name; paths = [ mono drv ]; } diff --git a/pkgs/applications/misc/keepass-plugins/keetraytotp/default.nix b/pkgs/applications/misc/keepass-plugins/keetraytotp/default.nix new file mode 100644 index 000000000000..52cd719ca583 --- /dev/null +++ b/pkgs/applications/misc/keepass-plugins/keetraytotp/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, buildEnv, fetchurl, mono }: + +let + version = "0.108.0"; + + drv = stdenv.mkDerivation { + pname = "keepass-keetraytotp"; + inherit version; + + src = fetchurl { + url = "https://github.com/KeeTrayTOTP/KeeTrayTOTP/releases/download/v${version}/KeeTrayTOTP.plgx"; + sha256 = "4f7251a9bbb79cad04aee96d1809c6b36d43285a9f3834fef5330fc97ae8bc09"; + }; + + dontUnpack = true; + installPhase = '' + mkdir -p $out/lib/dotnet/keepass/ + cp $src $out/lib/dotnet/keepass/ + ''; + + meta = with lib; { + description = "Augments KeePass with TOTP user interface"; + longDescription = '' + This KeePass2 plugin adds advanced support for generating Time-based One-Time Passwords (TOTPs) + from the KeePass tray icon. It also provides a column in the main entry list to display and/or use TOTPs. + TOTPs can also be sent by auto-type. The plugin is compatible with Google, Dropbox, Steam, and many more services. + ''; + homepage = "https://github.com/KeeTrayTOTP/KeeTrayTOTP"; + platforms = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + ]; + license = licenses.gpl3; + maintainers = with maintainers; [ nazarewk ]; + }; + }; +in + # Mono is required to compile plugin at runtime, after loading. + buildEnv { name = drv.name; paths = [ mono drv ]; } diff --git a/pkgs/applications/misc/keepass-plugins/qrcodeview/default.nix b/pkgs/applications/misc/keepass-plugins/qrcodeview/default.nix new file mode 100644 index 000000000000..8e7ee2a49905 --- /dev/null +++ b/pkgs/applications/misc/keepass-plugins/qrcodeview/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, buildEnv, fetchurl, mono }: + +let + version = "1.0.4"; + + drv = stdenv.mkDerivation { + pname = "keepass-qrcodeview"; + inherit version; + + src = fetchurl { + url = "https://github.com/JanisEst/KeePassQRCodeView/releases/download/v${version}/KeePassQRCodeView.plgx"; + sha256 = "e13c9f02bb0d79b479ca0e92490b822b5b88f49bb18ba2954d3bbe0808f46e6d"; + }; + + dontUnpack = true; + installPhase = '' + mkdir -p $out/lib/dotnet/keepass/ + cp $src $out/lib/dotnet/keepass/ + ''; + + meta = with lib; { + description = "Enables KeePass to display data as QR code images"; + longDescription = '' + KeePassQRCodeView is a plugin for KeePass 2.x which shows QR codes for entry fields. + These codes can be scanned to copy the encoded data to the scanner (smartphone, ...) + ''; + homepage = "https://github.com/JanisEst/KeePassQRCodeView"; + platforms = [ + "aarch64-linux" + "i686-linux" + "x86_64-linux" + ]; + license = licenses.mit; + maintainers = with maintainers; [ nazarewk ]; + }; + }; +in + # Mono is required to compile plugin at runtime, after loading. + buildEnv { name = drv.name; paths = [ mono drv ]; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 35493aa31b7a..afcd55a2b54d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -17,6 +17,7 @@ let inherit (data) owner repo rev sha256; }; vendorSha256 = data.vendorSha256 or null; + deleteVendor = data.deleteVendor or false; # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index eda196530aab..03d2797fe391 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -34,11 +34,14 @@ "version": "1.8.0" }, "alicloud": { - "owner": "terraform-providers", + "deleteVendor": true, + "owner": "aliyun", + "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.86.0", - "sha256": "1hbv9ah7fd173sapwgsbg7790piwxw9zx90wfj5vz5b96ggbg28d", - "version": "1.86.0" + "rev": "v1.144.0", + "sha256": "14nphpz15p83n6fsvvrnaz96nb87wvb10ri21hlhlsm2579zcbqd", + "vendorSha256": "1k28fcfm7437i7gfbcbrigk2i50c1mix7z1rb2g617prih84wa6y", + "version": "1.144.0" }, "archive": { "owner": "hashicorp", diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 3aa5b4a8da82..774aea642d43 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,26 +1,35 @@ -{ stdenv, fetchurl, python3Packages, makeWrapper -, enablePlayer ? true, libvlc, qt5, lib }: +{ stdenv, lib, fetchurl, python3, makeWrapper +, libtorrent-rasterbar-1_2_x, qt5 +}: +let + libtorrent = (python3.pkgs.toPythonModule ( + libtorrent-rasterbar-1_2_x.override { python = python3; })).python; + + aiohttp-apispec = python3.pkgs.callPackage + ../../../../development/python-modules/aiohttp-apispec/unstable.nix { }; +in stdenv.mkDerivation rec { pname = "tribler"; - version = "7.4.4"; + version = "7.10.0"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "0hxiyf1k07ngym2p8r1b5mcx1y2crkyz43gi9sgvsvsyijyaff3p"; + sha256 = "1x45z23d1cqf0lai7wg5ki7gi2vba5hqk0swhggzplcjwma4wmh9"; }; nativeBuildInputs = [ - python3Packages.wrapPython + python3.pkgs.wrapPython makeWrapper ]; buildInputs = [ - python3Packages.python + python3.pkgs.python ]; - pythonPath = with python3Packages; [ - libtorrent-rasterbar + pythonPath = [ + libtorrent + ] ++ (with python3.pkgs; [ twisted netifaces pycrypto @@ -42,49 +51,44 @@ stdenv.mkDerivation rec { pony lz4 pyqtgraph + pyyaml + aiohttp + aiohttp-apispec + faker + sentry-sdk + pytest-asyncio + pytest-timeout + asynctest + yappi # there is a BTC feature, but it requires some unclear version of # bitcoinlib, so this doesn't work right now. # bitcoinlib - ]; - - postPatch = '' - ${lib.optionalString enablePlayer '' - substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')" - substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" \ - --replace "if vlc and vlc.plugin_path" "if vlc" \ - --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'" - ''} - ''; + ]); installPhase = '' mkdir -pv $out # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH. wrapPythonPrograms cp -prvd ./* $out/ - makeWrapper ${python3Packages.python}/bin/python $out/bin/tribler \ + makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \ --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ - --set _TRIBLERPATH $out \ - --set PYTHONPATH $out:$program_PYTHONPATH \ + --set _TRIBLERPATH $out/src \ + --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \ --set NO_AT_BRIDGE 1 \ --run 'cd $_TRIBLERPATH' \ - --add-flags "-O $out/run_tribler.py" \ - ${lib.optionalString enablePlayer '' - --prefix LD_LIBRARY_PATH : ${libvlc}/lib - ''} + --add-flags "-O $out/src/run_tribler.py" - mkdir -p $out/share/applications $out/share/icons $out/share/man/man1 - cp $out/Tribler/Main/Build/Ubuntu/tribler.desktop $out/share/applications/tribler.desktop - cp $out/Tribler/Main/Build/Ubuntu/tribler_big.xpm $out/share/icons/tribler.xpm - cp $out/Tribler/Main/Build/Ubuntu/tribler.1 $out/share/man/man1/tribler.1 + mkdir -p $out/share/applications $out/share/icons + cp $out/build/debian/tribler/usr/share/applications/tribler.desktop $out/share/applications/tribler.desktop + cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm ''; meta = with lib; { - maintainers = with maintainers; [ xvapx ]; + maintainers = with maintainers; [ xvapx viric ]; homepage = "https://www.tribler.org/"; description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; license = licenses.lgpl21; platforms = platforms.linux; - broken = true; # 2021-03-17 see https://github.com/NixOS/nixpkgs/issues/93053 }; } diff --git a/pkgs/applications/office/notion-app-enhanced/default.nix b/pkgs/applications/office/notion-app-enhanced/default.nix new file mode 100644 index 000000000000..d588580a8db9 --- /dev/null +++ b/pkgs/applications/office/notion-app-enhanced/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, lib, fetchurl }: +let + pname = "notion-app-enhanced"; + version = "2.0.16-5"; + name = "${pname}-v${version}"; + + src = fetchurl { + url = "https://github.com/notion-enhancer/notion-repackaged/releases/download/v${version}/Notion-Enhanced-${version}.AppImage"; + sha256 = "1v733b4clc9sjgb72fasmbqiyz26d09f3kmvd1nqshwp5d14dajz"; + }; + + appimageContents = appimageTools.extract { inherit name src; }; +in appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Notion Desktop builds with Notion Enhancer for Windows, MacOS and Linux."; + homepage = "https://github.com/notion-enhancer/desktop"; + license = licenses.unfree; + maintainers = with maintainers; [ sei40kr ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index acf647901e99..ec7f45c546c7 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-DJG8C7oSTf4YKeSVytN4pVF4qVImg1bsTYbnfkR+U94="; + sha256 = "sha256-PkVZag/h1KzOWsE6+61HIixs+DldrGk9khlZy7DEbC8="; }; - cargoSha256 = "sha256-mweH+ZIcNGGmoGUhnmZzaB5y14eO/XkHqrL8Nz/b3Jg="; + cargoSha256 = "sha256-o1HyPJ81g9fLA7CKQNKg1EctoIh3W0uGzKF2YNE+Ado="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix new file mode 100644 index 000000000000..a4f6255fae85 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -0,0 +1,47 @@ +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper }: + +stdenvNoCC.mkDerivation { + pname = "video-cutter"; + version = "unstable-2021-02-03"; + + src = fetchFromGitHub { + owner = "rushmj"; + repo = "mpv-video-cutter"; + rev = "718d6ce9356e63fdd47208ec44f575a212b9068a"; + sha256 = "sha256-ramID1DPl0UqEzevpqdYKb9aaW3CAy3Dy9CPb/oJ4eY="; + }; + + dontBuild = true; + dontCheck = true; + + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + substituteInPlace cutter.lua \ + --replace '~/.config/mpv/scripts/c_concat.sh' '${placeholder "out"}/share/mpv/scripts/c_concat.sh' + + # needs to be ran separately so that we can replace everything, and not every single mention explicitly + # original script places them in the scripts folder, just spawning unnecessary errors + # i know that hardcoding .config and especially the .mpv directory isn't best practice, but I didn't want to deviate too much from upstream + substituteInPlace cutter.lua \ + --replace '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter" + ''; + + installPhase = '' + install -Dm755 c_concat.sh $out/share/mpv/scripts/c_concat.sh + install cutter.lua $out/share/mpv/scripts/cutter.lua + + wrapProgram $out/share/mpv/scripts/c_concat.sh \ + --run "mkdir -p ~/.config/mpv/cutter/" + ''; + + passthru.scriptName = "cutter.lua"; + + meta = with lib; { + description = "Cut videos and concat them automatically"; + homepage = "https://github.com/rushmj/mpv-video-cutter"; + # repo doesn't have a license + license = licenses.unfree; + maintainers = with maintainers; [ legendofmiracles ]; + }; +} diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index c097489a33c4..28414c3756d9 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -80,7 +80,10 @@ let makeWrapper "${mpv}/Applications/mpv.app/Contents/MacOS/mpv" "$out/Applications/mpv.app/Contents/MacOS/mpv" ${mostMakeWrapperArgs} ''; - meta.mainProgram = "mpv"; + meta = { + inherit (mpv.meta) homepage description longDescription maintainers; + mainProgram = "mpv"; + }; }; in lib.makeOverridable wrapper diff --git a/pkgs/build-support/mono-dll-fixer/builder.sh b/pkgs/build-support/mono-dll-fixer/builder.sh deleted file mode 100644 index 67abc465a9bd..000000000000 --- a/pkgs/build-support/mono-dll-fixer/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup - -substitute $dllFixer $out --subst-var-by perl $perl/bin/perl -chmod +x $out diff --git a/pkgs/build-support/mono-dll-fixer/default.nix b/pkgs/build-support/mono-dll-fixer/default.nix index 8f7d1e795d79..09a986015eed 100644 --- a/pkgs/build-support/mono-dll-fixer/default.nix +++ b/pkgs/build-support/mono-dll-fixer/default.nix @@ -1,8 +1,11 @@ {stdenv, perl}: - stdenv.mkDerivation { name = "mono-dll-fixer"; - builder = ./builder.sh; dllFixer = ./dll-fixer.pl; + dontUnpack = true; + installPhase = '' + substitute $dllFixer $out --subst-var-by perl $perl/bin/perl + chmod +x $out + ''; inherit perl; } diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix index 4db7cf0dc392..1e0b901105cd 100644 --- a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix +++ b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix @@ -3,17 +3,8 @@ { shortTarget, originalCargoToml, target, RUSTFLAGS }: let - cargoSrc = stdenv.mkDerivation { - name = "cargo-src"; - preferLocalBuild = true; - phases = [ "installPhase" ]; - installPhase = '' - RUSTC_SRC=${rustPlatform.rustcSrc.override { minimalContent = false; }} ORIG_CARGO=${originalCargoToml} \ - ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} - mkdir -p $out - cp Cargo.toml $out/Cargo.toml - cp ${./Cargo.lock} $out/Cargo.lock - ''; + cargoSrc = import ../../sysroot/src.nix { + inherit stdenv rustPlatform buildPackages originalCargoToml; }; in rustPlatform.buildRustPackage { inherit target RUSTFLAGS; diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/update-lockfile.sh b/pkgs/build-support/rust/build-rust-package/sysroot/update-lockfile.sh deleted file mode 100755 index 83d29832384f..000000000000 --- a/pkgs/build-support/rust/build-rust-package/sysroot/update-lockfile.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p python3 python3.pkgs.toml cargo - -set -e - -HERE=$(dirname "${BASH_SOURCE[0]}") -NIXPKGS_ROOT="$HERE/../../../.." - -# https://unix.stackexchange.com/a/84980/390173 -tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-lockfile') - -cd "$tempdir" -nix-build -E "with import (/. + \"${NIXPKGS_ROOT}\") {}; pkgs.rustPlatform.rustcSrc.override { minimalContent = false; }" -RUSTC_SRC="$(pwd)/result" python3 "$HERE/cargo.py" -RUSTC_BOOTSTRAP=1 cargo build || echo "Build failure is expected. All that's needed is the lockfile." - -cp Cargo.lock "$HERE" - -rm -rf "$tempdir" - - diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/Cargo.lock b/pkgs/build-support/rust/sysroot/Cargo.lock similarity index 61% rename from pkgs/build-support/rust/build-rust-package/sysroot/Cargo.lock rename to pkgs/build-support/rust/sysroot/Cargo.lock index 61fcef61744e..6ec6da6ae6e2 100644 --- a/pkgs/build-support/rust/build-rust-package/sysroot/Cargo.lock +++ b/pkgs/build-support/rust/sysroot/Cargo.lock @@ -10,9 +10,9 @@ dependencies = [ [[package]] name = "compiler_builtins" -version = "0.1.36" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd0782e0a7da7598164153173e5a5d4d9b1da094473c98dce0ff91406112369" +checksum = "b6591c2442ee984e2b264638a8b5e7ae44fd47b32d28e3a08e2e9c3cdb0c2fb0" dependencies = [ "rustc-std-workspace-core", ] @@ -21,9 +21,22 @@ dependencies = [ name = "core" version = "0.0.0" +[[package]] +name = "nixpkgs-sysroot-stub-crate" +version = "0.0.0" +dependencies = [ + "alloc", + "compiler_builtins", + "core", +] + [[package]] name = "rustc-std-workspace-core" version = "1.99.0" dependencies = [ "core", ] + +[[patch.unused]] +name = "rustc-std-workspace-alloc" +version = "1.99.0" diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/cargo.py b/pkgs/build-support/rust/sysroot/cargo.py similarity index 68% rename from pkgs/build-support/rust/build-rust-package/sysroot/cargo.py rename to pkgs/build-support/rust/sysroot/cargo.py index 09f6fba6d1c8..9d970eff79e8 100644 --- a/pkgs/build-support/rust/build-rust-package/sysroot/cargo.py +++ b/pkgs/build-support/rust/sysroot/cargo.py @@ -6,7 +6,7 @@ orig_cargo = os.environ['ORIG_CARGO'] if 'ORIG_CARGO' in os.environ else None base = { 'package': { - 'name': 'alloc', + 'name': 'nixpkgs-sysroot-stub-crate', 'version': '0.0.0', 'authors': ['The Rust Project Developers'], 'edition': '2018', @@ -17,17 +17,19 @@ base = { 'features': ['rustc-dep-of-std', 'mem'], }, 'core': { - 'path': os.path.join(rust_src, 'libcore'), + 'path': os.path.join(rust_src, 'core'), + }, + 'alloc': { + 'path': os.path.join(rust_src, 'alloc'), }, - }, - 'lib': { - 'name': 'alloc', - 'path': os.path.join(rust_src, 'liballoc/lib.rs'), }, 'patch': { 'crates-io': { 'rustc-std-workspace-core': { - 'path': os.path.join(rust_src, 'tools/rustc-std-workspace-core'), + 'path': os.path.join(rust_src, 'rustc-std-workspace-core'), + }, + 'rustc-std-workspace-alloc': { + 'path': os.path.join(rust_src, 'rustc-std-workspace-alloc'), }, }, }, diff --git a/pkgs/build-support/rust/sysroot/src.nix b/pkgs/build-support/rust/sysroot/src.nix new file mode 100644 index 000000000000..3d11b62dd315 --- /dev/null +++ b/pkgs/build-support/rust/sysroot/src.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, rustPlatform, buildPackages +, originalCargoToml ? null +}: + +stdenv.mkDerivation { + name = "cargo-src"; + preferLocalBuild = true; + + unpackPhase = "true"; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + export RUSTC_SRC=${rustPlatform.rustLibSrc.override { }} + '' + + lib.optionalString (originalCargoToml != null) '' + export ORIG_CARGO=${originalCargoToml} + '' + + '' + ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} + mkdir -p $out/src + touch $out/src/lib.rs + cp Cargo.toml $out/Cargo.toml + cp ${./Cargo.lock} $out/Cargo.lock + ''; +} diff --git a/pkgs/build-support/rust/sysroot/update-lockfile.sh b/pkgs/build-support/rust/sysroot/update-lockfile.sh new file mode 100755 index 000000000000..d0596d1e5a62 --- /dev/null +++ b/pkgs/build-support/rust/sysroot/update-lockfile.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p python3 python3.pkgs.toml cargo + +set -eu pipefile + +HERE=$(readlink -e $(dirname "${BASH_SOURCE[0]}")) +NIXPKGS_ROOT="$HERE/../../../.." + +# https://unix.stackexchange.com/a/84980/390173 +tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-lockfile') +cd "$tempdir" +mkdir -p src +touch src/lib.rs + +RUSTC_SRC=$(nix-build "${NIXPKGS_ROOT}" -A pkgs.rustPlatform.rustLibSrc --no-out-link) + +ln -s $RUSTC_SRC/{core,alloc} ./ + +export RUSTC_SRC +python3 "$HERE/cargo.py" + +export RUSTC_BOOTSTRAP=1 +cargo generate-lockfile + +cp Cargo.lock "$HERE" + +rm -rf "$tempdir" diff --git a/pkgs/desktops/gnome/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix index 49aa1a021cf8..00ac8e40aad0 100644 --- a/pkgs/desktops/gnome/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -8,7 +8,8 @@ , gnome , gtksourceview4 , gjs -, webkitgtk_4_1 +, libsoup +, webkitgtk , icu , wrapGAppsHook , gst_all_1 @@ -48,11 +49,14 @@ stdenv.mkDerivation rec { gtksourceview4 gdk-pixbuf librsvg - webkitgtk_4_1 + libsoup + webkitgtk libepoxy gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly ]; # See https://github.com/NixOS/nixpkgs/issues/31168 diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix index 7e59bd974a25..f0c57f7fae8b 100644 --- a/pkgs/development/compilers/ghc/8.10.7.nix +++ b/pkgs/development/compilers/ghc/8.10.7.nix @@ -15,7 +15,7 @@ , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. - buildLlvmPackages, llvmPackages + buildTargetLlvmPackages, llvmPackages , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. @@ -122,7 +122,7 @@ let toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 1d31ffba4111..49f45d856270 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -14,7 +14,7 @@ , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. - buildLlvmPackages, llvmPackages + buildTargetLlvmPackages, llvmPackages , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. @@ -130,7 +130,7 @@ let toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; diff --git a/pkgs/development/compilers/ghc/9.0.1.nix b/pkgs/development/compilers/ghc/9.0.1.nix index c0f42680bb87..005333a8d83e 100644 --- a/pkgs/development/compilers/ghc/9.0.1.nix +++ b/pkgs/development/compilers/ghc/9.0.1.nix @@ -16,7 +16,7 @@ , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. - buildLlvmPackages, llvmPackages + buildTargetLlvmPackages, llvmPackages , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. @@ -117,7 +117,7 @@ let toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; diff --git a/pkgs/development/compilers/ghc/9.2.1.nix b/pkgs/development/compilers/ghc/9.2.1.nix index e43dea9cffb7..2ebbdc63ac93 100644 --- a/pkgs/development/compilers/ghc/9.2.1.nix +++ b/pkgs/development/compilers/ghc/9.2.1.nix @@ -16,7 +16,7 @@ , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. - buildLlvmPackages, llvmPackages + buildTargetLlvmPackages, llvmPackages , # If enabled, GHC will be built with the GPL-free but slower integer-simple # library instead of the faster but GPLed integer-gmp library. @@ -117,7 +117,7 @@ let toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 1010d460b030..f50b3b76e15d 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -21,7 +21,7 @@ , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. - buildLlvmPackages, llvmPackages + buildTargetLlvmPackages, llvmPackages , # If enabled, GHC will be built with the GPL-free but slightly slower native # bignum backend instead of the faster but GPLed gmp backend. @@ -130,7 +130,7 @@ let toolsForTarget = [ pkgsBuildTarget.targetPackages.stdenv.cc - ] ++ lib.optional useLLVM buildLlvmPackages.llvm; + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; targetCC = builtins.head toolsForTarget; diff --git a/pkgs/development/compilers/rust/rust-src.nix b/pkgs/development/compilers/rust/rust-src.nix index 489795ecec47..4239e92b0363 100644 --- a/pkgs/development/compilers/rust/rust-src.nix +++ b/pkgs/development/compilers/rust/rust-src.nix @@ -1,4 +1,4 @@ -{ stdenv, rustc, minimalContent ? true }: +{ lib, stdenv, rustc, minimalContent ? true }: stdenv.mkDerivation { name = "rust-src"; @@ -6,9 +6,20 @@ stdenv.mkDerivation { phases = [ "unpackPhase" "installPhase" ]; installPhase = '' mv src $out - rm -rf $out/{${if minimalContent - then "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,tools,vendor,stdarch" - else "ci,doc,etc,grammar,llvm-project,llvm-emscripten,rtstartup,rustllvm,test,vendor" - }} + rm -rf $out/{${lib.concatStringsSep "," ([ + "ci" + "doc" + "etc" + "grammar" + "llvm-project" + "llvm-emscripten" + "rtstartup" + "rustllvm" + "test" + "vendor" + ] ++ lib.optionals minimalContent [ + "tools" + "stdarch" + ])}} ''; } diff --git a/pkgs/development/dhall-modules/dhall-grafana.nix b/pkgs/development/dhall-modules/dhall-grafana.nix index f06a994a9a4c..d91b9c21895d 100644 --- a/pkgs/development/dhall-modules/dhall-grafana.nix +++ b/pkgs/development/dhall-modules/dhall-grafana.nix @@ -1,4 +1,4 @@ -{ dhallPackages, buildDhallGitHubPackage }: +{ buildDhallGitHubPackage, Prelude }: buildDhallGitHubPackage { name = "grafana"; @@ -7,5 +7,5 @@ buildDhallGitHubPackage { # 2021-11-12 rev = "d5630dc55deacf5100a99802a4df1d9680b263b3"; sha256 = "01320hpqgr5r4grsydmdl9yznmly1ssnlc9gcwa8rj1ah0a8xlgz"; - dependencies = [ dhallPackages.Prelude ]; + dependencies = [ Prelude ]; } diff --git a/pkgs/development/nim-packages/nim_builder/nim_builder.nim b/pkgs/development/nim-packages/nim_builder/nim_builder.nim index b8881b700047..90dcb46588b7 100644 --- a/pkgs/development/nim-packages/nim_builder/nim_builder.nim +++ b/pkgs/development/nim-packages/nim_builder/nim_builder.nim @@ -64,6 +64,19 @@ proc getNimbleValues(filePath, key: string): seq[string] = if s.len > 0 and s[0] == '"': s = s.unescape() +proc getOutputDir(name: string): string = + ## Return the output directory for output `name`. + ## If `name` is not a valid output then the first output + ## is returned as a default. + let outputs = splitWhitespace getEnv("outputs") + doAssert(outputs.len > 0) + if outputs.contains name: + result = getEnv(name) + if result == "": + result = getEnv("out") + if result == "": + result = getEnv(outputs[0], "/dev/null") + proc configurePhase*() = ## Generate "config.nims" which will be read by the Nim ## compiler during later phases. @@ -103,14 +116,14 @@ proc buildPhase*() = nf = getNimbleFilePath() bins = nf.getNimbleValues("bin") srcDir = nf.getNimbleValue("srcDir", ".") - binDir = getenv("outputBin", getenv("out", "/dev/null")) / "bin" + binDir = getOutputDir("bin") / "bin" if bins != @[]: for bin in bins: cmds.add("nim compile $# --outdir:$# $#" % [getenv"nimFlags", binDir, normalizedPath(srcDir / bin)]) if getEnvBool"nimDoc": echo "generating documentation" - let docDir = getenv("outputDoc", (getenv("out", "/dev/null") / "doc")) + let docDir = getOutputDir("doc") / "doc" for path in walkFiles(srcDir / "*.nim"): cmds.add("nim doc --outdir:$# $#" % [docDir, path]) if cmds.len > 0: @@ -126,7 +139,7 @@ proc installPhase*() = let nf = getNimbleFilePath() srcDir = nf.getNimbleValue("srcDir", ".") - devDir = getenv("outputDev", getenv("out", "/dev/null")) + devDir = getOutputDir "dev" echo "Install ", srcDir, " to ", devDir copyDir(normalizedPath(srcDir), normalizedPath(devDir / srcDir)) copyFile(nf, devDir / nf.extractFilename) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 701f187ee997..5d81328cf747 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -20,6 +20,7 @@ , "alex" , "alloy" , "asar" +, "audiosprite" , "autoprefixer" , "aws-azure-login" , "awesome-lint" @@ -209,6 +210,7 @@ , "npm-check-updates" , "npm-merge-driver" , {"npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0"} +, "nrm" , "ocaml-language-server" , "parcel-bundler" , "parsoid" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 955b684a9ff7..9df36a176197 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -346,13 +346,13 @@ let sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA=="; }; }; - "@babel/compat-data-7.16.0" = { + "@babel/compat-data-7.16.4" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.16.0"; + version = "7.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.0.tgz"; - sha512 = "DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz"; + sha512 = "1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q=="; }; }; "@babel/core-7.10.5" = { @@ -436,13 +436,13 @@ let sha512 = "3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA=="; }; }; - "@babel/helper-define-polyfill-provider-0.2.4" = { + "@babel/helper-define-polyfill-provider-0.3.0" = { name = "_at_babel_slash_helper-define-polyfill-provider"; packageName = "@babel/helper-define-polyfill-provider"; - version = "0.2.4"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz"; - sha512 = "OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ=="; + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz"; + sha512 = "7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg=="; }; }; "@babel/helper-explode-assignable-expression-7.16.0" = { @@ -535,13 +535,13 @@ let sha512 = "/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.16.0" = { + "@babel/helper-remap-async-to-generator-7.16.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.16.0"; + version = "7.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.0.tgz"; - sha512 = "MLM1IOMe9aQBqMWxcRw8dcb9jlM86NIw7KA0Wri91Xkfied+dE0QuBFSBjMNvqzmS0OSIDsMNC24dBEkPUi7ew=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.4.tgz"; + sha512 = "vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA=="; }; }; "@babel/helper-replace-supers-7.16.0" = { @@ -643,13 +643,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.16.3" = { + "@babel/parser-7.16.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.16.3"; + version = "7.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.3.tgz"; - sha512 = "dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz"; + sha512 = "6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" = { @@ -679,13 +679,13 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.16.0" = { + "@babel/plugin-proposal-async-generator-functions-7.16.4" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.16.0"; + version = "7.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz"; - sha512 = "nyYmIo7ZqKsY6P4lnVmBlxp9B3a96CscbLotlsNuktMHahkDwoPYEjXrZHU0Tj844Z9f1IthVxQln57mhkcExw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.4.tgz"; + sha512 = "/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg=="; }; }; "@babel/plugin-proposal-class-properties-7.16.0" = { @@ -1291,13 +1291,13 @@ let sha512 = "Dgs8NNCehHSvXdhEhln8u/TtJxfVwGYCgP2OOr5Z3Ar+B+zXicEOKNTyc+eca2cuEOMtjW6m9P9ijOt8QdqWkg=="; }; }; - "@babel/plugin-transform-runtime-7.16.0" = { + "@babel/plugin-transform-runtime-7.16.4" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.16.0"; + version = "7.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.0.tgz"; - sha512 = "zlPf1/XFn5+vWdve3AAhf+Sxl+MVa5VlwTwWgnLx23u4GlatSRQJ3Eoo9vllf0a9il3woQsT4SK+5Z7c06h8ag=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.4.tgz"; + sha512 = "pru6+yHANMTukMtEZGC4fs7XPwg35v8sj5CIEmE+gEkFljFiVJxEWxx/7ZDkTK+iZRYo1bFXBtfIN95+K3cJ5A=="; }; }; "@babel/plugin-transform-shorthand-properties-7.16.0" = { @@ -1372,13 +1372,13 @@ let sha512 = "jHLK4LxhHjvCeZDWyA9c+P9XH1sOxRd1RO9xMtDVRAOND/PczPqizEtVdx4TQF/wyPaewqpT+tgQFYMnN/P94A=="; }; }; - "@babel/preset-env-7.16.0" = { + "@babel/preset-env-7.16.4" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.16.0"; + version = "7.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.0.tgz"; - sha512 = "cdTu/W0IrviamtnZiTfixPfIncr2M1VqRrkjzZWlr1B4TVYimCFK5jkyOdP4qw2MrlKHi+b3ORj6x8GoCew8Dg=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.4.tgz"; + sha512 = "v0QtNd81v/xKj4gNKeuAerQ/azeNn/G1B1qMLeXOcV8+4TWlD2j3NV1u8q29SDFBXx/NBq5kyEAO+0mpRgacjA=="; }; }; "@babel/preset-flow-7.16.0" = { @@ -1480,13 +1480,13 @@ let sha512 = "IAdDC7T0+wEB4y2gbIL0uOXEYpiZEeuFUTVbdGq+UwCcF35T/tS8KrmMomEwEc5wBbyfH3PJVpTSUqrhPDXFcQ=="; }; }; - "@babel/standalone-7.16.3" = { + "@babel/standalone-7.16.4" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.16.3"; + version = "7.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.16.3.tgz"; - sha512 = "hoStDfHl2+EYUv1LNHhZTysa+lMSwIEkkT4HnDNX+F0zqvPdoE2QLF7qtkd45cgCGOwQjrvwe2mOKcX3f6Wr8A=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.16.4.tgz"; + sha512 = "FDRLwjeQfPm5jaHNuB+vwNyGCp24Ah3kEsbLzKmh0eSru+QCr4DmjgbRPoz71AwXLVtXU+l/i7MlVlIj5XO7Gw=="; }; }; "@babel/template-7.16.0" = { @@ -2074,31 +2074,31 @@ let sha512 = "zF/raM/lkhXeHf4I43OtK0gP9rBeEJFArscTVwLWOCIvNk21MJcNoTYoaGw+c056+Q+hJL0psGLO7QN+mxYH1A=="; }; }; - "@cspell/dict-public-licenses-1.0.3" = { + "@cspell/dict-public-licenses-1.0.4" = { name = "_at_cspell_slash_dict-public-licenses"; packageName = "@cspell/dict-public-licenses"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-1.0.3.tgz"; - sha512 = "sXjxOHJ9Q4rZvE1UbwpwJQ8EXO3fadKBjJIWmz0z+dZAbvTrmz5Ln1Ef9ruJvLPfwAps8m3TCV6Diz60RAQqHg=="; + url = "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-1.0.4.tgz"; + sha512 = "h4xULfVEDUeWyvp1OO19pcGDqWcBEQ7WGMp3QBHyYpjsamlzsyYYjCRSY2ZvpM7wruDmywSRFmRHJ/+uNFT7nA=="; }; }; - "@cspell/dict-python-2.0.4" = { + "@cspell/dict-python-2.0.5" = { name = "_at_cspell_slash_dict-python"; packageName = "@cspell/dict-python"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-2.0.4.tgz"; - sha512 = "71X/VnyFPm6OPEkqmoVXCJz28RvBgktxy6zF6D5TLt97LbWg2JyRrWSXaf2+seVoLnJQ5CHACxcs+jyEyLhBJA=="; + url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-2.0.5.tgz"; + sha512 = "WkyGYtNmUsOHsWixck7AxNvveDgVPqw0H51hzIY+/5u3c94wZUweIj0vfFOGIfOBq8e1ZxpjumKBxVDGXTmQkw=="; }; }; - "@cspell/dict-ruby-1.0.14" = { + "@cspell/dict-ruby-1.0.15" = { name = "_at_cspell_slash_dict-ruby"; packageName = "@cspell/dict-ruby"; - version = "1.0.14"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-1.0.14.tgz"; - sha512 = "XHBGN4U1y9rjRuqrCA+3yIm2TCdhwwHXpOEcWkNeyXm8K03yPnIrKFS+kap8GTTrLpfNDuFsrmkkQTa7ssXLRA=="; + url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-1.0.15.tgz"; + sha512 = "I76hJA///lc1pgmDTGUFHN/O8KLIZIU/8TgIYIGI6Ix/YzSEvWNdQYbANn6JbCynS0X+7IbZ2Ft+QqvmGtIWuA=="; }; }; "@cspell/dict-rust-1.0.23" = { @@ -2119,13 +2119,13 @@ let sha512 = "5V/R7PRbbminTpPS3ywgdAalI9BHzcEjEj9ug4kWYvBIGwSnS7T6QCFCiu+e9LvEGUqQC+NHgLY4zs1NaBj2vA=="; }; }; - "@cspell/dict-software-terms-2.0.9" = { + "@cspell/dict-software-terms-2.0.10" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.0.9.tgz"; - sha512 = "LhUmmJYD5Kzj04UgqPW7EvJ4eEVKkrPl4ki29ClwUg/uQNZh5JwcsxEMqh5+PHD7GggDqKPYcYZanytDELTZpg=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.0.10.tgz"; + sha512 = "/dosIEA8me3GcowzMxRE/H3rkEJ2cU8NgX6vlTf3hvdaqND3GAYZrzadlZQV1N3uCuroDq2YdoSr0uNVedmU9Q=="; }; }; "@cspell/dict-swift-1.0.1" = { @@ -3100,6 +3100,15 @@ let sha512 = "cdMaPZ8AiFz6ua6PUbP+LKbhwJbFXnrQ/mlnKGUyzDUZ3wp7vPLksnmLCBX6SHgSmjX7CbNVNLFYD5GmmjO4GQ=="; }; }; + "@grpc/proto-loader-0.6.7" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.7.tgz"; + sha512 = "QzTPIyJxU0u+r2qGe8VMl3j/W2ryhEvBv7hc42OjYfthSj370fUrb7na65rG6w3YLZS/fb8p89iTBobfWGDgdw=="; + }; + }; "@gulp-sourcemaps/identity-map-1.0.2" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; @@ -3568,22 +3577,22 @@ let sha512 = "s0jhnq/1X1IQQpKcAoUAd3KZ6X58nEjIi+vL4aC0iyDW6v2pmt8J5G/ilUZSbvplyJ2GdTMYi7NOCz2f3QAGZA=="; }; }; - "@jsii/check-node-1.44.0" = { + "@jsii/check-node-1.44.1" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.44.0"; + version = "1.44.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.44.0.tgz"; - sha512 = "f5yHUWdhPWav5Bf3O0BtT89LYg1YjLQib6LzroHXJOwCgQZdK9A+eZZ0bTmtWSEKd5UDhZmrN1JCXpZ7UzgpnA=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.44.1.tgz"; + sha512 = "VMwVQ3UJlbzLqPHaNCSn4YGFvInmlXPz85v7LEiXUyAkeiVybFZIk8MDw1+cX3AeqhxEAmnPWyyrkvPjyzhtLg=="; }; }; - "@jsii/spec-1.44.0" = { + "@jsii/spec-1.44.1" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.44.0"; + version = "1.44.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.44.0.tgz"; - sha512 = "q0hbiXrDqQ2FsM4RA/aKyB8Zy8oi7ukDBJt/kEMO8rN9RC5uQ5uxFoR6UTS3d3raQpyzXpAkfs7UQldvi65B3w=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.44.1.tgz"; + sha512 = "DyV/0mXsspMmqg0uUE39hGiNk2Jhm25fCa7bQwXQ5cowR4qBWXrPJgpvweFav1qvdBA4pI2zVWlO+0jEuM87ug=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -4252,13 +4261,13 @@ let sha512 = "/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg=="; }; }; - "@mapbox/node-pre-gyp-1.0.6" = { + "@mapbox/node-pre-gyp-1.0.7" = { name = "_at_mapbox_slash_node-pre-gyp"; packageName = "@mapbox/node-pre-gyp"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.6.tgz"; - sha512 = "qK1ECws8UxuPqOA8F5LFD90vyVU33W7N3hGfgsOVfrJaRVc8McC3JClTDHpeSbL9CBrOHly/4GsNPAvIgNZE+g=="; + url = "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.7.tgz"; + sha512 = "PplSvl4pJ5N3BkVjAdDzpPhVUPdC73JgttkR+LnBx2OORC1GCQsBjUeEuipf9uOaAM1SbxcdZFfR3KDTKm2S0A=="; }; }; "@mapbox/point-geometry-0.1.0" = { @@ -4549,13 +4558,13 @@ let sha512 = "ApwiSL2c9ObewdOE/sqt788P1C5lomBOHyO8nUBCr4ofErBCnYQ003NtJ8lS9OQZc11ximkbmgAZJjB8y6cCdA=="; }; }; - "@nestjs/schematics-8.0.4" = { + "@nestjs/schematics-8.0.5" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "8.0.4"; + version = "8.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.4.tgz"; - sha512 = "uEmEfuNuIgsNr4m0wEkXIIG6usegehnpwhtOoxXWwvKO0CFO3POAx4pOazPgC4ky6pJ0XROhE/8O55JtmEw0UQ=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.5.tgz"; + sha512 = "nK1hWQeLNbdhsiJDX/XJXLqq7nC6/xxC8CN+seFTQmly+H3gG2xaFnl6JPHURumuQaYJX8JEpC8m0+4tz+wvOg=="; }; }; "@netflix/nerror-1.1.3" = { @@ -5476,13 +5485,13 @@ let sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA=="; }; }; - "@prisma/engines-3.4.1-2.57771c0558568c7d08bd34c7248af5244ae16bd9" = { + "@prisma/engines-3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.4.1-2.57771c0558568c7d08bd34c7248af5244ae16bd9"; + version = "3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.4.1-2.57771c0558568c7d08bd34c7248af5244ae16bd9.tgz"; - sha512 = "NO4Q88k3CfUpYzfpDD+0wSVCqhaeljCFAGSe1XyvmXAOlMU2AAjCwmRn6S4UXlT9yEGB/LwFjdvGjcgfUQ+Mtw=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e.tgz"; + sha512 = "MqZUrxuLlIbjB3wu8LrRJOKcvR4k3dunKoI4Q2bPfAwLQY0XlpsLZ3TRVW1c32ooVk939p6iGNkaCUo63Et36g=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -5638,13 +5647,13 @@ let sha512 = "y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.68" = { + "@redocly/openapi-core-1.0.0-beta.69" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.68"; + version = "1.0.0-beta.69"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.68.tgz"; - sha512 = "ocvDC13Fr8USbBlBUgl8wQlRFBCNEqz6gVTNlQ8IFOglCKxmOeu4JqnFENNGow3ycKTl35c891clfCw1vPyPcQ=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.69.tgz"; + sha512 = "A05sPH8U26qQdZgkOQfHrL8dwY3twJ51/PY43WUuRqMdeZEu3SRcIdgLyXaIgR82ZnHC2Y/MnexE5QKtKObYJA=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -6475,6 +6484,15 @@ let sha512 = "a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg=="; }; }; + "@types/body-parser-1.19.2" = { + name = "_at_types_slash_body-parser"; + packageName = "@types/body-parser"; + version = "1.19.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; + }; + }; "@types/cacheable-request-6.0.2" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -9652,13 +9670,13 @@ let sha512 = "SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw=="; }; }; - "ajv-8.8.0" = { + "ajv-8.8.1" = { name = "ajv"; packageName = "ajv"; - version = "8.8.0"; + version = "8.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.8.0.tgz"; - sha512 = "L+cJ/+pkdICMueKR6wIx3VP2fjIx3yAhuvadUv/osv9yFD7OVZy442xFF+Oeu3ZvmhBGQzoF6mTSt+LUWBmGQg=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.8.1.tgz"; + sha512 = "6CiMNDrzv0ZR916u2T+iRunnD60uWmNn8SkdB44/6stVORUg0aAkWO7PkOhpCmjmW8f2I/G/xnowD66fxGyQJg=="; }; }; "ajv-errors-1.0.1" = { @@ -11875,13 +11893,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.1029.0" = { + "aws-sdk-2.1030.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1029.0"; + version = "2.1030.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1029.0.tgz"; - sha512 = "nCmaMPkJr3EATXaeqR3JeNC0GTDH2lJZ3Xq/ZCAW+yrfaPQWv8HqJJHBCNGtmk3FmcCoxc7ed/gEB8XSl0tocA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1030.0.tgz"; + sha512 = "to0STOb8DsSGuSsUb/WCbg/UFnMGfIYavnJH5ZlRCHzvCFjTyR+vfE8ku+qIZvfFM4+5MNTQC/Oxfun2X/TuyA=="; }; }; "aws-sdk-2.920.0" = { @@ -12262,31 +12280,31 @@ let sha1 = "1bc6f15b87f7ab1085d42b330b717657a2156500"; }; }; - "babel-plugin-polyfill-corejs2-0.2.3" = { + "babel-plugin-polyfill-corejs2-0.3.0" = { name = "babel-plugin-polyfill-corejs2"; packageName = "babel-plugin-polyfill-corejs2"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz"; - sha512 = "NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA=="; - }; - }; - "babel-plugin-polyfill-corejs3-0.3.0" = { - name = "babel-plugin-polyfill-corejs3"; - packageName = "babel-plugin-polyfill-corejs3"; version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz"; - sha512 = "JLwi9vloVdXLjzACL80j24bG6/T1gYxwowG44dg6HN/7aTPdyPbJJidf6ajoA3RPHHtW0j9KMrSOLpIZpAnPpg=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz"; + sha512 = "wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA=="; }; }; - "babel-plugin-polyfill-regenerator-0.2.3" = { + "babel-plugin-polyfill-corejs3-0.4.0" = { + name = "babel-plugin-polyfill-corejs3"; + packageName = "babel-plugin-polyfill-corejs3"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz"; + sha512 = "YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw=="; + }; + }; + "babel-plugin-polyfill-regenerator-0.3.0" = { name = "babel-plugin-polyfill-regenerator"; packageName = "babel-plugin-polyfill-regenerator"; - version = "0.2.3"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz"; - sha512 = "JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz"; + sha512 = "dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg=="; }; }; "babel-plugin-styled-components-1.13.3" = { @@ -13360,13 +13378,13 @@ let sha512 = "O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ=="; }; }; - "bipf-1.5.1" = { + "bipf-1.5.2" = { name = "bipf"; packageName = "bipf"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/bipf/-/bipf-1.5.1.tgz"; - sha512 = "SrLwMzrpETJDiH9z12EMcqtApgcQo9XsPi+S9Aodezu53ALcGjBBQ7+C+IWbsSCBlSvNEec8sqfh3itO/j/QUw=="; + url = "https://registry.npmjs.org/bipf/-/bipf-1.5.2.tgz"; + sha512 = "SbFwhfGEhrH/sZMpMVRxurqCk662DXDqBG2P7/wS0eO72viI1f2SHd66IPDVW1eDqQ+F7nBPsDmQ/dlgC5Pvlw=="; }; }; "bit-field-1.5.3" = { @@ -15674,22 +15692,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.1.35" = { + "cdk8s-1.1.36" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.1.35"; + version = "1.1.36"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.35.tgz"; - sha512 = "6hhAP+XivkMFKiqenOuBX+7D+5Ae6s+X8KF0TEoiwrrRFa1Wt5LvM7JGsJT7F7+jMNF+UAF53kxpffNZMCpOJA=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.36.tgz"; + sha512 = "LpjVRmypar0PCBxhbTOZ/nnWiI4L7pxSsQJ8k06uSjnVkcGVZLcPxF9kxoKCClp0/6+9MsEYdB6+GZ3h24JKZw=="; }; }; - "cdk8s-plus-22-1.0.0-beta.42" = { + "cdk8s-plus-22-1.0.0-beta.43" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.42"; + version = "1.0.0-beta.43"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.42.tgz"; - sha512 = "aC9H+ulFxXIafMhIj5w5KxTY3Fknjxztc2/uEPWZqB9K+aUozhfTTeVcBsmFuOw3p6LvI6Xbs6cJuJ2h7zCiDQ=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.43.tgz"; + sha512 = "AADIPGiIyUKHFyEiOY7kFlMVqcyrkx9oXS1X7R/uAGHnHW0pQC5lcUCrNJxmTcfvDn4p0OckeQMoTZ7eM0VT4g=="; }; }; "cdktf-0.7.0" = { @@ -17321,13 +17339,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.44.0" = { + "codemaker-1.44.1" = { name = "codemaker"; packageName = "codemaker"; - version = "1.44.0"; + version = "1.44.1"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.44.0.tgz"; - sha512 = "GrUjFBFDbMyykrmL9aGf7Viv2I+wAH9mnkW/5qCHsZw51LuZKAidBHp5nS3oT1mdkcIorjqUJjRSJ3LzslgFEQ=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.44.1.tgz"; + sha512 = "HB5V5qv80ET5l4Bx2tX0mcKJp4vt4AQWOfrTB0ChEQLzbQtwi6MqLonkMAVCJy0ZcBpTJJBkY5h13gKIYoubmg=="; }; }; "codepage-1.4.0" = { @@ -17897,13 +17915,13 @@ let sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; }; }; - "common-tags-1.8.1" = { + "common-tags-1.8.2" = { name = "common-tags"; packageName = "common-tags"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.1.tgz"; - sha512 = "uOZd85rJqrdEIE/JjhW5YAeatX8iqjjvVzIyfx7JL7G5r9Tep6YpYT9gEJWhWpVyDQEyzukWd6p2qULpJ8tmBw=="; + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz"; + sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="; }; }; "commondir-1.0.1" = { @@ -18798,6 +18816,15 @@ let sha512 = "f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw=="; }; }; + "cookie-parser-1.4.6" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz"; + sha512 = "z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA=="; + }; + }; "cookie-session-2.0.0-rc.1" = { name = "cookie-session"; packageName = "cookie-session"; @@ -19230,13 +19257,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-2.1.1" = { + "create-gatsby-2.2.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.1.1.tgz"; - sha512 = "TyTrJD5Wa2WTa5PVY3ng1aIo7vqyR3rmQJuGRNPNeRZIfrYBrMGILWIh8TV+pofTKiZsRhPPMmHlpDD62tqPcw=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.2.0.tgz"; + sha512 = "nQ3t2+qpSnepqxFeBrkL6os5TR2TN4Nc1cCX/3YCWzbMQ7etc54Yjsw/PRFBUFtbt9RJk/7CURtJKFHDNsHtZw=="; }; }; "create-graphback-1.0.1" = { @@ -23586,13 +23613,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-13.6.1" = { + "electron-13.6.2" = { name = "electron"; packageName = "electron"; - version = "13.6.1"; + version = "13.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/electron/-/electron-13.6.1.tgz"; - sha512 = "rZ6Y7RberigruefQpWOiI4bA9ppyT88GQF8htY6N1MrAgal5RrBc+Mh92CcGU7zT9QO+XO3DarSgZafNTepffQ=="; + url = "https://registry.npmjs.org/electron/-/electron-13.6.2.tgz"; + sha512 = "ZXx9t68yXftvNZVnQ7v2XHcnH+MPUF6LNStoz4MMXuWpkF9gq3qwjcYSqnbM4wiVkvWVHIyYvt1yemmStza9dQ=="; }; }; "electron-notarize-1.1.1" = { @@ -23631,13 +23658,13 @@ let sha512 = "U9dKi10V9w/BdIVB8a8dTKYLK3Q1d2WZ+Yo5qfM3XX/O4jI7KpnwgvWgGoVv0jTWPC2NlebF00ffWS/8NfUAtA=="; }; }; - "electron-to-chromium-1.3.899" = { + "electron-to-chromium-1.3.900" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.899"; + version = "1.3.900"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.899.tgz"; - sha512 = "w16Dtd2zl7VZ4N4Db+FIa7n36sgPGCKjrKvUUmp5ialsikvcQLjcJR9RWnlYNxIyEHLdHaoIZEqKsPxU9MdyBg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.900.tgz"; + sha512 = "SuXbQD8D4EjsaBaJJxySHbC+zq8JrFfxtb4GIr4E9n1BcROyMcRrJCYQNpJ9N+Wjf5mFp7Wp0OHykd14JNEzzQ=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -28241,31 +28268,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-3.1.3" = { + "gatsby-core-utils-3.2.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.1.3.tgz"; - sha512 = "+pg2i3DYVLzmJ/67SVGM+zVxerilGCbcgVxDoN58Y+Htv5TwogUWzPymfoFrJEsWGhlVKlYq7I8jVWSXPzwMHw=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.2.0.tgz"; + sha512 = "gPz02QD1kOGQmu49TZL8Fdo9rX8QBsA7XID0oXyIkZqkK80Tm1Uq1pOOfPE3cWSMEkzc71M79iKISCntk/wNuw=="; }; }; - "gatsby-recipes-1.1.3" = { + "gatsby-recipes-1.2.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-1.1.3.tgz"; - sha512 = "AdO9Y7vtpa0VSWXe3gZIeIUDJ6/j/MeAkpkuJHbbU8hix9gtbVPoOcmF8VFJUMALNRzhhFsgqRN2mK6jXJlang=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-1.2.0.tgz"; + sha512 = "v76Kt1EYBHwf5c9Ic8b0w/eEaDaRh3B/6spAVU6zN+VzEvQX3Oi/VckUyS2/anBOuSnOl3PJVWhFA3/aZpGuxw=="; }; }; - "gatsby-telemetry-3.1.3" = { + "gatsby-telemetry-3.2.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.1.3.tgz"; - sha512 = "vZSj67F4vzoqqK5CyNIRTDTWOqhBYkMey+i6swY3H51tehGTHRyzzOhJorQOJa76cQOcOMXr1/vvxX1T84Y96g=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.2.0.tgz"; + sha512 = "nLs/PPTPn7xPOiJxRe1Lmd8C0EVaH4rPT3KRT36ftaJBVDT5XhKfhR/tW9zirADD1k6pYW6vYvAQNFfKG5dpDg=="; }; }; "gauge-1.2.7" = { @@ -28295,6 +28322,15 @@ let sha512 = "6STz6KdQgxO4S/ko+AbjlFGGdGcknluoqU+79GOFCDqqyYj5OanQf9AjxwN0jCidtT+ziPMmPSt9E4hfQ0CwIQ=="; }; }; + "gauge-4.0.0" = { + name = "gauge"; + packageName = "gauge"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz"; + sha512 = "F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw=="; + }; + }; "gaxios-2.3.4" = { name = "gaxios"; packageName = "gaxios"; @@ -31717,6 +31753,15 @@ let sha512 = "PH5GBkXqFxw5+4eKaKRIkD23y6vRd/IXSl7IldyJxEXpDH9SEIXRORkBtkGni/ae2P7RVOw6Wxypd2tGXhha1w=="; }; }; + "humps-2.0.1" = { + name = "humps"; + packageName = "humps"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/humps/-/humps-2.0.1.tgz"; + sha1 = "dd02ea6081bd0568dc5d073184463957ba9ef9aa"; + }; + }; "hyperbeam-1.1.3" = { name = "hyperbeam"; packageName = "hyperbeam"; @@ -35687,13 +35732,13 @@ let sha512 = "M+opnlcNb1Ne5igms/OJn/e2ZyQgcCwmqqljuOsHXBMFm7vMOVLSjEUcBYcW7ifJeM1+XYg8+wfuAoZhqY1zCg=="; }; }; - "jsii-1.44.0" = { + "jsii-1.44.1" = { name = "jsii"; packageName = "jsii"; - version = "1.44.0"; + version = "1.44.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.44.0.tgz"; - sha512 = "6CRoO+swOmTyvuYbMzZJ89pCn3cbCLUUo8qLN9JLZhT5Pc8uJgCdCn67rK9Vu5LRgwI7thOKP2ij9TG+8Ejyng=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.44.1.tgz"; + sha512 = "KlMGUJoI6C8vy4MTuO7HkReyshSvvnDzB3oU+HqdGHj5/R+AmdCneGwRILSgCadUCMnyb+37ZPx/7SgUOjis9w=="; }; }; "jsii-pacmak-1.37.0" = { @@ -35705,40 +35750,40 @@ let sha512 = "cXLXAOyCqd/QNBy+OfcmMgj8UdNVbJJsKoM/C3SvRgdi+fpQlxh1iDTOcKUwd3/QgMuDMDLvKCCpLmq/YRjreA=="; }; }; - "jsii-pacmak-1.44.0" = { + "jsii-pacmak-1.44.1" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.44.0"; + version = "1.44.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.44.0.tgz"; - sha512 = "m6x3xQM20vi0jIXCpW4lIOYK4dS8jdOIi4mQNQcreraoskYSsrv9d2G2THXGPojF5ozNjnPBNgsIXaH4XdkZKw=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.44.1.tgz"; + sha512 = "3n/LJ5SliVPJS0Ex8CIvputTm7Osye0EhOhqrIAc6zhx/g8Ds2a0IVVKoW/q2ZSzVhgXuNX36kPtCoWmKlukeA=="; }; }; - "jsii-reflect-1.44.0" = { + "jsii-reflect-1.44.1" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.44.0"; + version = "1.44.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.44.0.tgz"; - sha512 = "mgyCUYXqLbOxkNgiENDuRnDB0S0pIKZvqFZPW7fMBTOU8XxVPhZD3DhFGEIj6cPtbTUbz18Kc5qKk3l8mEkmfg=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.44.1.tgz"; + sha512 = "VBWV8BcOSi78dPVJcO+EAPNSlr0afjecrpD3D/nwnVSmuRWpcTS0JJzqWCX5fbWBVdyWJEAPMBGCblUmQjgi7w=="; }; }; - "jsii-rosetta-1.44.0" = { + "jsii-rosetta-1.44.1" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.44.0"; + version = "1.44.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.44.0.tgz"; - sha512 = "6loHTZdcNLYs4JNi2Uwe9xY9caFGpKC/OPtj5Je1+zLx/MyiJeAhd448T+Tg8SXRRIZ549ZZ6Xn4COYZQVU+AA=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.44.1.tgz"; + sha512 = "IUgsbPeOf9JFuIqhnHXRnFp3w0RdCTNlCvLIOMIA2fJYf4hBzVCPdZjmK/sPyiLBEZrrFzgVOK9KG295rtZ+JA=="; }; }; - "jsii-srcmak-0.1.400" = { + "jsii-srcmak-0.1.401" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.400"; + version = "0.1.401"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.400.tgz"; - sha512 = "7FVK/c8VBb33mqUYDHJ5JnnW6xmGFyf7Z5LWf2yVAD1FXk3kj4BYpcnJ5K7eDHpY60PtNeivEzM8vJrrDqPIpQ=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.401.tgz"; + sha512 = "fazX2Ry91rUV5fa6OGeq0fBGMCk1Y+ipXTQTq6YZ6GddAXLQ3Gt+5Jo5B1Rv427zV8ymb10fSKpJIRjLZtXvVg=="; }; }; "json-bigint-1.0.0" = { @@ -36029,13 +36074,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.53" = { + "json2jsii-0.2.54" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.53"; + version = "0.2.54"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.53.tgz"; - sha512 = "mofX4sQEkIJWtFn6ZLZZwOpPd/T0KLgiVCN8jFgSxYiED36xp9CXkU+UV3lPRiUMGhDmo/brXRuQ8U7vRutgCg=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.54.tgz"; + sha512 = "ZboprQFOxnPNsa62xt0ZbgAzCq2JJZoh1mU/gSgiB0Lx1PmScVp9/ByYo7lwU8OZ4r0DMSrGYdHnwV1PvOrbeg=="; }; }; "json3-3.2.6" = { @@ -44807,6 +44852,15 @@ let sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; + "npm-7.24.2" = { + name = "npm"; + packageName = "npm"; + version = "7.24.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-7.24.2.tgz"; + sha512 = "120p116CE8VMMZ+hk8IAb1inCPk4Dj3VZw29/n2g6UI77urJKVYb7FZUDW8hY+EBnfsjI/2yrobBgFyzo7YpVQ=="; + }; + }; "npm-bundled-1.1.2" = { name = "npm-bundled"; packageName = "npm-bundled"; @@ -45068,6 +45122,15 @@ let sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw=="; }; }; + "npmlog-6.0.0" = { + name = "npmlog"; + packageName = "npmlog"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz"; + sha512 = "03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q=="; + }; + }; "nprogress-0.2.0" = { name = "nprogress"; packageName = "nprogress"; @@ -45807,6 +45870,15 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; + "only-0.0.2" = { + name = "only"; + packageName = "only"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/only/-/only-0.0.2.tgz"; + sha1 = "2afde84d03e50b9a8edc444e30610a70295edfb4"; + }; + }; "onml-2.1.0" = { name = "onml"; packageName = "onml"; @@ -45816,13 +45888,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.44.0" = { + "oo-ascii-tree-1.44.1" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.44.0"; + version = "1.44.1"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.44.0.tgz"; - sha512 = "31f6M3ID8HKIOOAlyQWlURL0koXyEgjF0U1fiu2BuV8TepwCUDUy6MnKHE/72H9cXAwnBXpJHf0dun4B8D3AlA=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.44.1.tgz"; + sha512 = "SUlqChjq2UkCeBwwf1CkBzVobv4ATbCa81VVf9+GbMrrG0T5NDOpeMvFrIWyofc49vTIpC3Akn24qDUB0cW2Og=="; }; }; "opal-runtime-1.0.11" = { @@ -52450,13 +52522,13 @@ let sha512 = "CdVAoFNNDn5uAgYOJ8J3ICSaFzaMOa95XnYcX+taj4jirJuRASiTyQSOGR+Z0K8ZkBGuj0A8ivyeRAWuxRCgQA=="; }; }; - "random-access-memory-3.1.3" = { + "random-access-memory-3.1.4" = { name = "random-access-memory"; packageName = "random-access-memory"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.1.3.tgz"; - sha512 = "PTNiZXth70psEIZpmCivnBWzRyAsVyU9wDOfcDn7HvSADP2q7IY5KeTFCJJ3N0+DU0OxhMbjWD5n9udiyu3qsg=="; + url = "https://registry.npmjs.org/random-access-memory/-/random-access-memory-3.1.4.tgz"; + sha512 = "rqgqd/8ec65gbpKaYHnDOW391OR39d+eXn8NI87G+f3sUKrtGib9jC+/5/9MBFBwwHAZIS8RLJ8yyB4etzbYTA=="; }; }; "random-access-storage-1.3.0" = { @@ -52648,6 +52720,15 @@ let sha512 = "9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA=="; }; }; + "raw-body-2.4.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz"; + sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; + }; + }; "raw-loader-3.1.0" = { name = "raw-loader"; packageName = "raw-loader"; @@ -53611,13 +53692,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "redux-4.0.5" = { + "redux-4.1.2" = { name = "redux"; packageName = "redux"; - version = "4.0.5"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz"; - sha512 = "VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w=="; + url = "https://registry.npmjs.org/redux/-/redux-4.1.2.tgz"; + sha512 = "SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw=="; }; }; "reflect-metadata-0.1.13" = { @@ -58390,13 +58471,13 @@ let sha512 = "WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g=="; }; }; - "socket.io-adapter-2.3.2" = { + "socket.io-adapter-2.3.3" = { name = "socket.io-adapter"; packageName = "socket.io-adapter"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.2.tgz"; - sha512 = "PBZpxUPYjmoogY0aoaTmo1643JelsaS1CiAwNjRVdrI0X9Seuc19Y2Wife8k88avW6haG8cznvwbubAZwH4Mtg=="; + url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz"; + sha512 = "Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ=="; }; }; "socket.io-client-1.0.6" = { @@ -59758,13 +59839,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.129" = { + "sscaff-1.2.130" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.129"; + version = "1.2.130"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.129.tgz"; - sha512 = "S9j7nQ83ETJv+NV9nV6Dr5gOAD/gnzMwlf9LLzDEPuwvDolXkIN9kFnzi+Sqxb0zoHxev7t+2342qbcsU0ORgg=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.130.tgz"; + sha512 = "wEjGj5n7bfN9VzufXm3xOqf2TqAbl3xJN5sEv64+ycT4BTR24Y9GygWzaKf3bbL48k+fNUhSg/7qgpbKyZevbg=="; }; }; "ssh-config-1.1.6" = { @@ -72261,7 +72342,7 @@ in }) sources."queue-tick-1.0.0" sources."random-access-file-2.2.0" - sources."random-access-memory-3.1.3" + sources."random-access-memory-3.1.4" sources."random-access-storage-1.4.2" sources."random-words-1.1.1" sources."randombytes-2.1.0" @@ -72439,7 +72520,7 @@ in sha512 = "7EpRhhrJqICbMGjLkdthQYLLGMXNCsrsq8/xxYX1cdRiNwoGb84yjL1WFBrnQtaM8rXShOvhf4lrM2W0K9m4lQ=="; }; dependencies = [ - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@medable/mdctl-api-1.0.62" sources."@medable/mdctl-core-1.0.62" sources."@medable/mdctl-core-schemas-1.0.62" @@ -73482,7 +73563,14 @@ in sources."supports-color-5.5.0" ]; }) - sources."@nestjs/schematics-8.0.4" + (sources."@nestjs/schematics-8.0.5" // { + dependencies = [ + sources."@angular-devkit/core-13.0.2" + sources."@angular-devkit/schematics-13.0.2" + sources."ajv-8.6.3" + sources."ajv-formats-2.1.1" + ]; + }) sources."@types/eslint-7.29.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" @@ -73547,7 +73635,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.3" // { @@ -73861,7 +73949,7 @@ in sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.0" + sources."@babel/compat-data-7.16.4" sources."@babel/core-7.16.0" sources."@babel/generator-7.16.0" sources."@babel/helper-annotate-as-pure-7.16.0" @@ -73869,7 +73957,7 @@ in sources."@babel/helper-compilation-targets-7.16.3" sources."@babel/helper-create-class-features-plugin-7.16.0" sources."@babel/helper-create-regexp-features-plugin-7.16.0" - sources."@babel/helper-define-polyfill-provider-0.2.4" + sources."@babel/helper-define-polyfill-provider-0.3.0" sources."@babel/helper-explode-assignable-expression-7.16.0" sources."@babel/helper-function-name-7.16.0" sources."@babel/helper-get-function-arity-7.16.0" @@ -73879,7 +73967,7 @@ in sources."@babel/helper-module-transforms-7.16.0" sources."@babel/helper-optimise-call-expression-7.16.0" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.16.0" + sources."@babel/helper-remap-async-to-generator-7.16.4" sources."@babel/helper-replace-supers-7.16.0" sources."@babel/helper-simple-access-7.16.0" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" @@ -73889,10 +73977,10 @@ in sources."@babel/helper-wrap-function-7.16.0" sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" - sources."@babel/plugin-proposal-async-generator-functions-7.16.0" + sources."@babel/plugin-proposal-async-generator-functions-7.16.4" sources."@babel/plugin-proposal-class-properties-7.16.0" sources."@babel/plugin-proposal-class-static-block-7.16.0" sources."@babel/plugin-proposal-dynamic-import-7.16.0" @@ -73957,7 +74045,7 @@ in sources."@babel/plugin-transform-typescript-7.16.1" sources."@babel/plugin-transform-unicode-escapes-7.16.0" sources."@babel/plugin-transform-unicode-regex-7.16.0" - sources."@babel/preset-env-7.16.0" + sources."@babel/preset-env-7.16.4" sources."@babel/preset-flow-7.16.0" sources."@babel/preset-modules-0.1.5" sources."@babel/preset-typescript-7.16.0" @@ -74107,9 +74195,9 @@ in sources."aws4-1.11.0" sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" - sources."babel-plugin-polyfill-corejs2-0.2.3" - sources."babel-plugin-polyfill-corejs3-0.3.0" - sources."babel-plugin-polyfill-regenerator-0.2.3" + sources."babel-plugin-polyfill-corejs2-0.3.0" + sources."babel-plugin-polyfill-corejs3-0.4.0" + sources."babel-plugin-polyfill-regenerator-0.3.0" sources."backo2-1.0.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -74290,7 +74378,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.899" + sources."electron-to-chromium-1.3.900" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -75193,7 +75281,7 @@ in sources."@babel/generator-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/template-7.16.0" sources."@babel/types-7.16.0" sources."@webassemblyjs/ast-1.11.1" @@ -75753,7 +75841,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.0" + sources."@babel/compat-data-7.16.4" (sources."@babel/core-7.16.0" // { dependencies = [ sources."source-map-0.5.7" @@ -75779,7 +75867,7 @@ in sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/template-7.16.0" sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" @@ -75800,7 +75888,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.899" + sources."electron-to-chromium-1.3.900" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -75931,7 +76019,7 @@ in dependencies = [ sources."browserslist-4.18.1" sources."caniuse-lite-1.0.30001280" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" sources."escalade-3.1.1" sources."fraction.js-4.1.2" sources."node-releases-2.0.1" @@ -75966,7 +76054,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1029.0" // { + (sources."aws-sdk-2.1030.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -75983,7 +76071,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.10" @@ -76043,7 +76131,7 @@ in sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."htmlparser2-6.1.0" - sources."http-errors-1.7.3" + sources."http-errors-1.8.1" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -76101,7 +76189,7 @@ in ]; }) sources."querystring-0.2.0" - sources."raw-body-2.4.1" + sources."raw-body-2.4.2" sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" @@ -76114,7 +76202,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."signal-exit-3.0.5" sources."smart-buffer-4.2.0" sources."socks-2.6.1" @@ -76133,7 +76221,7 @@ in sources."tar-stream-2.2.0" sources."through-2.3.8" sources."tmp-0.0.33" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."tslib-2.3.1" sources."type-check-0.3.2" sources."type-fest-0.21.3" @@ -76614,7 +76702,7 @@ in sources."@protobufjs/utf8-1.1.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/body-parser-1.19.1" + sources."@types/body-parser-1.19.2" sources."@types/caseless-0.12.2" sources."@types/connect-3.4.35" sources."@types/express-4.17.13" @@ -76630,7 +76718,7 @@ in sources."@types/ws-8.2.0" sources."abort-controller-3.0.0" sources."accepts-1.3.7" - sources."ajv-8.8.0" + sources."ajv-8.8.1" sources."ansi-0.3.1" (sources."ansi-align-3.0.1" // { dependencies = [ @@ -77940,7 +78028,7 @@ in sources."browser-sync-ui-2.27.7" sources."bs-recipes-1.3.4" sources."bs-snippet-injector-2.0.1" - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."camelcase-5.3.1" sources."chalk-1.1.3" sources."chokidar-3.5.2" @@ -78005,7 +78093,7 @@ in sources."has-ansi-2.0.0" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - (sources."http-errors-1.7.3" // { + (sources."http-errors-1.8.1" // { dependencies = [ sources."statuses-1.5.0" ]; @@ -78058,7 +78146,7 @@ in sources."portscanner-2.1.1" sources."qs-6.2.3" sources."range-parser-1.2.1" - sources."raw-body-2.4.1" + sources."raw-body-2.4.2" sources."readdirp-3.6.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -78092,7 +78180,7 @@ in sources."serve-static-1.13.2" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" (sources."socket.io-2.4.0" // { dependencies = [ sources."component-emitter-1.2.1" @@ -78118,7 +78206,7 @@ in sources."tfunk-4.0.0" sources."to-array-0.1.4" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."ua-parser-js-1.0.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -78170,7 +78258,7 @@ in sources."@babel/code-frame-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/types-7.16.0" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" @@ -78257,8 +78345,8 @@ in sources."constantinople-4.0.1" sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.4.0" - sources."cookie-parser-1.4.5" + sources."cookie-0.4.1" + sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."create-hash-1.2.0" @@ -78268,6 +78356,7 @@ in sources."csrf-3.1.0" (sources."csurf-1.11.0" // { dependencies = [ + sources."cookie-0.4.0" sources."http-errors-1.7.3" ]; }) @@ -78311,13 +78400,13 @@ in sources."event-loop-stats-1.3.0" (sources."express-4.17.1" // { dependencies = [ + sources."cookie-0.4.0" sources."debug-2.6.9" ]; }) sources."express-async-handler-1.2.0" (sources."express-session-1.17.2" // { dependencies = [ - sources."cookie-0.4.1" sources."debug-2.6.9" sources."depd-2.0.0" sources."safe-buffer-5.2.1" @@ -79098,7 +79187,7 @@ in sources."buffer-crc32-0.2.13" sources."buffer-equal-0.0.1" sources."buffer-from-1.1.2" - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."camelcase-4.1.0" @@ -79260,7 +79349,7 @@ in ]; }) sources."hosted-git-info-2.8.9" - sources."http-errors-1.7.3" + sources."http-errors-1.8.1" (sources."https-proxy-agent-2.2.4" // { dependencies = [ sources."debug-3.2.7" @@ -79449,7 +79538,7 @@ in }) sources."query-string-6.14.1" sources."quick-lru-1.1.0" - sources."raw-body-2.4.1" + sources."raw-body-2.4.2" sources."rc-1.2.8" sources."read-pkg-3.0.0" sources."read-pkg-up-3.0.0" @@ -79478,7 +79567,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.5" @@ -79577,7 +79666,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."trim-newlines-2.0.0" sources."tslib-1.14.1" sources."typedarray-0.0.6" @@ -79636,17 +79725,17 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.31"; + version = "1.0.32"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.31.tgz"; - sha512 = "xaViO1Divm4/4v+oTlYV28MohHaoT4vNI2T4M9I/6oAHF1yNiSJWWd76mjOICVIoAi7OpjBj5YtyBrXcmq9pzA=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.32.tgz"; + sha512 = "p+Z7vvQ8X5GHmdCI+LNv2ITNhH4OiZ4Tk32oQAfCwEeA04PRbu/sk/W8YLSsyd9eOWo0xs+elskMk0VUnUulGA=="; }; dependencies = [ - sources."@jsii/check-node-1.44.0" - sources."@jsii/spec-1.44.0" + sources."@jsii/check-node-1.44.1" + sources."@jsii/spec-1.44.1" sources."@types/node-12.20.37" sources."@xmldom/xmldom-0.7.5" - sources."ajv-8.8.0" + sources."ajv-8.8.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."at-least-node-1.0.0" @@ -79654,12 +79743,12 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.1" sources."case-1.6.3" - sources."cdk8s-1.1.35" - sources."cdk8s-plus-22-1.0.0-beta.42" + sources."cdk8s-1.1.36" + sources."cdk8s-plus-22-1.0.0-beta.43" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.44.0" // { + (sources."codemaker-1.44.1" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -79724,38 +79813,38 @@ in sources."is-weakref-1.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.44.0" // { + (sources."jsii-1.44.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.44.0" // { + (sources."jsii-pacmak-1.44.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.44.0" // { + (sources."jsii-reflect-1.44.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.44.0" // { + (sources."jsii-rosetta-1.44.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.400" // { + (sources."jsii-srcmak-0.1.401" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.53" + sources."json2jsii-0.2.54" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -79771,7 +79860,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.44.0" + sources."oo-ascii-tree-1.44.1" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -79793,7 +79882,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.129" + sources."sscaff-1.2.130" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -79871,7 +79960,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/template-7.16.0" sources."@babel/types-7.16.0" sources."@cdktf/hcl2cdk-0.7.0" @@ -79915,8 +80004,8 @@ in }) sources."@graphql-typed-document-node/core-3.1.0" sources."@josephg/resolvable-1.0.1" - sources."@jsii/check-node-1.44.0" - sources."@jsii/spec-1.44.0" + sources."@jsii/check-node-1.44.1" + sources."@jsii/spec-1.44.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -80262,19 +80351,19 @@ in (sources."jsii-pacmak-1.37.0" // { dependencies = [ sources."@jsii/check-node-1.37.0" - sources."codemaker-1.44.0" + sources."codemaker-1.44.1" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.44.0" // { + (sources."jsii-reflect-1.44.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.44.0" // { + (sources."jsii-rosetta-1.44.1" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" @@ -80341,7 +80430,7 @@ in sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.44.0" + sources."oo-ascii-tree-1.44.1" sources."open-7.4.2" sources."optimism-0.16.1" sources."ora-5.4.1" @@ -80434,7 +80523,7 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.129" + sources."sscaff-1.2.130" (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -81507,7 +81596,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."commander-2.20.3" - sources."common-tags-1.8.1" + sources."common-tags-1.8.2" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" (sources."configstore-3.1.5" // { @@ -81553,7 +81642,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -82219,7 +82308,7 @@ in sources."svg-tags-1.0.0" (sources."table-6.7.3" // { dependencies = [ - sources."ajv-8.8.0" + sources."ajv-8.8.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -82508,7 +82597,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.0" + sources."@babel/compat-data-7.16.4" sources."@babel/core-7.16.0" sources."@babel/generator-7.16.0" sources."@babel/helper-compilation-targets-7.16.3" @@ -82530,7 +82619,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/template-7.16.0" sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" @@ -82544,7 +82633,7 @@ in sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.6" - sources."ajv-8.8.0" + sources."ajv-8.8.1" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -82604,7 +82693,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -83173,7 +83262,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.3" // { dependencies = [ - sources."ajv-8.8.0" + sources."ajv-8.8.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -85220,12 +85309,12 @@ in sources."@cspell/dict-npm-1.0.16" sources."@cspell/dict-php-1.0.25" sources."@cspell/dict-powershell-1.0.19" - sources."@cspell/dict-public-licenses-1.0.3" - sources."@cspell/dict-python-2.0.4" - sources."@cspell/dict-ruby-1.0.14" + sources."@cspell/dict-public-licenses-1.0.4" + sources."@cspell/dict-python-2.0.5" + sources."@cspell/dict-ruby-1.0.15" sources."@cspell/dict-rust-1.0.23" sources."@cspell/dict-scala-1.0.21" - sources."@cspell/dict-software-terms-2.0.9" + sources."@cspell/dict-software-terms-2.0.10" sources."@cspell/dict-swift-1.0.1" sources."@cspell/dict-typescript-1.0.19" sources."@cspell/dict-vue-2.0.1" @@ -85393,7 +85482,6 @@ in sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."b4a-1.1.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -85792,7 +85880,7 @@ in sources."qs-6.5.2" sources."queue-tick-1.0.0" sources."random-access-file-2.2.0" - sources."random-access-memory-3.1.3" + sources."random-access-memory-3.1.4" sources."random-access-storage-1.4.2" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -86048,7 +86136,7 @@ in src = ../../applications/networking/instant-messengers/deltachat-desktop; dependencies = [ sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.0" + sources."@babel/compat-data-7.16.4" (sources."@babel/core-7.16.0" // { dependencies = [ sources."source-map-0.5.7" @@ -86064,7 +86152,7 @@ in sources."@babel/helper-compilation-targets-7.16.3" sources."@babel/helper-create-class-features-plugin-7.16.0" sources."@babel/helper-create-regexp-features-plugin-7.16.0" - sources."@babel/helper-define-polyfill-provider-0.2.4" + sources."@babel/helper-define-polyfill-provider-0.3.0" sources."@babel/helper-explode-assignable-expression-7.16.0" sources."@babel/helper-function-name-7.16.0" sources."@babel/helper-get-function-arity-7.16.0" @@ -86074,7 +86162,7 @@ in sources."@babel/helper-module-transforms-7.16.0" sources."@babel/helper-optimise-call-expression-7.16.0" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.16.0" + sources."@babel/helper-remap-async-to-generator-7.16.4" sources."@babel/helper-replace-supers-7.16.0" sources."@babel/helper-simple-access-7.16.0" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" @@ -86084,10 +86172,10 @@ in sources."@babel/helper-wrap-function-7.16.0" sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" - sources."@babel/plugin-proposal-async-generator-functions-7.16.0" + sources."@babel/plugin-proposal-async-generator-functions-7.16.4" sources."@babel/plugin-proposal-class-properties-7.16.0" sources."@babel/plugin-proposal-class-static-block-7.16.0" sources."@babel/plugin-proposal-dynamic-import-7.16.0" @@ -86153,7 +86241,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.16.0" sources."@babel/plugin-transform-unicode-escapes-7.16.0" sources."@babel/plugin-transform-unicode-regex-7.16.0" - sources."@babel/preset-env-7.16.0" + sources."@babel/preset-env-7.16.4" sources."@babel/preset-modules-0.1.5" sources."@babel/preset-react-7.16.0" sources."@babel/runtime-7.16.3" @@ -86216,9 +86304,9 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."babel-plugin-dynamic-import-node-2.3.3" - sources."babel-plugin-polyfill-corejs2-0.2.3" - sources."babel-plugin-polyfill-corejs3-0.3.0" - sources."babel-plugin-polyfill-regenerator-0.2.3" + sources."babel-plugin-polyfill-corejs2-0.3.0" + sources."babel-plugin-polyfill-corejs3-0.4.0" + sources."babel-plugin-polyfill-regenerator-0.3.0" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" @@ -86309,8 +86397,8 @@ in sources."dom4-2.1.6" sources."duplexer3-0.1.4" sources."earcut-2.2.3" - sources."electron-13.6.1" - sources."electron-to-chromium-1.3.899" + sources."electron-13.6.2" + sources."electron-to-chromium-1.3.900" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -87697,7 +87785,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.0" + sources."@babel/compat-data-7.16.4" (sources."@babel/core-7.16.0" // { dependencies = [ sources."semver-6.3.0" @@ -87725,7 +87813,7 @@ in sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/plugin-proposal-object-rest-spread-7.16.0" sources."@babel/plugin-syntax-jsx-7.16.0" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -87788,7 +87876,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -89970,7 +90058,7 @@ in sources."supports-color-8.1.1" (sources."table-6.7.3" // { dependencies = [ - sources."ajv-8.8.0" + sources."ajv-8.8.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -90045,7 +90133,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/runtime-7.9.0" (sources."@babel/template-7.16.0" // { dependencies = [ @@ -90640,7 +90728,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -92244,7 +92332,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.0" + sources."@babel/compat-data-7.16.4" sources."@babel/core-7.16.0" sources."@babel/generator-7.16.0" sources."@babel/helper-annotate-as-pure-7.16.0" @@ -92264,7 +92352,7 @@ in sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/plugin-proposal-object-rest-spread-7.16.0" sources."@babel/plugin-syntax-jsx-7.16.0" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -92326,7 +92414,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -92974,7 +93062,7 @@ in ]; }) sources."@grpc/grpc-js-1.4.4" - sources."@grpc/proto-loader-0.6.6" + sources."@grpc/proto-loader-0.6.7" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/fs-1.0.0" // { dependencies = [ @@ -94847,10 +94935,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.1.4"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.1.4.tgz"; - sha512 = "B8PYO0FPZMuaEJnvLDPPfEO+xHci7pWoS0NnEKKd+12kneObi4doQp0vqqAG+PS3oNtBRGy1nLglf8BTpCex8Q=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.2.0.tgz"; + sha512 = "WC8sIdMpzTSsLcbvrvrfYazq1exTM+lZBoibLTxCBqKVcQ3dNMCSbzIbGieLtKaPs4pOKKvkivOSWEfPqMOdug=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -94859,7 +94947,7 @@ in ]; }) sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.0" + sources."@babel/compat-data-7.16.4" (sources."@babel/core-7.16.0" // { dependencies = [ sources."semver-6.3.0" @@ -94897,7 +94985,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.16.0" sources."@babel/plugin-syntax-jsx-7.16.0" @@ -94906,7 +94994,7 @@ in sources."@babel/plugin-transform-parameters-7.16.3" sources."@babel/plugin-transform-react-jsx-7.16.0" sources."@babel/runtime-7.16.3" - sources."@babel/standalone-7.16.3" + sources."@babel/standalone-7.16.4" sources."@babel/template-7.16.0" sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" @@ -95047,7 +95135,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" - sources."common-tags-1.8.1" + sources."common-tags-1.8.2" sources."concat-map-0.0.1" sources."configstore-5.0.1" (sources."content-disposition-0.5.3" // { @@ -95071,7 +95159,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-2.1.1" + sources."create-gatsby-2.2.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -95112,7 +95200,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -95147,14 +95235,15 @@ in }) (sources."express-graphql-0.12.0" // { dependencies = [ + sources."bytes-3.1.1" sources."http-errors-1.8.0" - (sources."raw-body-2.4.1" // { + (sources."raw-body-2.4.2" // { dependencies = [ - sources."http-errors-1.7.3" - sources."setprototypeof-1.1.1" + sources."http-errors-1.8.1" ]; }) sources."setprototypeof-1.2.0" + sources."toidentifier-1.0.1" ]; }) sources."extend-3.0.2" @@ -95184,13 +95273,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-3.1.3" - (sources."gatsby-recipes-1.1.3" // { + sources."gatsby-core-utils-3.2.0" + (sources."gatsby-recipes-1.2.0" // { dependencies = [ sources."strip-ansi-6.0.1" ]; }) - (sources."gatsby-telemetry-3.1.3" // { + (sources."gatsby-telemetry-3.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -95483,7 +95572,7 @@ in sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-3.0.2" sources."readdirp-3.6.0" - sources."redux-4.0.5" + sources."redux-4.1.2" sources."regenerator-runtime-0.13.9" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -95603,7 +95692,6 @@ in sources."strtok3-6.2.4" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" - sources."symbol-observable-1.2.0" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -96293,7 +96381,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."agent-base-6.0.2" - sources."ajv-8.8.0" + sources."ajv-8.8.1" sources."ajv-formats-2.1.1" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" @@ -96311,7 +96399,7 @@ in ]; }) sources."buffer-5.7.1" - sources."bytes-3.1.0" + sources."bytes-3.1.1" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -96399,7 +96487,7 @@ in sources."has-yarn-2.1.0" sources."hosted-git-info-4.0.2" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.7.3" + sources."http-errors-1.8.1" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."human-signals-2.1.0" @@ -96516,7 +96604,7 @@ in sources."punycode-2.1.1" sources."pupa-2.1.1" sources."quick-lru-4.0.1" - sources."raw-body-2.4.1" + sources."raw-body-2.4.2" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -96556,7 +96644,7 @@ in sources."semver-6.3.0" ]; }) - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.5" @@ -96579,7 +96667,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."tr46-0.0.3" sources."trim-newlines-3.0.1" sources."tslib-2.1.0" @@ -98997,7 +99085,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1029.0" + sources."aws-sdk-2.1030.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -99855,7 +99943,7 @@ in sources."asynckit-0.4.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."call-bind-1.0.2" (sources."chalk-3.0.0" // { dependencies = [ @@ -99933,7 +100021,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.2" - sources."http-errors-1.7.3" + sources."http-errors-1.8.1" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -100031,7 +100119,7 @@ in sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."qs-6.10.1" - sources."raw-body-2.4.1" + sources."raw-body-2.4.2" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" sources."rimraf-3.0.2" @@ -100042,7 +100130,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.1.4" sources."semver-6.3.0" - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" @@ -100093,7 +100181,7 @@ in sources."through-2.3.8" sources."through2-3.0.2" sources."tmp-0.0.33" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."tree-kill-1.2.2" sources."tslib-1.14.1" sources."type-check-0.3.2" @@ -100527,7 +100615,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1029.0" // { + (sources."aws-sdk-2.1030.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -101290,7 +101378,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -102573,10 +102661,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "6.3.8"; + version = "6.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.3.8.tgz"; - sha512 = "10wBBU9S0lBHhbCNfmmbWQaY5C1bXlKdnvzN2QKThujCI/+DKaezrI08l6bfTlpJ92VsEboq3zYKpXwK6DOi3A=="; + url = "https://registry.npmjs.org/karma/-/karma-6.3.9.tgz"; + sha512 = "E/MqdLM9uVIhfuyVnrhlGBu4miafBdXEAEqCmwdEMh3n17C7UWC/8Kvm3AYKr91gc7scutekZ0xv6rxRaUCtnw=="; }; dependencies = [ sources."@types/component-emitter-1.2.11" @@ -102688,7 +102776,7 @@ in sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-2.3.2" + sources."socket.io-adapter-2.3.3" (sources."socket.io-parser-4.0.4" // { dependencies = [ sources."debug-4.3.2" @@ -102744,7 +102832,7 @@ in dependencies = [ sources."@babel/cli-7.16.0" sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.0" + sources."@babel/compat-data-7.16.4" (sources."@babel/core-7.16.0" // { dependencies = [ sources."semver-6.3.0" @@ -102773,7 +102861,7 @@ in sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" sources."@babel/node-7.16.0" - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/plugin-syntax-jsx-7.16.0" sources."@babel/plugin-transform-react-jsx-7.16.0" sources."@babel/register-7.16.0" @@ -102896,7 +102984,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -105447,7 +105535,7 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.0" + sources."@babel/compat-data-7.16.4" sources."@babel/core-7.16.0" sources."@babel/generator-7.16.0" sources."@babel/helper-annotate-as-pure-7.16.0" @@ -105455,7 +105543,7 @@ in sources."@babel/helper-compilation-targets-7.16.3" sources."@babel/helper-create-class-features-plugin-7.16.0" sources."@babel/helper-create-regexp-features-plugin-7.16.0" - sources."@babel/helper-define-polyfill-provider-0.2.4" + sources."@babel/helper-define-polyfill-provider-0.3.0" sources."@babel/helper-explode-assignable-expression-7.16.0" sources."@babel/helper-function-name-7.16.0" sources."@babel/helper-get-function-arity-7.16.0" @@ -105465,7 +105553,7 @@ in sources."@babel/helper-module-transforms-7.16.0" sources."@babel/helper-optimise-call-expression-7.16.0" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.16.0" + sources."@babel/helper-remap-async-to-generator-7.16.4" sources."@babel/helper-replace-supers-7.16.0" sources."@babel/helper-simple-access-7.16.0" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" @@ -105479,11 +105567,11 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.16.0" + sources."@babel/plugin-proposal-async-generator-functions-7.16.4" sources."@babel/plugin-proposal-class-properties-7.16.0" sources."@babel/plugin-proposal-class-static-block-7.16.0" sources."@babel/plugin-proposal-dynamic-import-7.16.0" @@ -105539,7 +105627,7 @@ in sources."@babel/plugin-transform-property-literals-7.16.0" sources."@babel/plugin-transform-regenerator-7.16.0" sources."@babel/plugin-transform-reserved-words-7.16.0" - sources."@babel/plugin-transform-runtime-7.16.0" + sources."@babel/plugin-transform-runtime-7.16.4" sources."@babel/plugin-transform-shorthand-properties-7.16.0" sources."@babel/plugin-transform-spread-7.16.0" sources."@babel/plugin-transform-sticky-regex-7.16.0" @@ -105547,7 +105635,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.16.0" sources."@babel/plugin-transform-unicode-escapes-7.16.0" sources."@babel/plugin-transform-unicode-regex-7.16.0" - sources."@babel/preset-env-7.16.0" + sources."@babel/preset-env-7.16.4" sources."@babel/preset-modules-0.1.5" sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.16.3" @@ -105663,9 +105751,9 @@ in sources."babel-plugin-minify-replace-0.5.0" sources."babel-plugin-minify-simplify-0.5.1" sources."babel-plugin-minify-type-constructors-0.4.3" - sources."babel-plugin-polyfill-corejs2-0.2.3" - sources."babel-plugin-polyfill-corejs3-0.3.0" - sources."babel-plugin-polyfill-regenerator-0.2.3" + sources."babel-plugin-polyfill-corejs2-0.3.0" + sources."babel-plugin-polyfill-corejs3-0.4.0" + sources."babel-plugin-polyfill-regenerator-0.3.0" sources."babel-plugin-syntax-flow-6.18.0" sources."babel-plugin-transform-flow-strip-types-6.22.0" sources."babel-plugin-transform-inline-consecutive-adds-0.4.3" @@ -105870,7 +105958,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -108532,7 +108620,7 @@ in }; dependencies = [ sources."@babel/runtime-7.16.3" - sources."@mapbox/node-pre-gyp-1.0.6" + sources."@mapbox/node-pre-gyp-1.0.7" sources."@node-red/editor-api-2.1.3" sources."@node-red/editor-client-2.1.3" (sources."@node-red/nodes-2.1.3" // { @@ -108570,7 +108658,7 @@ in }) sources."ajv-8.6.3" sources."ansi-colors-4.1.1" - sources."ansi-regex-3.0.0" + sources."ansi-regex-5.0.1" sources."append-field-1.0.0" sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { @@ -108673,6 +108761,7 @@ in ]; }) sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -108705,7 +108794,7 @@ in sources."fs-minipass-2.1.0" sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" - sources."gauge-3.0.1" + sources."gauge-4.0.0" sources."get-stream-5.2.0" sources."glob-7.2.0" sources."got-11.8.2" @@ -108735,7 +108824,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-utf8-0.2.1" sources."isarray-0.0.1" sources."js-yaml-3.14.1" @@ -108811,7 +108900,7 @@ in sources."node-red-admin-2.2.1" sources."nopt-5.0.0" sources."normalize-url-6.1.0" - sources."npmlog-5.0.1" + sources."npmlog-6.0.0" sources."nth-check-2.0.1" sources."oauth2orize-1.11.0" sources."object-assign-4.1.1" @@ -108878,9 +108967,9 @@ in sources."statuses-1.5.0" sources."stream-shift-1.0.1" sources."streamsearch-0.1.2" - sources."string-width-2.1.1" + sources."string-width-4.2.3" sources."string_decoder-0.10.31" - sources."strip-ansi-4.0.0" + sources."strip-ansi-6.0.1" (sources."tar-6.1.11" // { dependencies = [ sources."mkdirp-1.0.4" @@ -110171,7 +110260,7 @@ in dependencies = [ sources."abbrev-1.1.1" sources."ajv-6.12.6" - sources."ansi-regex-3.0.0" + sources."ansi-regex-5.0.1" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" sources."argparse-0.1.15" @@ -110202,6 +110291,7 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."ecc-jsbn-0.1.2" + sources."emoji-regex-8.0.0" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -110223,7 +110313,7 @@ in sources."mkdirp-0.5.5" ]; }) - sources."gauge-3.0.1" + sources."gauge-4.0.0" sources."getpass-0.1.7" sources."glob-7.2.0" sources."graceful-fs-2.0.3" @@ -110234,7 +110324,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.1.0" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" @@ -110263,9 +110353,8 @@ in sources."semver-2.3.2" ]; }) - sources."npmlog-5.0.1" + sources."npmlog-6.0.0" sources."oauth-sign-0.9.0" - sources."object-assign-4.1.1" sources."once-1.4.0" sources."osenv-0.0.3" sources."path-is-absolute-1.0.1" @@ -110285,9 +110374,9 @@ in sources."signal-exit-3.0.5" sources."slide-1.1.6" sources."sshpk-1.16.1" - sources."string-width-2.1.1" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-4.0.0" + sources."strip-ansi-6.0.1" (sources."tar-0.1.17" // { dependencies = [ sources."inherits-1.0.2" @@ -110321,6 +110410,83 @@ in bypassCache = true; reconstructLock = true; }; + nrm = nodeEnv.buildNodePackage { + name = "nrm"; + packageName = "nrm"; + version = "1.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nrm/-/nrm-1.2.5.tgz"; + sha512 = "QOfdBSDsrSso87Lluacdp7fXqU68c1EcjdKOKsr2SRPGXHWsxr88BNjxxJEwSKHP0cXutgUjJevxPhuYEwobMA=="; + }; + dependencies = [ + sources."ajv-6.12.6" + sources."asn1-0.2.6" + sources."assert-plus-1.0.0" + sources."async-1.5.2" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."bcrypt-pbkdf-1.0.2" + sources."caseless-0.12.0" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."core-util-is-1.0.2" + sources."dashdash-1.14.1" + sources."define-lazy-prop-2.0.0" + sources."delayed-stream-1.0.0" + sources."ecc-jsbn-0.1.2" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."getpass-0.1.7" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."http-signature-1.2.0" + sources."humps-2.0.1" + sources."ini-1.3.8" + sources."is-docker-2.2.1" + sources."is-typedarray-1.0.0" + sources."is-wsl-2.2.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" + sources."npm-7.24.2" + sources."oauth-sign-0.9.0" + sources."only-0.0.2" + sources."open-8.4.0" + sources."performance-now-2.1.0" + sources."psl-1.8.0" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."request-2.88.2" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."sshpk-1.16.1" + sources."tough-cookie-2.5.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."uri-js-4.4.1" + sources."uuid-3.4.0" + sources."verror-1.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "NPM registry manager can help you easy and fast switch between different npm registries, now include: cnpm, taobao, nj(nodejitsu), edunpm"; + homepage = "https://github.com/Pana/nrm"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; ocaml-language-server = nodeEnv.buildNodePackage { name = "ocaml-language-server"; packageName = "ocaml-language-server"; @@ -110373,7 +110539,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.0" + sources."@babel/compat-data-7.16.4" (sources."@babel/core-7.16.0" // { dependencies = [ sources."json5-2.2.0" @@ -110395,7 +110561,7 @@ in }) sources."@babel/helper-create-class-features-plugin-7.16.0" sources."@babel/helper-create-regexp-features-plugin-7.16.0" - (sources."@babel/helper-define-polyfill-provider-0.2.4" // { + (sources."@babel/helper-define-polyfill-provider-0.3.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -110409,7 +110575,7 @@ in sources."@babel/helper-module-transforms-7.16.0" sources."@babel/helper-optimise-call-expression-7.16.0" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.16.0" + sources."@babel/helper-remap-async-to-generator-7.16.4" sources."@babel/helper-replace-supers-7.16.0" sources."@babel/helper-simple-access-7.16.0" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" @@ -110419,10 +110585,10 @@ in sources."@babel/helper-wrap-function-7.16.0" sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" - sources."@babel/plugin-proposal-async-generator-functions-7.16.0" + sources."@babel/plugin-proposal-async-generator-functions-7.16.4" sources."@babel/plugin-proposal-class-properties-7.16.0" sources."@babel/plugin-proposal-class-static-block-7.16.0" sources."@babel/plugin-proposal-dynamic-import-7.16.0" @@ -110487,7 +110653,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.16.0" sources."@babel/plugin-transform-unicode-escapes-7.16.0" sources."@babel/plugin-transform-unicode-regex-7.16.0" - (sources."@babel/preset-env-7.16.0" // { + (sources."@babel/preset-env-7.16.4" // { dependencies = [ sources."semver-6.3.0" ]; @@ -110551,13 +110717,13 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."babel-plugin-dynamic-import-node-2.3.3" - (sources."babel-plugin-polyfill-corejs2-0.2.3" // { + (sources."babel-plugin-polyfill-corejs2-0.3.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.3.0" - sources."babel-plugin-polyfill-regenerator-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.4.0" + sources."babel-plugin-polyfill-regenerator-0.3.0" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" @@ -110755,7 +110921,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.899" + sources."electron-to-chromium-1.3.900" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -112686,7 +112852,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.2" - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."chalk-3.0.0" sources."charm-0.1.2" sources."chokidar-3.5.2" @@ -112732,7 +112898,7 @@ in sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."http-errors-1.7.3" + sources."http-errors-1.8.1" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" @@ -112791,7 +112957,7 @@ in sources."promptly-2.2.0" sources."proxy-agent-5.0.0" sources."proxy-from-env-1.1.0" - sources."raw-body-2.4.1" + sources."raw-body-2.4.2" sources."read-1.0.7" sources."readable-stream-1.1.14" sources."readdirp-3.6.0" @@ -112807,7 +112973,7 @@ in sources."yallist-4.0.0" ]; }) - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."shimmer-1.2.1" sources."signal-exit-3.0.5" sources."smart-buffer-4.2.0" @@ -112821,7 +112987,7 @@ in sources."supports-color-7.2.0" sources."systeminformation-5.9.13" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."tslib-2.3.1" sources."tv4-1.3.0" sources."tx2-1.0.4" @@ -113055,13 +113221,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.4.2"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.4.2.tgz"; - sha512 = "wOD1lni7MfH/Qkp5SAkUthLKG+pQcpD31Nm8nAKj9ESgqId/dy+JDSTYOuk/pySvFyby/A+bsAPWIaVmo7qqhQ=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.5.0.tgz"; + sha512 = "WEYQ+H98O0yigG+lI0gfh4iyBChvnM6QTXPDtY9eFraLXAmyb6tf/T2mUdrUAU1AEvHLVzQA5A+RpONZlQozBg=="; }; dependencies = [ - sources."@prisma/engines-3.4.1-2.57771c0558568c7d08bd34c7248af5244ae16bd9" + sources."@prisma/engines-3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e" ]; buildInputs = globalBuildInputs; meta = { @@ -114080,7 +114246,7 @@ in dependencies = [ sources."@babel/cli-7.16.0" sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.0" + sources."@babel/compat-data-7.16.4" (sources."@babel/core-7.16.0" // { dependencies = [ sources."semver-6.3.0" @@ -114096,7 +114262,7 @@ in }) sources."@babel/helper-create-class-features-plugin-7.16.0" sources."@babel/helper-create-regexp-features-plugin-7.16.0" - (sources."@babel/helper-define-polyfill-provider-0.2.4" // { + (sources."@babel/helper-define-polyfill-provider-0.3.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -114110,7 +114276,7 @@ in sources."@babel/helper-module-transforms-7.16.0" sources."@babel/helper-optimise-call-expression-7.16.0" sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.16.0" + sources."@babel/helper-remap-async-to-generator-7.16.4" sources."@babel/helper-replace-supers-7.16.0" sources."@babel/helper-simple-access-7.16.0" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" @@ -114120,10 +114286,10 @@ in sources."@babel/helper-wrap-function-7.16.0" sources."@babel/helpers-7.16.3" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" - sources."@babel/plugin-proposal-async-generator-functions-7.16.0" + sources."@babel/plugin-proposal-async-generator-functions-7.16.4" sources."@babel/plugin-proposal-class-properties-7.16.0" sources."@babel/plugin-proposal-class-static-block-7.16.0" sources."@babel/plugin-proposal-dynamic-import-7.16.0" @@ -114184,7 +114350,7 @@ in sources."@babel/plugin-transform-react-pure-annotations-7.16.0" sources."@babel/plugin-transform-regenerator-7.16.0" sources."@babel/plugin-transform-reserved-words-7.16.0" - (sources."@babel/plugin-transform-runtime-7.16.0" // { + (sources."@babel/plugin-transform-runtime-7.16.4" // { dependencies = [ sources."semver-6.3.0" ]; @@ -114196,7 +114362,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.16.0" sources."@babel/plugin-transform-unicode-escapes-7.16.0" sources."@babel/plugin-transform-unicode-regex-7.16.0" - (sources."@babel/preset-env-7.16.0" // { + (sources."@babel/preset-env-7.16.4" // { dependencies = [ sources."semver-6.3.0" ]; @@ -114307,13 +114473,13 @@ in }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-macros-2.8.0" - (sources."babel-plugin-polyfill-corejs2-0.2.3" // { + (sources."babel-plugin-polyfill-corejs2-0.3.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.3.0" - sources."babel-plugin-polyfill-regenerator-0.2.3" + sources."babel-plugin-polyfill-corejs3-0.4.0" + sources."babel-plugin-polyfill-regenerator-0.3.0" sources."babel-plugin-transform-react-remove-prop-types-0.4.24" sources."babel-plugin-universal-import-4.0.2" (sources."babel-runtime-6.26.0" // { @@ -114630,7 +114796,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116009,7 +116175,7 @@ in sources."@babel/helper-split-export-declaration-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.3" + sources."@babel/parser-7.16.4" sources."@babel/runtime-7.16.3" sources."@babel/template-7.16.0" sources."@babel/traverse-7.16.3" @@ -116020,7 +116186,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.6" sources."@redocly/ajv-8.6.4" - sources."@redocly/openapi-core-1.0.0-beta.68" + sources."@redocly/openapi-core-1.0.0-beta.69" sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.9" sources."@types/node-14.17.33" @@ -117173,7 +117339,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.3" // { dependencies = [ - sources."ajv-8.8.0" + sources."ajv-8.8.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -117706,7 +117872,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1029.0" // { + (sources."aws-sdk-2.1030.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -119112,7 +119278,7 @@ in sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-assign-4.1.1" - sources."socket.io-adapter-2.3.2" + sources."socket.io-adapter-2.3.3" sources."socket.io-parser-4.0.4" sources."vary-1.1.2" sources."ws-8.2.3" @@ -119366,7 +119532,6 @@ in sources."atomic-file-rw-0.2.2" sources."attach-ware-1.1.1" sources."available-typed-arrays-1.0.5" - sources."b4a-1.1.2" sources."bail-1.0.5" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -119383,7 +119548,7 @@ in sources."binary-search-1.3.6" sources."binary-search-bounds-2.0.5" sources."bindings-1.5.0" - sources."bipf-1.5.1" + sources."bipf-1.5.2" sources."blake2s-1.1.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" @@ -119908,7 +120073,7 @@ in sources."random-access-storage-1.3.0" ]; }) - sources."random-access-memory-3.1.3" + sources."random-access-memory-3.1.4" sources."random-access-storage-1.4.2" sources."random-access-web-2.0.3" (sources."randomatic-3.1.1" // { @@ -120345,7 +120510,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1029.0" // { + (sources."aws-sdk-2.1030.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -121137,7 +121302,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" - sources."ajv-8.8.0" + sources."ajv-8.8.1" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -122437,7 +122602,7 @@ in sources."@textlint/utils-12.0.2" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" - sources."ajv-8.8.0" + sources."ajv-8.8.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" @@ -124592,8 +124757,8 @@ in sources."concat-map-0.0.1" sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."cookie-0.4.0" - sources."cookie-parser-1.4.5" + sources."cookie-0.4.1" + sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."cors-2.8.5" @@ -124616,7 +124781,6 @@ in sources."end-of-stream-1.4.4" (sources."engine.io-5.1.1" // { dependencies = [ - sources."cookie-0.4.1" sources."debug-4.3.2" sources."ms-2.1.2" ]; @@ -124626,10 +124790,13 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eve-0.5.4" - sources."express-4.17.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."cookie-0.4.0" + ]; + }) (sources."express-session-1.17.2" // { dependencies = [ - sources."cookie-0.4.1" sources."depd-2.0.0" sources."safe-buffer-5.2.1" ]; @@ -124766,7 +124933,7 @@ in sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-2.3.2" + sources."socket.io-adapter-2.3.3" (sources."socket.io-parser-4.0.4" // { dependencies = [ sources."debug-4.3.2" @@ -124985,11 +125152,11 @@ in sha512 = "UuxW79x2n0bYBexa3vblI2o4CPhIJTBGvA0remuNm74RjkjMkDHMXDriCs5sYQ7jYyekvROmvmC9t/Pn0g0+6Q=="; }; dependencies = [ - sources."@mapbox/node-pre-gyp-1.0.6" + sources."@mapbox/node-pre-gyp-1.0.7" sources."@types/estree-0.0.50" sources."abbrev-1.1.1" sources."agent-base-6.0.2" - sources."ansi-regex-3.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" @@ -124997,14 +125164,7 @@ in sources."brace-expansion-1.1.11" sources."canvas-2.8.0" sources."chownr-2.0.0" - (sources."cliui-7.0.4" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-support-1.1.3" @@ -125039,7 +125199,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gauge-3.0.1" + sources."gauge-4.0.0" sources."get-caller-file-2.0.5" sources."glob-7.2.0" sources."has-1.0.3" @@ -125050,7 +125210,7 @@ in sources."inherits-2.0.4" sources."internmap-1.0.1" sources."is-core-module-2.8.0" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -125066,8 +125226,7 @@ in sources."nan-2.15.0" sources."node-fetch-2.6.6" sources."nopt-5.0.0" - sources."npmlog-5.0.1" - sources."object-assign-4.1.1" + sources."npmlog-6.0.0" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" @@ -125083,9 +125242,9 @@ in sources."signal-exit-3.0.5" sources."simple-concat-1.0.1" sources."simple-get-3.1.0" - sources."string-width-2.1.1" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-4.0.0" + sources."strip-ansi-6.0.1" sources."tar-6.1.11" sources."topojson-client-3.1.0" sources."tr46-0.0.3" @@ -125123,25 +125282,11 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wide-align-1.1.5" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-17.2.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."yargs-17.2.1" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -125500,7 +125645,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.3" // { dependencies = [ - sources."ajv-8.8.0" + sources."ajv-8.8.1" sources."json-schema-traverse-1.0.0" ]; }) @@ -125833,7 +125978,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.2" sources."domutils-2.8.0" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.3" @@ -126546,7 +126691,7 @@ in }) sources."comma-separated-tokens-1.0.8" sources."commander-2.20.3" - sources."common-tags-1.8.1" + sources."common-tags-1.8.2" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" @@ -127329,7 +127474,7 @@ in }; dependencies = [ sources."@babel/runtime-corejs3-7.16.3" - sources."@mapbox/node-pre-gyp-1.0.6" + sources."@mapbox/node-pre-gyp-1.0.7" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" sources."abab-2.0.5" @@ -127342,7 +127487,7 @@ in }) sources."acorn-walk-7.2.0" sources."agent-base-6.0.2" - sources."ansi-regex-3.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" @@ -127356,14 +127501,7 @@ in sources."canvas-2.8.0" sources."canvg-3.0.7" sources."chownr-2.0.0" - (sources."cliui-7.0.4" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-support-1.1.3" @@ -127407,7 +127545,7 @@ in sources."fs-extra-10.0.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" - sources."gauge-3.0.1" + sources."gauge-4.0.0" sources."get-caller-file-2.0.5" sources."glob-7.2.0" sources."graceful-fs-4.2.8" @@ -127418,7 +127556,7 @@ in sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-potential-custom-element-name-1.0.1" (sources."jsdom-16.7.0" // { dependencies = [ @@ -127450,9 +127588,8 @@ in sources."nan-2.15.0" sources."node-fetch-2.6.6" sources."nopt-5.0.0" - sources."npmlog-5.0.1" + sources."npmlog-6.0.0" sources."nwsapi-2.2.0" - sources."object-assign-4.1.1" sources."once-1.4.0" sources."onml-2.1.0" sources."optionator-0.8.3" @@ -127479,9 +127616,9 @@ in sources."simple-get-3.1.0" sources."source-map-0.6.1" sources."stackblur-canvas-2.5.0" - sources."string-width-2.1.1" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-4.0.0" + sources."strip-ansi-6.0.1" sources."svg-pathdata-5.0.5" sources."svg2img-0.9.4" sources."symbol-tree-3.2.4" @@ -127505,28 +127642,14 @@ in sources."whatwg-url-5.0.0" sources."wide-align-1.1.5" sources."word-wrap-1.2.3" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."ws-7.5.5" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-17.2.1" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) + sources."yargs-17.2.1" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -128063,7 +128186,7 @@ in sources."supports-color-7.2.0" (sources."table-6.7.3" // { dependencies = [ - sources."ajv-8.8.0" + sources."ajv-8.8.1" sources."ansi-regex-5.0.1" sources."json-schema-traverse-1.0.0" sources."strip-ansi-6.0.1" @@ -128175,7 +128298,7 @@ in sources."caniuse-lite-1.0.30001280" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.899" + sources."electron-to-chromium-1.3.900" sources."enhanced-resolve-5.8.3" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -128761,7 +128884,7 @@ in sources."clone-2.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."common-tags-1.8.1" + sources."common-tags-1.8.2" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 7e5ac1fda5c0..bc7fba543efc 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.10576"; + version = "9.0.10651"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s8GZV+hcuAZJhKVoLAtC2mwHlqr/vJ6P5mwlNDczEyY="; + sha256 = "sha256-Cgd6lT7iqpvY5OJgBFNMkDJVV7uF6WwVdzQwGGZo4Qc="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/pkgs/development/python-modules/aiohttp-apispec/unstable.nix b/pkgs/development/python-modules/aiohttp-apispec/unstable.nix new file mode 100644 index 000000000000..73a28de7b40d --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-apispec/unstable.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, aiohttp, webargs, fetchFromGitHub, callPackage +}: + +let + apispec3 = callPackage ../apispec/3.nix {}; + jinja2 = callPackage ../jinja2/2.nix {}; +in +buildPythonPackage rec { + pname = "aiohttp-apispec"; + version = "unstable-2021-21-08"; + + # unstable so we can use latest webargs + src = fetchFromGitHub { + owner = "maximdanilchenko"; + repo = "aiohttp-apispec"; + rev = "cfa19646394480dda289f6b7af19b7d50f245d81"; + sha256 = "uEgDRAlMjTa4rvdE3fkORCHIlCLzxPJJ2/m4ZRU3eIQ="; + fetchSubmodules = false; + }; + + propagatedBuildInputs = [ aiohttp webargs apispec3 jinja2 ]; + + pythonImportsCheck = [ + "aiohttp_apispec" + ]; + + # Requires pytest-sanic, currently broken in nixpkgs + doCheck = false; + + meta = with lib; { + description = "Build and document REST APIs with aiohttp and apispec"; + homepage = "https://github.com/maximdanilchenko/aiohttp-apispec/"; + license = licenses.mit; + maintainers = [ maintainers.viric ]; + }; +} diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index c85c5d6bd639..2f69f2196166 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -44,14 +44,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.10576"; + version = "9.0.10651"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-lRoJZX7HPZE6y7v5AuU1C6sjOIXXefv8M/qPiNQtobw="; + sha256 = "sha256-aywfB2oEPyh+MbN5jb+qA3DMUi8Pp/f2OhuUzoTAIoA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 7dc8d583958d..1b67568f3cd8 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.10576"; + version = "9.0.10651"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i4F6VyJYJ6XON9G43Z2VwWAPHGRxR9DzxnEDGiJ8LSE="; + sha256 = "sha256-tJ+yeaBI4eBxvvN2rqAfun3aSxDLrSFtfu00d4O1sak="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apispec/3.nix b/pkgs/development/python-modules/apispec/3.nix new file mode 100644 index 000000000000..e60a440df3f4 --- /dev/null +++ b/pkgs/development/python-modules/apispec/3.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyyaml +, prance +, marshmallow +, pytestCheckHook +, mock +, openapi-spec-validator +}: + +buildPythonPackage rec { + pname = "apispec"; + version = "3.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "d23ebd5b71e541e031b02a19db10b5e6d5ef8452c552833e3e1afc836b40b1ad"; + }; + + propagatedBuildInputs = [ + pyyaml + prance + ]; + + postPatch = '' + rm tests/test_ext_marshmallow.py + ''; + + checkInputs = [ + openapi-spec-validator + marshmallow + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "apispec" + ]; + + meta = with lib; { + description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification"; + homepage = "https://github.com/marshmallow-code/apispec"; + license = licenses.mit; + maintainers = [ maintainers.viric ]; + }; +} diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 8417d7d95af6..bdbdeb306207 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.10576"; + version = "9.0.10651"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K36tAsVfminDFK09jE6+ruROkaLfCTNPCL5ziZJOrVk="; + sha256 = "sha256-Lvobjbjl1gfW3HllHfsxHnLOB4hRGbZ9Hhuf14zd94w="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 79aaf4e08559..a6ae6e87036b 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,9 +1,9 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k -, python, twisted, jinja2, zope_interface, sqlalchemy -, sqlalchemy-migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq -, txrequests, pypugjs, boto3, moto, mock, lz4, setuptoolsTrial -, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins -, parameterized, git, openssh, glibcLocales, ldap3, nixosTests +, python, twisted, jinja2, zope_interface, sqlalchemy, alembic, python-dateutil +, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, txrequests, pypugjs, boto3 +, moto, mock, lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker +, buildbot-pkg, buildbot-plugins, parameterized, git, openssh, glibcLocales +, nixosTests }: let @@ -31,11 +31,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FST+mCIQpzxc/5iQdsSNBlKxY985v+z6Xeh8ZQRu2FE="; + sha256 = "sha256-14w1sF1aOpfUW76uhAIUpdrjAEhQkEWcRGg9Osc+qFk="; }; propagatedBuildInputs = [ @@ -44,7 +44,7 @@ let jinja2 zope_interface sqlalchemy - sqlalchemy-migrate + alembic python-dateutil txaio autobahn @@ -74,9 +74,6 @@ let git openssh glibcLocales - # optional dependency that was accidentally made required for tests - # https://github.com/buildbot/buildbot/pull/5857 - ldap3 ]; patches = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 45254ca83f8a..a1d2fa59cb5d 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PVmDJN3/PMsvZrrwSNaUUQLPkOMWO6edIEEfZSwspTs="; + sha256 = "sha256-NAc85JomnxS052SjCu8+UQ/hik2gbq1u7/gc21Nj67Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 12c4146b5132..797395205a04 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-KFGTNudUxjSV6406NV4QJP8t9t5p2ckMlntkqsf1x2U="; + sha256 = "sha256-65ZbCiNtxH3YjAcdhv5cwSUNrLT65jlQh/2oL8342Tw="; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-UoKCRAnPAQjb7Fgm+YkGv1boXY+xSDkYA3E2EiEkNGE="; + sha256 = "sha256-2wu6rE5tgjPXxlcIND8s+DAmX9CF29M3ElonV0L8WOs="; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-Ccmk8TPtMfGrlNaBKhos1s/G1pHzf+zSD+A88F+/8+c="; + sha256 = "sha256-Vu4CouTuVyxpmx5C4fthQJPdFBAtN1jliQjy4pLYAzc="; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-oHvn7E4NS0RhTU2hDn1GgFjalYCoXUNCtGEz2lHel+M="; + sha256 = "sha256-BDzI4VBbNGCKRxv6294IIVkDXZV0KHauvUYDjIVovvE="; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "sha256-HoiR2WF6EWebbb9c3WcLU2H17HMqkrF6JNOwpUk9CbU="; + sha256 = "sha256-hkcxwZWFJOLHMIRJfzzMTEoH6oc2UblJEKFjYthFfDc="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index a31ba928bb98..0c7e2f33716f 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-nDP46rLWYXXKJktR6NTWLb0erC6FU8fXe9FAIX+MWuU="; + sha256 = "sha256-SFZ0Q51hrBb7eBMGzvVOhc/ogFCIO/Mo7U9652WJ2GU="; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index ab8842d40614..95b2a39a6827 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.10576"; + version = "9.0.10651"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-86ySQ/2l1h5vayMfAsr9ShyE8oRKL37sT3bfrgIGFHY="; + sha256 = "sha256-ishKQ3BdY7sPRyhr04dB3gtGC/JqoJ/W0Cv/hxTkJXg="; }; # Use upstream z3 implementation diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index a5e458a6eb42..25e7b8751b52 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.10576"; + version = "9.0.10651"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ftaFISU37GcCFTybxV31PwUl2vrbKVm/S00Qo+pUxgo="; + sha256 = "sha256-XhU0SS0zWPtI4t49oboc5/Fr34dR6oqm8hlI4f4q8Bk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/pkgs/development/python-modules/flask-httpauth/default.nix index 988ae52aa0e4..e667e08b144a 100644 --- a/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/pkgs/development/python-modules/flask-httpauth/default.nix @@ -1,24 +1,23 @@ -{ lib, python, isPy3k, buildPythonPackage, fetchPypi, flask }: +{ lib, python, buildPythonPackage, fetchPypi, pytestCheckHook, flask }: buildPythonPackage rec { - pname = "Flask-HTTPAuth"; - version = "4.4.0"; + pname = "flask-httpauth"; + version = "4.5.0"; - disabled = !isPy3k; + disabled = python.pythonOlder "3"; src = fetchPypi { - inherit pname version; - sha256 = "0fl1if91hg2c92b6sic7h2vhxxvb06ri7wflmwp0pfiwbaisgamw"; + pname = "Flask-HTTPAuth"; + version = version; + sha256 = "0ada63rkcvwkakjyx4ay98fjzwx5h55br12ys40ghkc5lbyl0l1r"; }; + checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ flask ]; pythonImportsCheck = [ "flask_httpauth" ]; - checkPhase = '' - ${python.interpreter} -m unittest discover - ''; - meta = with lib; { description = "Extension that provides HTTP authentication for Flask routes"; homepage = "https://github.com/miguelgrinberg/Flask-HTTPAuth"; diff --git a/pkgs/development/python-modules/future-typing/default.nix b/pkgs/development/python-modules/future-typing/default.nix new file mode 100644 index 000000000000..61a87e02253d --- /dev/null +++ b/pkgs/development/python-modules/future-typing/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, typing-extensions +}: + +buildPythonPackage rec { + pname = "future-typing"; + version = "0.4.1"; + + src = fetchPypi { + pname = "future_typing"; + inherit version; + sha256 = "65fdc5034a95db212790fee5e977fb0a2df8deb60dccf3bac17d6d2b1a9bbacd"; + }; + + doCheck = false; # No tests in pypi source. Did not get tests from GitHub source to work. + + pythonImportsCheck = [ "future_typing" ]; + + meta = with lib; { + description = "Use generic type hints and new union syntax `|` with python 3.6+"; + homepage = "https://github.com/PrettyWood/future-typing"; + license = licenses.mit; + maintainers = with maintainers; [ kfollesdal ]; + }; +} diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index 1ec6ce334200..e9d68685a3f1 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -1,29 +1,50 @@ { lib , buildPythonPackage , fetchFromGitHub -, aiohttp -, async-timeout +, httpx +, poetry-core +, pytest-asyncio +, pytest-httpx +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "glances-api"; - version = "0.2.1"; + version = "0.3.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = version; - sha256 = "sha256-mbkZZg2fmus4kOXFxHE/UV/nxemFAsoEZu8IUa7SPsg="; + sha256 = "sha256-zVK63SI8ZeVrY2iEEkgp8pq6RDheKeApb9/RWgZCKGI="; }; - propagatedBuildInputs = [ - aiohttp - async-timeout + nativeBuildInputs = [ + poetry-core ]; - # no tests are present - doCheck = false; - pythonImportsCheck = [ "glances_api" ]; + propagatedBuildInputs = [ + httpx + ]; + + checkInputs = [ + pytest-asyncio + pytest-httpx + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'httpx = ">=0.20,<1"' 'httpx = ">=0.19,<1"' + ''; + + pythonImportsCheck = [ + "glances_api" + ]; meta = with lib; { description = "Python API for interacting with Glances"; diff --git a/pkgs/development/python-modules/hacking/default.nix b/pkgs/development/python-modules/hacking/default.nix index d47449c2ca5e..44a7a2deb75b 100644 --- a/pkgs/development/python-modules/hacking/default.nix +++ b/pkgs/development/python-modules/hacking/default.nix @@ -35,7 +35,9 @@ buildPythonPackage rec { ]; checkPhase = '' - stestr run + stestr run -e <(echo " + hacking.tests.test_doctest.HackingTestCase.test_flake8 + ") ''; pythonImportsCheck = [ "hacking" ]; diff --git a/pkgs/development/python-modules/jinja2/2.nix b/pkgs/development/python-modules/jinja2/2.nix index dce93d33ab50..153aebcc818e 100644 --- a/pkgs/development/python-modules/jinja2/2.nix +++ b/pkgs/development/python-modules/jinja2/2.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = !stdenv.is32bit || isPy3k; checkPhase = '' - pytest -v tests + pytest -v tests -W ignore::ResourceWarning -W ignore::DeprecationWarning ''; meta = with lib; { diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix index caf98c420602..c10b442bac92 100644 --- a/pkgs/development/python-modules/nbclient/default.nix +++ b/pkgs/development/python-modules/nbclient/default.nix @@ -6,25 +6,18 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.8"; + version = "0.5.9"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NPUsycuDGl2MzXAxU341THXcYaJEh/mYcS0Sid4yCiU="; + sha256 = "sha256-meRt2vrNC4YSk78kb+2FQKGErfo6p9ZB+JAx7AcHAeA="; }; inherit doCheck; checkInputs = [ pytest xmltodict nbconvert ipywidgets ]; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; - postFixup = '' - # Remove until fixed by upstream - # https://github.com/jupyter/nbclient/pull/173#issuecomment-968760082 - rm $out/bin/.jupyter-run-wrapped - rm $out/bin/jupyter-run - ''; - meta = with lib; { homepage = "https://github.com/jupyter/nbclient"; description = "A client library for executing notebooks"; diff --git a/pkgs/development/python-modules/pyeclib/default.nix b/pkgs/development/python-modules/pyeclib/default.nix index 2c4169ea73ca..d55fb416a79e 100644 --- a/pkgs/development/python-modules/pyeclib/default.nix +++ b/pkgs/development/python-modules/pyeclib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, liberasurecode, six }: +{ lib, stdenv, buildPythonPackage, fetchPypi, liberasurecode, six }: buildPythonPackage rec { pname = "pyeclib"; @@ -13,11 +13,16 @@ buildPythonPackage rec { # patch dlopen call substituteInPlace src/c/pyeclib_c/pyeclib_c.c \ --replace "liberasurecode.so" "${liberasurecode}/lib/liberasurecode.so" + # python's platform.platform() doesn't return "Darwin" (anymore?) + substituteInPlace setup.py \ + --replace '"Darwin"' '"macOS"' ''; - preBuild = '' - # required for the custom find_library function in setup.py - export LD_LIBRARY_PATH="${lib.makeLibraryPath [ liberasurecode ]}" + preBuild = let + ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in '' + # required for the custom _find_library function in setup.py + export ${ldLibraryPathEnvName}="${lib.makeLibraryPath [ liberasurecode ]}" ''; buildInputs = [ liberasurecode ]; diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 36f4f434469e..6fe9df519652 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aresponses -, async-timeout , awesomeversion , buildPythonPackage , fetchFromGitHub @@ -12,21 +11,20 @@ buildPythonPackage rec { pname = "pyhaversion"; - version = "21.10.0"; + version = "21.11.1"; + format = "setuptools"; - # Only 3.8.0 and beyond are supported disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-EvVkewFgkfYL6BjmJ/IWeuCyR+0R0ZxI35i9sxKcqxo="; + sha256 = "sha256-wh6NJRDgOrEHYEN3QlC4lOZHPnPeiPCJFF1xLoixQ14="; }; propagatedBuildInputs = [ aiohttp - async-timeout awesomeversion ]; @@ -36,7 +34,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pyhaversion" ]; + postPatch = '' + # Upstream doesn't set a version for the tagged releases + substituteInPlace setup.py \ + --replace "main" ${version} + ''; + + + pythonImportsCheck = [ + "pyhaversion" + ]; meta = with lib; { description = "Python module to the newest version number of Home Assistant"; diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid_mako/default.nix index 9acffbde4333..a4de687eed24 100644 --- a/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/pkgs/development/python-modules/pyramid_mako/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , webtest , pyramid , Mako @@ -15,6 +16,15 @@ buildPythonPackage rec { sha256 = "0066c863441f1c3ddea60cee1ccc50d00a91a317a8052ca44131da1a12a840e2"; }; + patches = [ + # Fix tests with pyramid >= 2.0 + # https://github.com/Pylons/pyramid_mako/pull/54 + (fetchpatch { + url = "https://github.com/Pylons/pyramid_mako/commit/c0f9e7e0146a7f94e35a9401b1519ac8b7765f5b.patch"; + sha256 = "15swfm0a07bdl32s85426rmjh72jwfasjcrl849ppg035z75q9fx"; + }) + ]; + buildInputs = [ webtest ]; propagatedBuildInputs = [ pyramid Mako ]; @@ -23,8 +33,5 @@ buildPythonPackage rec { description = "Mako template bindings for the Pyramid web framework"; license = licenses.bsd0; maintainers = with maintainers; []; - # broken on pyramid>=2.0 - # https://github.com/Pylons/pyramid_mako/issues/53 - broken = true; }; } diff --git a/pkgs/development/python-modules/python-opendata-transport/default.nix b/pkgs/development/python-modules/python-opendata-transport/default.nix index 906f08439808..01733dece385 100644 --- a/pkgs/development/python-modules/python-opendata-transport/default.nix +++ b/pkgs/development/python-modules/python-opendata-transport/default.nix @@ -2,30 +2,34 @@ , buildPythonPackage , fetchPypi , aiohttp -, async-timeout , urllib3 +, pythonOlder }: buildPythonPackage rec { pname = "python-opendata-transport"; - version = "0.2.2"; + version = "0.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "python_opendata_transport"; inherit version; - sha256 = "sha256-Z0VHkKYHpwbBwwFrMtA5JRy0m7f0566IjCmGizoKEoo="; + sha256 = "sha256-CpzMMp2C3UOiUna9EcUucD/PKv7AZlkaU8QJfWntoi8="; }; propagatedBuildInputs = [ aiohttp - async-timeout urllib3 ]; # no tests are present doCheck = false; - pythonImportsCheck = [ "opendata_transport" ]; + pythonImportsCheck = [ + "opendata_transport" + ]; meta = with lib; { description = "Python client for interacting with transport.opendata.ch"; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index ba024bf5c6a1..2d5a83da3957 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.10576"; + version = "9.0.10651"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pOQZXymIuffUfShAUrXqlxwWCIRKZpkMZcJS1fad2bs="; + sha256 = "sha256-GuZqaEI7y/kLNV7RfEMBXQgFsdVuRh1ouweTwlXE6r4="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/srpenergy/default.nix b/pkgs/development/python-modules/srpenergy/default.nix index 140062edf1f0..c5d20436a09c 100644 --- a/pkgs/development/python-modules/srpenergy/default.nix +++ b/pkgs/development/python-modules/srpenergy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "srpenergy"; - version = "1.3.2"; + version = "1.3.5"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "lamoreauxlab"; repo = "srpenergy-api-client-python"; rev = version; - sha256 = "03kldjk90mrnzf2hpd7xky0lpph853mjxc34kfa2m5mbpbpkxz9c"; + sha256 = "sha256-s90+gzjcG27pUcMGpzf2rf+mR8/fmpvwBXGfvv3rNGI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/typical/default.nix b/pkgs/development/python-modules/typical/default.nix new file mode 100644 index 000000000000..ec9cd4d17331 --- /dev/null +++ b/pkgs/development/python-modules/typical/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, inflection +, pendulum +, fastjsonschema +, typing-extensions +, orjson +, future-typing +, poetry-core +, pydantic +, sqlalchemy +, pandas +, mypy +}: + +buildPythonPackage rec { + pname = "typical"; + version = "2.7.9"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "seandstewart"; + repo = "typical"; + rev = "v${version}"; + sha256 = "sha256-ITIsSM92zftnvqLiVGFl//IbBb8N3ffkkqohzOx2JO4="; + }; + + patches = [ + ./use-poetry-core.patch + ]; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ + inflection + pendulum + fastjsonschema + orjson + typing-extensions + future-typing + ]; + + checkInputs = [ + pytestCheckHook + mypy + pydantic + sqlalchemy + pandas + ]; + + disabledTests = [ + "test_ujson" # We use orjson + ]; + + disabledTestPaths = [ + "benchmark/" + ]; + + pythonImportsCheck = [ "typic" ]; + + meta = with lib; { + homepage = "https://python-typical.org/"; + description = "Typical: Python's Typing Toolkit."; + license = licenses.mit; + maintainers = with maintainers; [ kfollesdal ]; + }; +} diff --git a/pkgs/development/python-modules/typical/use-poetry-core.patch b/pkgs/development/python-modules/typical/use-poetry-core.patch new file mode 100644 index 000000000000..f3c32e621aea --- /dev/null +++ b/pkgs/development/python-modules/typical/use-poetry-core.patch @@ -0,0 +1,13 @@ +diff --git a/pyproject.toml b/pyproject.toml +index a588a0d..43da394 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -154,7 +154,7 @@ exclude = ''' + + [build-system] + requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++build-backend = "poetry.core.masonry.api" + + [bumpver] + current_version = "v2.7.5" diff --git a/pkgs/development/python-modules/vilfo-api-client/default.nix b/pkgs/development/python-modules/vilfo-api-client/default.nix index cdc01d93a856..05ce50199708 100644 --- a/pkgs/development/python-modules/vilfo-api-client/default.nix +++ b/pkgs/development/python-modules/vilfo-api-client/default.nix @@ -4,19 +4,20 @@ , setuptools-scm , getmac , requests +, semver , pytestCheckHook , responses }: buildPythonPackage rec { pname = "vilfo-api-client"; - version = "0.3.3"; + version = "0.4.1"; src = fetchFromGitHub { owner = "ManneW"; repo = "vilfo-api-client-python"; - rev = "v${version}"; - sha256 = "1gy5gpsg99rcm1cc3m30232za00r9i46sp74zpd12p3vzz1wyyqf"; + rev = version; + sha256 = "sha256-j06Bbv0hWSmrlCv8RfgvfGTyOF+vSX+zZnX3AvG5Hys="; }; postPatch = '' @@ -33,6 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ getmac requests + semver ]; checkInputs = [ diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix index 63ad60c9f084..e92b47d20933 100644 --- a/pkgs/development/python-modules/webargs/default.nix +++ b/pkgs/development/python-modules/webargs/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { "webargs" ]; - propagatedBuildInputs = [ marshmallow ]; + checkInputs = [ pytestCheckHook pytest-aiohttp diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 0e021d05ac37..3dd40ad1f8a4 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub, installShellFiles +{ stdenv, callPackage, lib, fetchurl, fetchpatch, fetchFromGitHub, installShellFiles , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) , bazel_self @@ -214,6 +214,14 @@ stdenv.mkDerivation rec { src = ../bazel_rc.patch; bazelSystemBazelRCPath = bazelRC; }) + + # On macOS Monterey, protoc segfaults. + # Issue: https://github.com/bazelbuild/bazel/issues/14216 + # Fix: https://github.com/bazelbuild/bazel/pull/14275 + (fetchpatch { + url = "https://github.com/bazelbuild/bazel/commit/ae0a6c98d4f94abedbedb2d51c27de5febd7df67.patch"; + sha256 = "sha256-YcdxqjTMGI86k1wgFqxJqghv0kknAjlFQFpt4VccCTE="; + }) ] ++ lib.optional enableNixHacks ../nix-hacks.patch; diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 16f268297999..77f2bddbf1e1 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "9.1.1"; + version = "9.1.4"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "QqlA/8fEOwucs+nU6ahDh3GB64PdhY8JFWPiyEBxGsE="; + sha256 = "bUhJ1vbesTibXF8rZuVWd5EY8uBbGaYGEbPKSXAVAsE="; name = "${pname}.tar.gz"; }; diff --git a/pkgs/misc/plasma-hud/default.nix b/pkgs/misc/plasma-hud/default.nix new file mode 100644 index 000000000000..4116751f4fec --- /dev/null +++ b/pkgs/misc/plasma-hud/default.nix @@ -0,0 +1,41 @@ +{ lib, python3, fetchFromGitHub, rofi, gobject-introspection }: + +python3.pkgs.buildPythonApplication rec{ + pname = "plasma-hud"; + version = "19.10.1"; + + src = fetchFromGitHub { + owner = "Zren"; + repo = pname; + rev = version; + sha256 = "19vlc156jfdamw7q1pc78fmlf0h3sff5ar3di9j316vbb60js16l"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + rofi + dbus-python + setproctitle + xlib + pygobject3 + gobject-introspection + ]; + format = "other"; + postPatch = '' + sed -i "s:/usr/lib/plasma-hud:$out/bin:" etc/xdg/autostart/plasma-hud.desktop + ''; + + installPhase = '' + patchShebangs $out/bin/plasma-hud + mkdir -p $out/bin $out/etc/xdg/autostart + cp -r $src/usr/lib/plasma-hud/plasma-hud $out/bin/plasma-hud + cp -r $src/etc $out/etc + ''; + + meta = with lib;{ + license = licenses.gpl2Only; + homepage = "https://github.com/Zren/plasma-hud"; + platforms = platforms.unix; + description = "Run menubar commands, much like the Unity 7 Heads-Up Display (HUD)"; + maintainers = with maintainers; [ pasqui23 ]; + }; +} diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index e6ada50152a4..67f525d46a07 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation rec { pname = "openvscode-server"; - version = "1.62.0"; + version = "1.62.3"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${version}"; - sha256 = "0lmka1hgf1703h70s7i2lx07535n2l867kmnc5h89c4vaswy6649"; + sha256 = "0822181gbd6y8bzn65liv7prqv7pg067sbl8nac02zg7268qwi6j"; }; yarnCache = stdenv.mkDerivation { @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "142m0vkddzv09rbbqw7y7x19q7akkn00dn6az5ppr86k6bmhyk6p"; + outputHash = "0rmcixcn7lmrndb2pq0x895qp34hc271h1j0n3xq9rv603v1ayvk"; }; # Extract the Node.js source code which is used to compile packages with diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index f7e33b88cecc..55a28ceb8892 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "hilbish"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "Rosettea"; repo = "Hilbish"; rev = "v${version}"; - sha256 = "sha256-3qU1gQSWxyKgQcHgT61Q+n6u0rGU0vqTdT/VwMN20yw="; + sha256 = "sha256-YQNLv6/4I5WM/xhlWIjThgO23tN+ZCyJVZVatnIUllc="; fetchSubmodules = true; }; - vendorSha256 = "sha256-xnq0CEfz9uVpDkqY5/Sw9O5uMTHV74vQBXrav3bbH7E="; + vendorSha256 = "sha256-xzB6sqBnDuvqTFMmLcXdSj6UFWYzA54PxUBKrFKhyQk="; buildInputs = [ readline ]; diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix new file mode 100644 index 000000000000..a022c4d8ed71 --- /dev/null +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -0,0 +1,32 @@ +# DO NOT EDIT! This file is generated automatically by update.sh +{ }: +{ + version = "365.0.0"; + googleCloudSdkPkgs = { + x86_64-linux = + { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-linux-x86_64.tar.gz"; + sha256 = "1h1z2ddhgrc74gnfaicvginl2yy7zjx8dlvkx017vsd3vijavl41"; + }; + x86_64-darwin = + { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-darwin-x86_64.tar.gz"; + sha256 = "0428pc85jlwsydn5nl7vya3rsbiww8z2jvc68wy1sdk7a1md01cy"; + }; + aarch64-linux = + { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-linux-arm.tar.gz"; + sha256 = "0ji29kd6cfyl59vlms77bnlqf95yh86g9c08wkx1f1kdavi78l0d"; + }; + aarch64-darwin = + { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-darwin-arm.tar.gz"; + sha256 = "1rg996y4r24aif5vv6cnl3g7g6fknz8zv6m87ayl8x7yljrqcy27"; + }; + i686-linux = + { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-365.0.0-linux-x86.tar.gz"; + sha256 = "0jvcridqlk2r5m6b22ldxi9g4mxfy120428ynw9rgpwx0chjmpi6"; + }; + }; +} diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index ac3f9d65c0fe..f0b0c042cbe4 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -17,39 +17,15 @@ let crcmod ] ++ lib.optional (with-gce) google-compute-engine); - baseUrl = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads"; - sources = name: system: { - x86_64-darwin = { - url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "19s3nryngzv7zs7piwx92hii5p2y97fs7wngqrd9v8cxvgavp1dc"; - }; - - aarch64-darwin = { - url = "${baseUrl}/${name}-darwin-arm.tar.gz"; - sha256 = "1iphpkxrrp0gdan7ikbjbhykdpazcs1fnlcwkfyv2m9baggkd53z"; - }; - - x86_64-linux = { - url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "1z1ymvij9vi8jc05b004jhd08dqbk133wd03fdxnagd6nfr0bjqm"; - }; - - i686-linux = { - url = "${baseUrl}/${name}-linux-x86.tar.gz"; - sha256 = "17i5pkwjmi38klgr12xqgza7iwkx459cbavlq0x33zaq2a4zanlc"; - }; - - aarch64-linux = { - url = "${baseUrl}/${name}-linux-arm.tar.gz"; - sha256 = "17zjnab4ai5w6p3cbxys9zsg4bdlp0lh6pvmkvdz9hszxxch4yms"; - }; - }.${system} or (throw "Unsupported system: ${system}"); + data = import ./data.nix { }; + sources = system: + data.googleCloudSdkPkgs.${system} or (throw "Unsupported system: ${system}"); in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "362.0.0"; + inherit (data) version; - src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system); + src = fetchurl (sources stdenv.hostPlatform.system); buildInputs = [ python ]; @@ -135,8 +111,9 @@ in stdenv.mkDerivation rec { # This package contains vendored dependencies. All have free licenses. license = licenses.free; homepage = "https://cloud.google.com/sdk/"; + changelog = "https://cloud.google.com/sdk/docs/release-notes"; maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; + platforms = builtins.attrNames data.googleCloudSdkPkgs; mainProgram = "gcloud"; }; } diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh new file mode 100755 index 000000000000..e0ba8b9c6669 --- /dev/null +++ b/pkgs/tools/admin/google-cloud-sdk/update.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nix + +BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk" + +# Version of Google Cloud SDK from +# https://cloud.google.com/sdk/docs/release-notes +VERSION="365.0.0" + +function genMainSrc() { + local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz" + local sha256 + sha256=$(nix-prefetch-url "$url") + echo " {" + echo " url = \"${url}\";" + echo " sha256 = \"${sha256}\";" + echo " };" +} + +{ + cat <data.nix diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix index 3f75e8e33af0..f3cacf32cf1e 100644 --- a/pkgs/tools/misc/pmbootstrap/default.nix +++ b/pkgs/tools/misc/pmbootstrap/default.nix @@ -1,13 +1,13 @@ -{ lib, git, openssl, makeWrapper, buildPythonApplication, pytestCheckHook, ps +{ stdenv, lib, git, openssl, makeWrapper, buildPythonApplication, pytestCheckHook, ps , fetchPypi, fetchFromGitLab }: buildPythonApplication rec { pname = "pmbootstrap"; - version = "1.30.0"; + version = "1.39.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uHN3nplQOMuBeQIxAocCVqwnmJUQZL67+iXLhQ7onps="; + sha256 = "13krdb0xmwgldfn8izm1x3j6i6s4n9j8n8n0p4g5kd74ygkvfczz"; }; repo = fetchFromGitLab { @@ -15,7 +15,7 @@ buildPythonApplication rec { owner = "postmarketOS"; repo = pname; rev = version; - sha256 = "sha256-JunI/mqq+UvmzNVt3mdJN3+tKGN4uTrxkUU2imCNCNY="; + sha256 = "0mrhgi5y3jwd922cmm2niy9ia0g8p6bsqjjxg523yandshpa3683"; }; pmb_test = "${repo}/test"; @@ -23,64 +23,65 @@ buildPythonApplication rec { checkInputs = [ pytestCheckHook git openssl ps ]; # Add test dependency in PATH - checkPhase = "export PYTHONPATH=$PYTHONPATH:${pmb_test}"; + preCheck = "export PYTHONPATH=$PYTHONPATH:${pmb_test}"; # skip impure tests disabledTests = [ - "test_get_apkbuild" - "test_check_build_for_arch" - "test_get_depends" - "test_build_depends_no_binary_error" - "test_build_depends_binary_outdated" - "test_init_buildenv" - "test_run_abuild" - "test_finish" - "test_package" - "test_build_depends_high_level" - "test_build_local_source_high_level" - "test_chroot_interactive_shell" - "test_chroot_interactive_shell_user" - "test_chroot_arguments" - "test_switch_to_channel_branch" - "test_read_config_channel" - "test_cross_compile_distcc" - "test_build_src_invalid_path" - "test_can_fast_forward" - "test_clean_worktree" - "test_get_upstream_remote" - "test_pull" - "test_helpers_package_get_apkindex" - "test_filter_missing_packages_invalid" - "test_filter_missing_packages_binary_exists" - "test_filter_missing_packages_pmaports" - "test_filter_aport_packages" - "test_pmbootstrap_status" - "test_print_checks_git_repo" - "test_helpers_ui" - "test_newapkbuild" - "test_package_from_aports" - "test_recurse_invalid" - "test_questions_bootimg" - "test_questions_keymaps" - "test_questions_work_path" - "test_questions_channel" "test_apk_static" "test_aportgen" "test_aportgen_device_wizard" "test_bootimg" + "test_build_depends_binary_outdated" + "test_build_depends_high_level" + "test_build_depends_no_binary_error" "test_build_is_necessary" + "test_build_local_source_high_level" + "test_build_src_invalid_path" + "test_can_fast_forward" + "test_check_build_for_arch" + "test_chroot_arguments" + "test_chroot_interactive_shell" + "test_chroot_interactive_shell_user" + "test_clean_worktree" "test_config_user" + "test_cross_compile_distcc" "test_crossdirect" "test_file" + "test_filter_aport_packages" + "test_filter_missing_packages_binary_exists" + "test_filter_missing_packages_invalid" + "test_filter_missing_packages_pmaports" + "test_finish" "test_folder_size" + "test_get_apkbuild" + "test_get_depends" + "test_get_upstream_remote" "test_helpers_lint" + "test_helpers_package_get_apkindex" "test_helpers_repo" + "test_helpers_ui" + "test_init_buildenv" "test_kconfig_check" "test_keys" + "test_newapkbuild" + "test_package" + "test_package_from_aports" "test_pkgrel_bump" + "test_pmbootstrap_status" + "test_print_checks_git_repo" + "test_pull" "test_qemu_running_processes" + "test_questions_additional_options" + "test_questions_bootimg" + "test_questions_channel" + "test_questions_keymaps" + "test_questions_work_path" + "test_read_config_channel" + "test_recurse_invalid" + "test_run_abuild" "test_run_core" "test_shell_escape" + "test_switch_to_channel_branch" "test_version" ]; @@ -91,5 +92,7 @@ buildPythonApplication rec { homepage = "https://gitlab.com/postmarketOS/pmbootstrap"; license = licenses.gpl3Plus; maintainers = with maintainers; [ payas ]; + # https://github.com/NixOS/nixpkgs/pull/146576#issuecomment-974267651 + broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index 75eaa8774df2..fda4c30ccedc 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -1,22 +1,33 @@ -{ stdenv, lib, openssl, pkg-config, rustPlatform, fetchFromGitHub, Security -, libiconv, installShellFiles }: +{ stdenv +, lib +, pkg-config +, rustPlatform +, fetchFromGitHub +, installShellFiles +, withNativeTls ? true +, Security +, libiconv +, openssl }: rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-fTd4VSUUj9Im+kCEuFgDsA7eofM1xQfrRzigr1vyJ3I="; + sha256 = "sha256-G6uAHpptX+hvh0ND+mqgR3AG0GT/qily6Y8Pt5yVbxg="; }; - cargoSha256 = "sha256-yZdGw/6iVg8PaUyjTrxj6h/2yhBtqEqvMhdRHhMwDZc="; + cargoSha256 = "sha256-W2l1kiD2yY6FFA29WYPlWCjxKzuSgCdPN8M8bE4QGMU="; + + buildFeatures = lib.optional withNativeTls "native-tls"; nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]; + buildInputs = lib.optionals withNativeTls + (if stdenv.isDarwin then [ Security libiconv ] else [ openssl ]); # Get openssl-sys to use pkg-config OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 3997fdba293d..aac38ef1b1fd 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-11-23"; + version = "2021-11-24"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-mYElt+KdeyRxr0Ef++/o47IWhPXBFmRIHbnw1UNXfr4="; + sha256 = "sha256-pe4SQRVE4e6tNy5eF5uthI6AZ8BwaX72EpNxAU0+UmY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 354a51a55889..599b2bbbbbc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1087,6 +1087,8 @@ with pkgs; nimmm = callPackage ../applications/terminal-emulators/nimmm { }; + notion-app-enhanced = callPackage ../applications/office/notion-app-enhanced { }; + pikchr = callPackage ../tools/graphics/pikchr { }; roxterm = callPackage ../applications/terminal-emulators/roxterm { }; @@ -2429,6 +2431,8 @@ with pkgs; cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { }; + cfm = callPackage ../applications/misc/cfm { }; + charliecloud = callPackage ../applications/virtualization/charliecloud { }; chelf = callPackage ../tools/misc/chelf { }; @@ -19210,6 +19214,8 @@ with pkgs; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; + plasma-hud = callPackage ../misc/plasma-hud { }; + re2 = callPackage ../development/libraries/re2 { }; qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; @@ -24883,14 +24889,20 @@ with pkgs; keepass = callPackage ../applications/misc/keepass { }; + keepass-charactercopy = callPackage ../applications/misc/keepass-plugins/charactercopy { }; + keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { }; keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { }; keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { }; + keepass-keetraytotp = callPackage ../applications/misc/keepass-plugins/keetraytotp { }; + keepass-otpkeyprov = callPackage ../applications/misc/keepass-plugins/otpkeyprov { }; + keepass-qrcodeview = callPackage ../applications/misc/keepass-plugins/qrcodeview { }; + kerbrute = callPackage ../tools/security/kerbrute { }; exrdisplay = callPackage ../applications/graphics/exrdisplay { }; @@ -26964,6 +26976,7 @@ with pkgs; sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { }; youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { }; + cutter = callPackage ../applications/video/mpv/scripts/cutter.nix { }; }; mrpeach = callPackage ../applications/audio/pd-plugins/mrpeach { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index bf340c10cb3b..4cf186715b8b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ buildPackages, pkgs, newScope, stdenv }: +{ buildPackages, pkgsBuildTarget, pkgs, newScope, stdenv }: let # These are attributes in compiler and packages that don't support integer-simple. @@ -79,7 +79,7 @@ in { else packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_7; + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix { @@ -96,7 +96,7 @@ in { # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - buildLlvmPackages = buildPackages.llvmPackages_9; + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { @@ -109,7 +109,7 @@ in { packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.darwin) autoSignDarwinBinariesHook; - buildLlvmPackages = buildPackages.llvmPackages_10; + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; }; ghc921 = callPackage ../development/compilers/ghc/9.2.1.nix { @@ -124,7 +124,7 @@ in { # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - buildLlvmPackages = buildPackages.llvmPackages_10; + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { @@ -134,7 +134,7 @@ in { # https://github.com/xattr/xattr/issues/44 and # https://github.com/xattr/xattr/issues/55 are solved. inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - buildLlvmPackages = buildPackages.llvmPackages_10; + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; libffi = pkgs.libffi; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 501eef96516c..f5ac834709c9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2984,6 +2984,8 @@ in { future-fstrings = callPackage ../development/python-modules/future-fstrings { }; + future-typing = callPackage ../development/python-modules/future-typing { }; + fuzzyfinder = callPackage ../development/python-modules/fuzzyfinder { }; fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; @@ -9613,6 +9615,8 @@ in { typesystem = callPackage ../development/python-modules/typesystem { }; + typical = callPackage ../development/python-modules/typical { }; + typing = null; typing-extensions = callPackage ../development/python-modules/typing-extensions { }; @@ -9937,6 +9941,8 @@ in { weasyprint = callPackage ../development/python-modules/weasyprint { }; + webargs = callPackage ../development/python-modules/webargs { }; + webapp2 = callPackage ../development/python-modules/webapp2 { }; webassets = callPackage ../development/python-modules/webassets { }; @@ -9955,8 +9961,6 @@ in { webhelpers = callPackage ../development/python-modules/webhelpers { }; - webargs = callPackage ../development/python-modules/webargs { }; - webob = callPackage ../development/python-modules/webob { }; weboob = callPackage ../development/python-modules/weboob { };