diff options
77 files changed, 3276 insertions, 2792 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a12f5443c6de..b2187c8fb8f1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7184,6 +7184,12 @@ githubId = 1414088; name = "Spencer Whitt"; }; + squalus = { + email = "squalus@tuta.io"; + github = "squalus"; + githubId = 36899624; + name = "squalus"; + }; srghma = { email = "srghma@gmail.com"; github = "srghma"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index caee548d719c..55482b00a3de 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -38,6 +38,6 @@ with lib.maintainers; { vdemeester zowoq ]; - scope = "Maintain Podman related packages and modules."; + scope = "Maintain Podman and CRI-O related packages and modules."; }; } diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 3e29c19af8fb..955c19bd98e6 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -45,6 +45,11 @@ There is a new module for Podman(<varname>virtualisation.podman</varname>), a drop-in replacement for the Docker command line. </para> </listitem> + <listitem> + <para> + The new <varname>virtualisation.containers</varname> module manages configuration shared by the CRI-O and Podman modules. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index e6127e284869..7d184575640b 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -30,7 +30,7 @@ in type = types.bool; default = false; description = '' - This option enables the common libpod container configuration module. + This option enables the common /etc/containers configuration module. ''; }; @@ -89,35 +89,10 @@ in ''; }; - libpod = mkOption { - default = {}; - description = "Libpod configuration"; - type = types.submodule { - options = { - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra configuration that should be put in the libpod.conf - configuration file - ''; - - }; - }; - }; - }; - }; config = lib.mkIf cfg.enable { - environment.etc."containers/libpod.conf".text = '' - cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] - cni_config_dir = "/etc/cni/net.d/" - - '' + cfg.libpod.extraConfig; - environment.etc."containers/registries.conf".source = toTOML "registries.conf" { registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; }; diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 9bedb6be54a4..89ba9c3c6636 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -6,6 +6,14 @@ let cfg = config.virtualisation.cri-o; in { + imports = [ + (mkRenamedOptionModule [ "virtualisation" "cri-o" "registries" ] [ "virtualisation" "containers" "registries" "search" ]) + ]; + + meta = { + maintainers = lib.teams.podman.members; + }; + options.virtualisation.cri-o = { enable = mkEnableOption "Container Runtime Interface for OCI (CRI-O)"; @@ -32,12 +40,6 @@ in default = "/pause"; description = "Pause command to be executed"; }; - - registries = mkOption { - type = types.listOf types.str; - default = [ "docker.io" "quay.io" ]; - description = "Registries to be configured for unqualified image pull"; - }; }; config = mkIf cfg.enable { @@ -53,9 +55,6 @@ in [crio.image] pause_image = "${cfg.pauseImage}" pause_command = "${cfg.pauseCommand}" - registries = [ - ${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries} - ] [crio.network] plugin_dirs = ["${pkgs.cni-plugins}/bin/"] @@ -85,7 +84,7 @@ in } ''; - # Enable common container configuration, this will create policy.json + # Enable common /etc/containers configuration virtualisation.containers.enable = true; systemd.services.crio = { diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 1486b96e41d1..41d50dc73084 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -54,6 +54,25 @@ in ''; }; + libpod = mkOption { + default = {}; + description = "Libpod configuration"; + type = types.submodule { + options = { + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the libpod.conf + configuration file + ''; + + }; + }; + }; + }; + }; config = lib.mkIf cfg.enable { @@ -70,8 +89,15 @@ in ] ++ lib.optional cfg.dockerCompat dockerCompat; + environment.etc."containers/libpod.conf".text = '' + cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] + cni_config_dir = "/etc/cni/net.d/" + + '' + cfg.libpod.extraConfig; + environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman.src}/cni/87-podman-bridge.conflist"; + # Enable common /etc/containers configuration virtualisation.containers.enable = true; }; diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index ccfe8334a160..283db71d9a49 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -10,21 +10,51 @@ import ./make-test-python.nix ( nodes = { podman = { pkgs, ... }: - { - virtualisation.podman.enable = true; + { + virtualisation.podman.enable = true; + virtualisation.containers.users = [ + "alice" + ]; + + users.users.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; }; + + }; }; testScript = '' - start_all() + import shlex + + + def su_cmd(cmd): + cmd = shlex.quote(cmd) + return f"su alice -l -c {cmd}" + podman.wait_for_unit("sockets.target") - podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") - podman.succeed( - "podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" - ) - podman.succeed("podman ps | grep sleeping") - podman.succeed("podman stop sleeping") + start_all() + + + with subtest("Run container as root"): + podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + podman.succeed( + "podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + podman.succeed("podman ps | grep sleeping") + podman.succeed("podman stop sleeping") + + with subtest("Run container rootless"): + podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) + podman.succeed( + su_cmd( + "podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + ) + podman.succeed(su_cmd("podman ps | grep sleeping")) + podman.succeed(su_cmd("podman stop sleeping")) ''; } ) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 5c9456b76a63..f5c77bd09fd0 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -164,12 +164,120 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac ivy-rtags = fix-rtags super.ivy-rtags; + mandoku = super.mandoku.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-circleci = super.magit-circleci.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-find-file = super.magit-find-file.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-gh-pulls = super.magit-gh-pulls.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-imerge = super.magit-imerge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-lfs = super.magit-lfs.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-org-todos = super.magit-org-todos.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-p4 = super.magit-p4.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-rbr = super.magit-rbr.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-stgit = super.magit-stgit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-tbdiff = super.magit-tbdiff.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-topgit = super.magit-topgit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-vcsh = super.magit-vcsh.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-gerrit = super.magit-gerrit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = @@ -206,12 +314,24 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + kapacitor = super.kapacitor.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + kubernetes = super.kubernetes.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + kubernetes-evil = super.kubernetes-evil.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # upstream issue: missing file header mhc = super.mhc.override { inherit (self.melpaPackages) calfw; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index ae9576e6cbc7..323fc501c842 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -41,6 +41,13 @@ with python3.pkgs; buildPythonApplication rec { checkInputs = [ pytest glibcLocales ]; LC_ALL = "en_US.UTF-8"; + postPatch = '' + sed -i \ + -e "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" \ + -e "s/Invalid value for \"\[ICS\]\"/Invalid value for \\\'\[ICS\]\\\'/" \ + tests/cli_test.py + ''; + postInstall = '' # zsh completion install -D misc/__khal $out/share/zsh/site-functions/__khal diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index d16822279206..90dd04c9d680 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.17.2"; + version = "0.17.3"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0xiwz89ynhh8aj0c9jbqfsxf129hnzs0gz4bzcparnjisq2sh3cq"; + sha256 = "1nx8gjavq8kc656ayh3wign1f68b46jbnmy8zyks25wg0p9gid8l"; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix new file mode 100644 index 000000000000..87248013a9af --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix @@ -0,0 +1,94 @@ +{ stdenv, mkChromiumDerivation, channel, enableWideVine }: + +with stdenv.lib; + +mkChromiumDerivation (base: rec { + name = "chromium-browser"; + packageName = "chromium"; + buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ]; + + outputs = ["out" "sandbox"]; + + sandboxExecutableName = "__chromium-suid-sandbox"; + + installPhase = '' + mkdir -p "$libExecPath" + cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" + cp -v "$buildPath/icudtl.dat" "$libExecPath/" + cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" + cp -v "$buildPath/chrome" "$libExecPath/$packageName" + + # Swiftshader + # See https://stackoverflow.com/a/4264351/263061 for the find invocation. + if [ -n "$(find "$buildPath/swiftshader/" -maxdepth 1 -name '*.so' -print -quit)" ]; then + echo "Swiftshader files found; installing" + mkdir -p "$libExecPath/swiftshader" + cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/" + else + echo "Swiftshader files not found" + fi + + mkdir -p "$sandbox/bin" + cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}" + + mkdir -vp "$out/share/man/man1" + cp -v "$buildPath/chrome.1" "$out/share/man/man1/$packageName.1" + + for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do + num_and_suffix="''${icon_file##*logo_}" + icon_size="''${num_and_suffix%.*}" + expr "$icon_size" : "^[0-9][0-9]*$" || continue + logo_output_prefix="$out/share/icons/hicolor" + logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" + mkdir -vp "$logo_output_path" + cp -v "$icon_file" "$logo_output_path/$packageName.png" + done + + # Install Desktop Entry + install -D chrome/installer/linux/common/desktop.template \ + $out/share/applications/chromium-browser.desktop + + substituteInPlace $out/share/applications/chromium-browser.desktop \ + --replace "@@MENUNAME@@" "Chromium" \ + --replace "@@PACKAGE@@" "chromium" \ + --replace "Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "Exec=chromium" + + # Append more mime types to the end + sed -i '/^MimeType=/ s,$,x-scheme-handler/webcal;x-scheme-handler/mailto;x-scheme-handler/about;x-scheme-handler/unknown,' \ + $out/share/applications/chromium-browser.desktop + + # See https://github.com/NixOS/nixpkgs/issues/12433 + sed -i \ + -e '/\[Desktop Entry\]/a\' \ + -e 'StartupWMClass=chromium-browser' \ + $out/share/applications/chromium-browser.desktop + ''; + + passthru = { inherit sandboxExecutableName; }; + + requiredSystemFeatures = [ "big-parallel" ]; + + meta = { + description = "An open source web browser from Google, with dependencies on Google web services removed"; + longDescription = '' + Chromium is an open source web browser from Google that aims to build a + safer, faster, and more stable way for all Internet users to experience + the web. It has a minimalist user interface and provides the vast majority + of source code for Google Chrome (which has some additional features). + ''; + homepage = https://github.com/Eloston/ungoogled-chromium; + maintainers = with maintainers; [ squalus ]; + # Overview of the maintainer roles: + # nixos-unstable: + # - TODO: Need a new maintainer for x86_64 [0] + # - @thefloweringash: aarch64 + # - @primeos: Provisional maintainer (x86_64) + # Stable channel: + # - TODO (need someone to test backports [0]) + # [0]: https://github.com/NixOS/nixpkgs/issues/78450 + license = if enableWideVine then licenses.unfree else licenses.bsd3; + platforms = platforms.linux; + hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; + timeout = 172800; # 48 hours + }; +}) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix new file mode 100644 index 000000000000..d07da2b3b07a --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -0,0 +1,361 @@ +{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar + +# default dependencies +, bzip2, flac, speex, libopus +, libevent, expat, libjpeg, snappy +, libpng, libcap +, xdg_utils, yasm, minizip, libwebp +, libusb1, pciutils, nss, re2, zlib + +, python2Packages, perl, pkgconfig +, nspr, systemd, kerberos +, utillinux, alsaLib +, bison, gperf +, glib, gtk3, dbus-glib +, glibc +, libXScrnSaver, libXcursor, libXtst, libGLU, libGL +, protobuf, speechd, libXdamage, cups +, ffmpeg, libxslt, libxml2, at-spi2-core +, jre + +# optional dependencies +, libgcrypt ? null # gnomeSupport || cupsSupport +, libva ? null # useVaapi +, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone + +# package customization +, useVaapi ? false +, useOzone ? false +, gnomeSupport ? false, gnome ? null +, gnomeKeyringSupport ? false, libgnome-keyring3 ? null +, proprietaryCodecs ? true +, cupsSupport ? true +, pulseSupport ? false, libpulseaudio ? null +, ungoogled-chromium +, ungoogled ? false + +, upstream-info +}: + +buildFun: + +with stdenv.lib; + +# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html + +let + # The additional attributes for creating derivations based on the chromium + # source tree. + extraAttrs = buildFun base; + + githubPatch = commit: sha256: fetchpatch { + url = "https://github.com/chromium/chromium/commit/${commit}.patch"; + inherit sha256; + }; + + mkGnFlags = + let + # Serialize Nix types into GN types according to this document: + # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md + mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; + sanitize = value: + if value == true then "true" + else if value == false then "false" + else if isList value then "[${concatMapStringsSep ", " sanitize value}]" + else if isInt value then toString value + else if isString value then mkGnString value + else throw "Unsupported type for GN value `${value}'."; + toFlag = key: value: "${key}=${sanitize value}"; + in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + + gnSystemLibraries = [ + "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" + # "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config + # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* + # "re2" # fails with linker errors + # "ffmpeg" # https://crbug.com/731766 + # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source + ]; + + opusWithCustomModes = libopus.override { + withCustomModes = true; + }; + + defaultDependencies = [ + bzip2 flac speex opusWithCustomModes + libevent expat libjpeg snappy + libpng libcap + xdg_utils yasm minizip libwebp + libusb1 re2 zlib + ffmpeg libxslt libxml2 + # harfbuzz # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source + ]; + + # build paths and release info + packageName = extraAttrs.packageName or extraAttrs.name; + buildType = "Release"; + buildPath = "out/${buildType}"; + libExecPath = "$out/libexec/${packageName}"; + + versionRange = min-version: upto-version: + let inherit (upstream-info) version; + result = versionAtLeast version min-version && versionOlder version upto-version; + stable-version = (import ./upstream-info.nix).stable.version; + in if versionAtLeast stable-version upto-version + then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." + result + else result; + + ungoogler = + let versionEntry = (import ./ungoogled-src.nix)."${upstream-info.version}"; + in ungoogled-chromium { + inherit (versionEntry) rev sha256; + }; + base = rec { + name = "${packageName}-unwrapped-${version}"; + inherit (upstream-info) channel version; + inherit packageName buildType buildPath; + + src = upstream-info.main; + + nativeBuildInputs = [ + ninja which python2Packages.python perl pkgconfig + python2Packages.ply python2Packages.jinja2 nodejs + gnutar + ] ++ optional (versionAtLeast version "83") python2Packages.setuptools; + + buildInputs = defaultDependencies ++ [ + nspr nss systemd + utillinux alsaLib + bison gperf kerberos + glib gtk3 dbus-glib + libXScrnSaver libXcursor libXtst libGLU libGL + pciutils protobuf speechd libXdamage at-spi2-core + jre + ] ++ optional gnomeKeyringSupport libgnome-keyring3 + ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] + ++ optionals cupsSupport [ libgcrypt cups ] + ++ optional useVaapi libva + ++ optional pulseSupport libpulseaudio + ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; + + patches = [ + ./patches/nix_plugin_paths_68.patch + ./patches/remove-webp-include-69.patch + ./patches/no-build-timestamps.patch + ./patches/widevine-79.patch + ./patches/dont-use-ANGLE-by-default.patch + # Unfortunately, chromium regularly breaks on major updates and + # then needs various patches backported in order to be compiled with GCC. + # Good sources for such patches and other hints: + # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ + # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium + # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits + # + # ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ] + # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) + ] ++ optionals (useVaapi) ([ + # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi + ./patches/vaapi-fix.patch + ] ++ optionals (versionRange "81" "82") [ + (githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902") + (githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064") + ]); + + postPatch = '' + # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX + substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ + --replace \ + 'return sandbox_binary;' \ + 'return base::FilePath(GetDevelSandboxPath());' + + substituteInPlace services/audio/audio_sandbox_hook_linux.cc \ + --replace \ + '/usr/share/alsa/' \ + '${alsaLib}/share/alsa/' \ + --replace \ + '/usr/lib/x86_64-linux-gnu/gconv/' \ + '${glibc}/lib/gconv/' \ + --replace \ + '/usr/share/locale/' \ + '${glibc}/share/locale/' + + sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ + chrome/browser/shell_integration_linux.cc + + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + gpu/config/gpu_info_collector_linux.cc + + sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ + chrome/browser/ui/webui/engagement/site_engagement_ui.cc + + sed -i -e '/#include/ { + i #include <algorithm> + :l; n; bl + }' gpu/config/gpu_control_list.cc + + # Allow to put extensions into the system-path. + sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc + + patchShebangs . + # use our own nodejs + mkdir -p third_party/node/linux/node-linux-x64/bin + ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node + + # remove unused third-party + # in third_party/crashpad third_party/zlib contains just a header-adapter + for lib in ${toString gnSystemLibraries}; do + find -type f -path "*third_party/$lib/*" \ + \! -path "*third_party/crashpad/crashpad/third_party/zlib/*" \ + \! -path "*third_party/$lib/chromium/*" \ + \! -path "*third_party/$lib/google/*" \ + \! -path "*base/third_party/icu/*" \ + \! -path "*base/third_party/libevent/*" \ + \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ + -delete + done + '' + optionalString stdenv.isAarch64 '' + substituteInPlace build/toolchain/linux/BUILD.gn \ + --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + '' + optionalString stdenv.cc.isClang '' + mkdir -p third_party/llvm-build/Release+Asserts/bin + ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang + ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++ + ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar + '' + optionalString ungoogled '' + ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" + ${ungoogler}/utils/patches.py . ${ungoogler}/patches + ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz . + ''; + + gnFlags = mkGnFlags ({ + linux_use_bundled_binutils = false; + use_lld = false; + use_gold = true; + gold_path = "${stdenv.cc}/bin"; + is_debug = false; + + proprietary_codecs = false; + use_sysroot = false; + use_gnome_keyring = gnomeKeyringSupport; + use_gio = gnomeSupport; + # ninja: error: '../../native_client/toolchain/linux_x86/pnacl_newlib/bin/x86_64-nacl-objcopy', + # needed by 'nacl_irt_x86_64.nexe', missing and no known rule to make it + enable_nacl = false; + # Enabling the Widevine component here doesn't affect whether we can + # redistribute the chromium package; the Widevine component is either + # added later in the wrapped -wv build or downloaded from Google. + enable_widevine = true; + use_cups = cupsSupport; + + treat_warnings_as_errors = false; + is_clang = stdenv.cc.isClang; + clang_use_chrome_plugins = false; + blink_symbol_level = 0; + fieldtrial_testing_like_official_build = true; + + # Google API keys, see: + # http://www.chromium.org/developers/how-tos/api-keys + # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, + # please get your own set of keys. + google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; + google_default_client_id = "404761575300.apps.googleusercontent.com"; + google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; + } // optionalAttrs proprietaryCodecs { + # enable support for the H.264 codec + proprietary_codecs = true; + enable_hangout_services_extension = true; + ffmpeg_branding = "Chrome"; + } // optionalAttrs useVaapi { + use_vaapi = true; + } // optionalAttrs pulseSupport { + use_pulseaudio = true; + link_pulseaudio = true; + } // optionalAttrs useOzone { + use_ozone = true; + ozone_platform_gbm = false; + use_xkbcommon = true; + use_glib = true; + use_gtk = true; + use_system_libwayland = true; + use_system_minigbm = true; + use_system_libdrm = true; + system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; + } // optionalAttrs ungoogled { + closure_compile = false; + enable_hangout_services_extension = false; + enable_mdns = false; + enable_nacl_nonsfi = false; + enable_one_click_signin = false; + enable_reading_list = false; + enable_remoting = false; + enable_reporting = false; + enable_service_discovery = false; + exclude_unwind_tables = true; + google_api_key = ""; + google_default_client_id = ""; + google_default_client_secret = ""; + optimize_webui = false; + safe_browsing_mode = 0; + use_official_google_api_keys = false; + use_unofficial_version_number = false; + } // (extraAttrs.gnFlags or {})); + + configurePhase = '' + runHook preConfigure + + # This is to ensure expansion of $out. + libExecPath="${libExecPath}" + python build/linux/unbundle/replace_gn_files.py \ + --system-libraries ${toString gnSystemLibraries} + ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt + + # Fail if `gn gen` contains a WARNING. + grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 + + runHook postConfigure + ''; + + # Don't spam warnings about unknown warning options. This is useful because + # our Clang is always older than Chromium's and the build logs have a size + # of approx. 25 MB without this option (and this saves e.g. 66 %). + NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; + + buildPhase = let + # Build paralelism: on Hydra the build was frequently running into memory + # exhaustion, and even other users might be running into similar issues. + # -j is halved to avoid memory problems, and -l is slightly increased + # so that the build gets slight preference before others + # (it will often be on "critical path" and at risk of timing out) + buildCommand = target: '' + ninja -C "${buildPath}" \ + -j$(( ($NIX_BUILD_CORES+1) / 2 )) -l$(( $NIX_BUILD_CORES+1 )) \ + "${target}" + ( + source chrome/installer/linux/common/installer.include + PACKAGE=$packageName + MENUNAME="Chromium" + process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1" + ) + ''; + targets = extraAttrs.buildTargets or []; + commands = map buildCommand targets; + in concatStringsSep "\n" commands; + + postFixup = '' + # Make sure that libGLESv2 is found by dlopen (if using EGL). + chromiumBinary="$libExecPath/$packageName" + origRpath="$(patchelf --print-rpath "$chromiumBinary")" + patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" + ''; + }; + +# Remove some extraAttrs we supplied to the base attributes already. +in stdenv.mkDerivation (base // removeAttrs extraAttrs [ + "name" "gnFlags" "buildTargets" +]) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix new file mode 100644 index 000000000000..f172e7c09ce2 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -0,0 +1,205 @@ +{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10 +, makeWrapper, ed +, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit +, libva ? null +, gcc, nspr, nss, patchelfUnstable, runCommand +, lib + +# package customization +, channel ? "stable" +, gnomeSupport ? false, gnome ? null +, gnomeKeyringSupport ? false +, proprietaryCodecs ? true +, enablePepperFlash ? false +, enableWideVine ? false +, ungoogled ? true +, useVaapi ? false # test video on radeon, before enabling this +, useOzone ? false +, cupsSupport ? true +, pulseSupport ? config.pulseaudio or stdenv.isLinux +, commandLineArgs ? "" +}: + +let + llvmPackages = if channel == "dev" + then llvmPackages_10 + else llvmPackages_9; + stdenv = llvmPackages.stdenv; + + callPackage = newScope chromium; + + chromium = { + inherit stdenv llvmPackages; + + upstream-info = (callPackage ./update.nix {}).getChannel channel; + + mkChromiumDerivation = callPackage ./common.nix ({ + inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone ungoogled; + gnChromium = gn; + } // lib.optionalAttrs (channel == "dev") { + # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): + gnChromium = gn.overrideAttrs (oldAttrs: { + version = "2020-03-23"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9"; + sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy"; + }; + }); + }); + + browser = callPackage ./browser.nix { inherit channel enableWideVine; }; + + plugins = callPackage ./plugins.nix { + inherit enablePepperFlash; + }; + + ungoogled-chromium = callPackage ./ungoogled.nix {}; + }; + + mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; + widevineCdm = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation { + name = "chrome-widevine-cdm"; + + # The .deb file for Google Chrome + src = upstream-info.binary; + + nativeBuildInputs = [ patchelfUnstable ]; + + phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; + + unpackCmd = let + widevineCdmPath = + if upstream-info.channel == "stable" then + "./opt/google/chrome/WidevineCdm" + else if upstream-info.channel == "beta" then + "./opt/google/chrome-beta/WidevineCdm" + else if upstream-info.channel == "dev" then + "./opt/google/chrome-unstable/WidevineCdm" + else + throw "Unknown chromium channel."; + in '' + # Extract just WidevineCdm from upstream's .deb file + ar p "$src" data.tar.xz | tar xJ "${widevineCdmPath}" + + # Move things around so that we don't have to reference a particular + # chrome-* directory later. + mv "${widevineCdmPath}" ./ + + # unpackCmd wants a single output directory; let it take WidevineCdm/ + rm -rf opt + ''; + + doCheck = true; + checkPhase = '' + ! find -iname '*.so' -exec ldd {} + | grep 'not found' + ''; + + PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ]; + + patchPhase = '' + patchelf --set-rpath "$PATCH_RPATH" _platform_specific/linux_x64/libwidevinecdm.so + ''; + + installPhase = '' + mkdir -p $out/WidevineCdm + cp -a * $out/WidevineCdm/ + ''; + + meta = { + platforms = [ "x86_64-linux" ]; + license = lib.licenses.unfree; + }; + }; + + suffix = if channel != "stable" then "-" + channel else ""; + + sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; + + version = chromium.browser.version; + + # We want users to be able to enableWideVine without rebuilding all of + # chromium, so we have a separate derivation here that copies chromium + # and adds the unfree WidevineCdm. + chromiumWV = let browser = chromium.browser; in if enableWideVine then + runCommand (browser.name + "-wv") { version = browser.version; } + '' + mkdir -p $out + cp -a ${browser}/* $out/ + chmod u+w $out/libexec/chromium + cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/ + '' + else browser; +in stdenv.mkDerivation { + name = "chromium${suffix}-${version}"; + inherit version; + + buildInputs = [ + makeWrapper ed + + # needed for GSETTINGS_SCHEMAS_PATH + gsettings-desktop-schemas glib gtk3 + + # needed for XDG_ICON_DIRS + gnome3.adwaita-icon-theme + ]; + + outputs = ["out" "sandbox"]; + + buildCommand = let + browserBinary = "${chromiumWV}/libexec/chromium/chromium"; + getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; + libPath = stdenv.lib.makeLibraryPath ([] + ++ stdenv.lib.optional useVaapi libva + ); + + in with stdenv.lib; '' + mkdir -p "$out/bin" + + eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ + --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ + ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} + + ed -v -s "$out/bin/chromium" << EOF + 2i + + if [ -x "/run/wrappers/bin/${sandboxExecutableName}" ] + then + export CHROME_DEVEL_SANDBOX="/run/wrappers/bin/${sandboxExecutableName}" + else + export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}" + fi + + '' + lib.optionalString (libPath != "") '' + # To avoid loading .so files from cwd, LD_LIBRARY_PATH here must not + # contain an empty section before or after a colon. + export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${libPath}" + '' + '' + + # libredirect causes chromium to deadlock on startup + export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" + + export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS + + . + w + EOF + + ln -sv "${chromium.browser.sandbox}" "$sandbox" + + ln -s "$out/bin/chromium" "$out/bin/chromium-browser" + + mkdir -p "$out/share" + for f in '${chromium.browser}'/share/*; do # hello emacs */ + ln -s -t "$out/share/" "$f" + done + ''; + + inherit (chromium.browser) packageName; + meta = chromium.browser.meta; + passthru = { + inherit (chromium) upstream-info browser; + mkDerivation = chromium.mkChromiumDerivation; + inherit sandboxExecutableName; + }; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch new file mode 100644 index 000000000000..9f14a304eb34 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch @@ -0,0 +1,26 @@ +A field trial currently enables the passthrough command decoder, which causes +gl_factory.cc to try kGLImplementationEGLANGLE first, which causes Chromium to fail +to load libGLESv2.so on NixOS. It somehow does not try kGLImplementationDesktopGL, +and so there is no GL support at all. + +Revert to using the validating command decoder, which prevents gl_factory.cc +from touching allowed_impls, allowing it to successfully use kGLImplementationDesktopGL. + +diff --git a/ui/gl/gl_utils.cc b/ui/gl/gl_utils.cc +index 697cbed5fe2d..8419bdb21a2f 100644 +--- a/ui/gl/gl_utils.cc ++++ b/ui/gl/gl_utils.cc +@@ -71,9 +71,10 @@ bool UsePassthroughCommandDecoder(const base::CommandLine* command_line) { + } else if (switch_value == kCmdDecoderValidatingName) { + return false; + } else { +- // Unrecognized or missing switch, use the default. +- return base::FeatureList::IsEnabled( +- features::kDefaultPassthroughCommandDecoder); ++ // Ignore the field trial that enables it; disable it until ++ // gl_factory.cc kGLImplementationEGLANGLE issues are sorted ++ // out on NixOS. ++ return false; + } + } + } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch new file mode 100644 index 000000000000..da6a4c92b460 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch @@ -0,0 +1,61 @@ +diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc +index f4e119d..d9775bd 100644 +--- a/chrome/common/chrome_paths.cc ++++ b/chrome/common/chrome_paths.cc +@@ -68,21 +68,14 @@ static base::LazyInstance<base::FilePath> + g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; + + // Gets the path for internal plugins. +-bool GetInternalPluginsDirectory(base::FilePath* result) { +-#if defined(OS_MACOSX) +- // If called from Chrome, get internal plugins from a subdirectory of the +- // framework. +- if (base::mac::AmIBundled()) { +- *result = chrome::GetFrameworkBundlePath(); +- DCHECK(!result->empty()); +- *result = result->Append("Internet Plug-Ins"); +- return true; +- } +- // In tests, just look in the module directory (below). +-#endif +- +- // The rest of the world expects plugins in the module directory. +- return base::PathService::Get(base::DIR_MODULE, result); ++bool GetInternalPluginsDirectory(base::FilePath* result, ++ const std::string& ident) { ++ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; ++ const char* value = getenv(full_env.c_str()); ++ if (value == NULL) ++ return base::PathService::Get(base::DIR_MODULE, result); ++ else ++ *result = base::FilePath(value); + } + + // Gets the path for bundled implementations of components. Note that these +@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) { + create_dir = true; + break; + case chrome::DIR_INTERNAL_PLUGINS: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "ALL")) + return false; + break; + case chrome::DIR_COMPONENTS: +@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) { + return false; + break; + case chrome::DIR_PEPPER_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) + return false; + cur = cur.Append(kPepperFlashBaseDirectory); + break; +@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.DirName(); + } + #else +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PNACL")) + return false; + #endif + cur = cur.Append(FILE_PATH_LITERAL("pnacl")); diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch new file mode 100644 index 000000000000..6b788f43d29c --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch @@ -0,0 +1,17 @@ +--- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200 ++++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-08 04:06:21.658105129 +0200 +@@ -94,6 +94,14 @@ + 'build_type', help='The type of build', choices=('official', 'default')) + args = argument_parser.parse_args() + ++ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here ++ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None) ++ if SOURCE_DATE_EPOCH is not None: ++ print(SOURCE_DATE_EPOCH) ++ return 0 ++ else: ++ raise RuntimeError("SOURCE_DATE_EPOCH not set") ++ + # The mtime of the revision in build/util/LASTCHANGE is stored in a file + # next to it. Read it, to get a deterministic time close to "now". + # That date is then modified as described at the top of the file so that diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch new file mode 100644 index 000000000000..07572cf7ee94 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch @@ -0,0 +1,11 @@ +--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc ++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc +@@ -13,7 +13,7 @@ + + #include "jpeglib.h" // for JPEG_MAX_DIMENSION + +-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION ++#define WEBP_MAX_DIMENSION 16383 + + namespace blink { + diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch new file mode 100644 index 000000000000..b5372d1a2556 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch @@ -0,0 +1,74 @@ +--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc ++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc +@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( + // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's + // internal decoded frame. + if (buffer_allocation_mode_ != BufferAllocationMode::kNone && ++ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau && + !vpp_vaapi_wrapper_) { + vpp_vaapi_wrapper_ = VaapiWrapper::Create( + VaapiWrapper::kVideoProcess, VAProfileNone, +@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( + PictureBuffer buffer = buffers[i]; + buffer.set_size(requested_pic_size_); + std::unique_ptr<VaapiPicture> picture = vaapi_picture_factory_->Create( +- (buffer_allocation_mode_ == BufferAllocationMode::kNone) ++ ((buffer_allocation_mode_ == BufferAllocationMode::kNone) || ++ (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau)) + ? vaapi_wrapper_ + : vpp_vaapi_wrapper_, + make_context_current_cb_, bind_image_cb_, buffer); +@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() { + + VaapiVideoDecodeAccelerator::BufferAllocationMode + VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { ++ // NVIDIA blobs use VDPAU ++ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) { ++ LOG(INFO) << "VA-API driver on VDPAU backend"; ++ return BufferAllocationMode::kWrapVdpau; ++ } ++ + // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT + // |output_mode_| as well. + if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) +@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { + // depends on the bitstream and sometimes it's not enough to cover the amount + // of frames needed by the client pipeline (see b/133733739). + // TODO(crbug.com/911754): Enable for VP9 Profile 2. +- if (IsGeminiLakeOrLater() && ++ if (false && IsGeminiLakeOrLater() && + (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) { + // Add one to the reference frames for the one being currently egressed, and + // an extra allocation for both |client_| and |decoder_|, see +--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h ++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h +@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator + // Using |client_|s provided PictureBuffers and as many internally + // allocated. + kNormal, ++ kWrapVdpau, + }; + + // Decides the concrete buffer allocation mode, depending on the hardware +--- a/media/gpu/vaapi/vaapi_wrapper.cc ++++ b/media/gpu/vaapi/vaapi_wrapper.cc +@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType( + } else if (base::StartsWith(va_vendor_string, "Intel iHD driver", + base::CompareCase::SENSITIVE)) { + return media::VAImplementation::kIntelIHD; ++ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU", ++ base::CompareCase::SENSITIVE)) { ++ return media::VAImplementation::kNVIDIAVDPAU; + } + return media::VAImplementation::kOther; + } +--- a/media/gpu/vaapi/vaapi_wrapper.h ++++ b/media/gpu/vaapi/vaapi_wrapper.h +@@ -79,6 +79,7 @@ enum class VAImplementation { + kIntelIHD, + kOther, + kInvalid, ++ kNVIDIAVDPAU, + }; + + // This class handles VA-API calls and ensures proper locking of VA-API calls diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch new file mode 100644 index 000000000000..32f0ae2fb5e6 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch @@ -0,0 +1,13 @@ +diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn +index ed0e2f5208b..5b431a030d5 100644 +--- a/third_party/widevine/cdm/BUILD.gn ++++ b/third_party/widevine/cdm/BUILD.gn +@@ -14,7 +14,7 @@ buildflag_header("buildflags") { + + flags = [ + "ENABLE_WIDEVINE=$enable_widevine", +- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", ++ "BUNDLE_WIDEVINE_CDM=true", + "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", + ] + } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix new file mode 100644 index 000000000000..434bd77b6d18 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -0,0 +1,93 @@ +{ stdenv, gcc +, jshon +, glib +, nspr +, nss +, fetchzip +, patchelfUnstable +, enablePepperFlash ? false + +, upstream-info +}: + +with stdenv.lib; + +let + mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; + + # Generate a shell fragment that emits flags appended to the + # final makeWrapper call for wrapping the browser's main binary. + # + # Note that this is shell-escaped so that only the variable specified + # by the "output" attribute is substituted. + mkPluginInfo = { output ? "out", allowedVars ? [ output ] + , flags ? [], envVars ? {} + }: let + shSearch = ["'"] ++ map (var: "@${var}@") allowedVars; + shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars; + # We need to triple-escape "val": + # * First because makeWrapper doesn't do any quoting of its arguments by + # itself. + # * Second because it's passed to the makeWrapper call separated by IFS but + # not by the _real_ arguments, for example the Widevine plugin flags + # contain spaces, so they would end up as separate arguments. + # * Third in order to be correctly quoted for the "echo" call below. + shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; + mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'"; + mkFlag = flag: ["--add-flags" (shEsc flag)]; + mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)]; + envList = mapAttrsToList mkEnvVar envVars; + quoted = map mkSh (flatten ((map mkFlag flags) ++ envList)); + in '' + mkdir -p "''$${output}/nix-support" + echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" + ''; + + flash = stdenv.mkDerivation rec { + pname = "flashplayer-ppapi"; + version = "32.0.0.344"; + + src = fetchzip { + url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; + sha256 = "05ijlgsby9zxx0qs6f3vav1z0p6xr1cg6idl4akxvfmsl6hn6hkq"; + stripRoot = false; + }; + + patchPhase = '' + chmod +x libpepflashplayer.so + patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so + ''; + + doCheck = true; + checkPhase = '' + ! find -iname '*.so' -exec ldd {} + | grep 'not found' + ''; + + installPhase = '' + flashVersion="$( + "${jshon}/bin/jshon" -F manifest.json -e version -u + )" + + install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so" + + ${mkPluginInfo { + allowedVars = [ "out" "flashVersion" ]; + flags = [ + "--ppapi-flash-path=@out@/lib/libpepflashplayer.so" + "--ppapi-flash-version=@flashVersion@" + ]; + }} + ''; + + dontStrip = true; + + meta = { + license = stdenv.lib.licenses.unfree; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + platforms = platforms.x86_64; + }; + }; + +in { + enabled = optional enablePepperFlash flash; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix new file mode 100644 index 000000000000..9b5c76f53429 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix @@ -0,0 +1,6 @@ +{ + "81.0.4044.92" = { + rev = "81.0.4044.92-2"; + sha256 = "071a33idn2zcix6z8skn7y85mhb9w5s0bh0fvrjm269y7cmjrh3l"; + }; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix new file mode 100644 index 000000000000..17418c90af49 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchFromGitHub +, python3Packages +, makeWrapper +, patch +}: +{ rev +, sha256 +}: + +stdenv.mkDerivation rec { + name = "ungoogled-chromium-${version}"; + + version = rev; + + src = fetchFromGitHub { + owner = "Eloston"; + repo = "ungoogled-chromium"; + inherit rev sha256; + }; + + dontBuild = true; + + buildInputs = [ + python3Packages.python + patch + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + patchPhase = '' + sed -i '/chromium-widevine/d' patches/series + ''; + + installPhase = '' + mkdir $out + cp -R * $out/ + wrapProgram $out/utils/patches.py --add-flags "apply" --prefix PATH : "${patch}/bin" + ''; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix new file mode 100644 index 000000000000..6dff17c69ddb --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix @@ -0,0 +1,271 @@ +let maybePkgs = import ../../../../../. {}; in + +{ stdenv ? maybePkgs.stdenv +, runCommand ? maybePkgs.runCommand +, fetchurl ? maybePkgs.fetchurl +, writeText ? maybePkgs.writeText +, curl ? maybePkgs.curl +, cacert ? maybePkgs.cacert +, nix ? maybePkgs.nix +}: + +let + inherit (stdenv) lib; + + sources = if builtins.pathExists ./upstream-info.nix + then import ./upstream-info.nix + else {}; + + bucketURL = "https://commondatastorage.googleapis.com/" + + "chromium-browser-official"; + + mkVerURL = version: "${bucketURL}/chromium-${version}.tar.xz"; + + debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g"; + + getDebURL = channelName: version: arch: mirror: let + packageSuffix = if channelName == "dev" then "unstable" else channelName; + packageName = "google-chrome-${packageSuffix}"; + in "${mirror}/${packageName}/${packageName}_${version}-1_${arch}.deb"; + + # Untrusted mirrors, don't try to update from them! + debMirrors = [ + "http://95.31.35.30/chrome/pool/main/g" + "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" + "http://repo.fdzh.org/chrome/deb/pool/main/g" + ]; + +in { + getChannel = channel: let + chanAttrs = builtins.getAttr channel sources; + in { + inherit channel; + inherit (chanAttrs) version; + + main = fetchurl { + url = mkVerURL chanAttrs.version; + inherit (chanAttrs) sha256; + }; + + binary = fetchurl (let + mkUrls = arch: let + mkURLForMirror = getDebURL channel chanAttrs.version arch; + in map mkURLForMirror ([ debURL ] ++ debMirrors); + in if stdenv.is64bit && chanAttrs ? sha256bin64 then { + urls = mkUrls "amd64"; + sha256 = chanAttrs.sha256bin64; + } else if !stdenv.is64bit && chanAttrs ? sha256bin32 then { + urls = mkUrls "i386"; + sha256 = chanAttrs.sha256bin32; + } else throw "No Chrome plugins are available for your architecture."); + }; + + update = let + csv2nix = name: src: import (runCommand "${name}.nix" { + src = builtins.fetchurl src; + } '' + esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } # ohai emacs " + IFS=, read -r -a headings <<< "$(head -n1 "$src")" + echo "[" > "$out" + tail -n +2 "$src" | while IFS=, read -r -a line; do + echo " {" + for idx in "''${!headings[@]}"; do + echo " $(esc "''${headings[idx]}") = $(esc ''${line[$idx]});" + done + echo " }" + done >> "$out" + echo "]" >> "$out" + ''); + + channels = lib.fold lib.recursiveUpdate {} (map (attrs: { + ${attrs.os}.${attrs.channel} = attrs // { + history = let + drvName = "omahaproxy-${attrs.os}.${attrs.channel}-info"; + history = csv2nix drvName "http://omahaproxy.appspot.com/history"; + cond = h: attrs.os == h.os && attrs.channel == h.channel + && lib.versionOlder h.version attrs.current_version; + # Note that this is a *reverse* sort! + sorter = a: b: lib.versionOlder b.version a.version; + sorted = builtins.sort sorter (lib.filter cond history); + in map (lib.flip removeAttrs ["os" "channel"]) sorted; + version = attrs.current_version; + }; + }) (csv2nix "omahaproxy-info" "http://omahaproxy.appspot.com/all?csv=1")); + + /* + XXX: This is essentially the same as: + + builtins.tryEval (builtins.fetchurl url) + + ... except that tryEval on fetchurl isn't working and doesn't catch + errors for fetchurl, so we go for a different approach. + + We only have fixed-output derivations that can have networking access, so + we abuse SHA1 and its weaknesses to forge a fixed-output derivation which + is not so fixed, because it emits different contents that have the same + SHA1 hash. + + Using this method, we can distinguish whether the URL is available or + whether it's not based on the actual content. + + So let's use tryEval as soon as it's working with fetchurl in Nix. + */ + tryFetch = url: let + # SHA1 hash collisions from https://shattered.io/static/shattered.pdf: + collisions = runCommand "sha1-collisions" { + outputs = [ "out" "good" "bad" ]; + base64 = '' + QlpoOTFBWSZTWbL5V5MABl///////9Pv///v////+/////HDdK739/677r+W3/75rUNr4 + Aa/AAAAAAACgEVTRtQDQAaA0AAyGmjTQGmgAAANGgAaMIAYgGgAABo0AAAAAADQAIAGQ0 + MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk + 0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIAN + GgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRp + o0GIGgBoGQAABVTUExEZATTICnkxNR+p6E09JppoyamjGhkm0ammIyaekbUejU9JiGnqZ + qaaDxJ6m0JkZMQ2oaYmJ6gxqMyE2TUzJqfItligtJQJfYbl9Zy9QjQuB5mHQRdSSXCCTH + MgmSDYmdOoOmLTBJWiCpOhMQYpQlOYpJjn+wQUJSTCEpOMekaFaaNB6glCC0hKEJdHr6B + mUIHeph7YxS8WJYyGwgWnMTFJBDFSxSCCYljiEk7HZgJzJVDHJxMgY6tCEIIWgsKSlSZ0 + S8GckoIIF+551Ro4RCw260VCEpWJSlpWx/PMrLyVoyhWMAneDilBcUIeZ1j6NCkus0qUC + Wnahhk5KT4GpWMh3vm2nJWjTL9Qg+84iExBJhNKpbV9tvEN265t3fu/TKkt4rXFTsV+Nc + upJXhOhOhJMQQktrqt4K8mSh9M2DAO2X7uXGVL9YQxUtzQmS7uBndL7M6R7vX869VxqPu + renSuHYNq1yTXOfNWLwgvKlRlFYqLCs6OChDp0HuTzCWscmGudLyqUuwVGG75nmyZhKpJ + yOE/pOZyHyrZxGM51DYIN+Jc8yVJgAykxKCEtW55MlfudLg3KG6TtozalunXrroSxUpVL + StWrWLFihMnVpkyZOrQnUrE6xq1CGtJlbAb5ShMbV1CZgqlKC0wCFCpMmUKSEkvFLaZC8 + wHOCVAlvzaJQ/T+XLb5Dh5TNM67p6KZ4e4ZSGyVENx2O27LzrTIteAreTkMZpW95GS0CE + JYhMc4nToTJ0wQhKEyddaLb/rTqmgJSlkpnALxMhlNmuKEpkEkqhKUoEq3SoKUpIQcDgW + lC0rYahMmLuPQ0fHqZaF4v2W8IoJ2EhMhYmSw7qql27WJS+G4rUplToFi2rSv0NSrVvDU + pltQ8Lv6F8pXyxmFBSxiLSxglNC4uvXVKmAtusXy4YXGX1ixedEvXF1aX6t8adYnYCpC6 + rW1ZzdZYlCCxKEv8vpbqdSsXl8v1jCQv0KEPxPTa/5rtWSF1dSgg4z4KjfIMNtgwWoWLE + sRhKxsSA9ji7V5LRPwtumeQ8V57UtFSPIUmtQdOQfseI2Ly1DMtk4Jl8n927w34zrWG6P + i4jzC82js/46Rt2IZoadWxOtMInS2xYmcu8mOw9PLYxQ4bdfFw3ZPf/g2pzSwZDhGrZAl + 9lqky0W+yeanadC037xk496t0Dq3ctfmqmjgie8ln9k6Q0K1krb3dK9el4Xsu44LpGcen + r2eQZ1s1IhOhnE56WnXf0BLWn9Xz15fMkzi4kpVxiTKGEpffErEEMvEeMZhUl6yD1SdeJ + YbxzGNM3ak2TAaglLZlDCVnoM6wV5DRrycwF8Zh/fRsdmhkMfAO1duwknrsFwrzePWeMw + l107DWzymxdQwiSXx/lncnn75jL9mUzw2bUDqj20LTgtawxK2SlQg1CCZDQMgSpEqLjRM + sykM9zbSIUqil0zNk7Nu+b5J0DKZlhl9CtpGKgX5uyp0idoJ3we9bSrY7PupnUL5eWiDp + V5mmnNUhOnYi8xyClkLbNmAXyoWk7GaVrM2umkbpqHDzDymiKjetgzTocWNsJ2E0zPcfh + t46J4ipaXGCfF7fuO0a70c82bvqo3HceIcRlshgu73seO8BqlLIap2z5jTOY+T2ucCnBt + Atva3aHdchJg9AJ5YdKHz7LoA3VKmeqxAlFyEnQLBxB2PAhAZ8KvmuR6ELXws1Qr13Nd1 + i4nsp189jqvaNzt+0nEnIaniuP1+/UOZdyfoZh57ku8sYHKdvfW/jYSUks+0rK+qtte+p + y8jWL9cOJ0fV8rrH/t+85/p1z2N67p/ZsZ3JmdyliL7lrNxZUlx0MVIl6PxXOUuGOeArW + 3vuEvJ2beoh7SGyZKHKbR2bBWO1d49JDIcVM6lQtu9UO8ec8pOnXmkcponBPLNM2CwZ9k + NC/4ct6rQkPkQHMcV/8XckU4UJCy+VeTA== + ''; + } '' + echo "$base64" | base64 -d | tar xj + mv good.pdf "$good" + mv bad.pdf "$bad" + touch "$out" + ''; + + cacheVal = let + urlHash = builtins.hashString "sha256" url; + timeSlice = builtins.currentTime / 600; + in "${urlHash}-${toString timeSlice}"; + + in { + success = import (runCommand "check-success" { + result = stdenv.mkDerivation { + name = "tryfetch-${cacheVal}"; + inherit url; + + outputHash = "d00bbe65d80f6d53d5c15da7c6b4f0a655c5a86a"; + outputHashMode = "flat"; + outputHashAlgo = "sha1"; + + nativeBuildInputs = [ curl ]; + preferLocalBuild = true; + + inherit (collisions) good bad; + + buildCommand = '' + if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \ + curl -s -L -f -I "$url" > /dev/null; then + cp "$good" "$out" + else + cp "$bad" "$out" + fi + ''; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + }; + inherit (collisions) good; + } '' + if cmp -s "$result" "$good"; then + echo true > "$out" + else + echo false > "$out" + fi + ''); + value = builtins.fetchurl url; + }; + + fetchLatest = channel: let + result = tryFetch (mkVerURL channel.version); + in if result.success then result.value else fetchLatest (channel // { + version = if channel.history != [] + then (lib.head channel.history).version + else throw "Unfortunately there's no older version than " + + "${channel.version} available for channel " + + "${channel.channel} on ${channel.os}."; + history = lib.tail channel.history; + }); + + getHash = path: import (runCommand "gethash.nix" { + inherit path; + nativeBuildInputs = [ nix ]; + } '' + sha256="$(nix-hash --flat --base32 --type sha256 "$path")" + echo "\"$sha256\"" > "$out" + ''); + + isLatest = channel: version: let + ourVersion = sources.${channel}.version or null; + in if ourVersion == null then false + else lib.versionOlder version sources.${channel}.version + || version == sources.${channel}.version; + + # We only support GNU/Linux right now. + linuxChannels = let + genLatest = channelName: channel: let + newUpstream = { + inherit (channel) version; + sha256 = getHash (fetchLatest channel); + }; + keepOld = let + oldChannel = sources.${channelName}; + in { + inherit (oldChannel) version sha256; + } // lib.optionalAttrs (oldChannel ? sha256bin32) { + inherit (oldChannel) sha256bin32; + } // lib.optionalAttrs (oldChannel ? sha256bin64) { + inherit (oldChannel) sha256bin64; + }; + in if isLatest channelName channel.version then keepOld else newUpstream; + in lib.mapAttrs genLatest channels.linux; + + getLinuxFlash = channelName: channel: let + inherit (channel) version; + fetchArch = arch: tryFetch (getDebURL channelName version arch debURL); + packages = lib.genAttrs ["i386" "amd64"] fetchArch; + isNew = arch: attr: !(builtins.hasAttr attr channel) + && packages.${arch}.success; + in channel // lib.optionalAttrs (isNew "i386" "sha256bin32") { + sha256bin32 = getHash (packages.i386.value); + } // lib.optionalAttrs (isNew "amd64" "sha256bin64") { + sha256bin64 = getHash (packages.amd64.value); + }; + + newChannels = lib.mapAttrs getLinuxFlash linuxChannels; + + dumpAttrs = indent: attrs: let + mkVal = val: if lib.isAttrs val then dumpAttrs (indent + 1) val + else "\"${lib.escape ["$" "\\" "\""] (toString val)}\""; + mkIndent = level: lib.concatStrings (builtins.genList (_: " ") level); + mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n"; + attrLines = lib.mapAttrsToList mkAttr attrs; + in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}"; + in writeText "chromium-new-upstream-info.nix" '' + # This file is autogenerated from update.sh in the same directory. + ${dumpAttrs 0 newChannels} + ''; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh b/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh new file mode 100755 index 000000000000..ea67a62c107a --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh @@ -0,0 +1,4 @@ +#!/bin/sh -e +cd "$(dirname "$0")" +sp="$(nix-build --builders "" -Q --no-out-link update.nix -A update)" +cat "$sp" > upstream-info.nix diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix new file mode 100644 index 000000000000..c5f9d60122dc --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix @@ -0,0 +1,18 @@ +# This file is autogenerated from update.sh in the same directory. +{ + beta = { + sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; + sha256bin64 = "1y70kmfz9nv507b0zdda7zfk2ac9qh9m2gq00aphdmzd0al7skj8"; + version = "81.0.4044.92"; + }; + dev = { + sha256 = "1rydvjmv62zj95sf0fgsyipqz2hphbxm60y8q0813wq9ym35d4yy"; + sha256bin64 = "1m6740lw7xjjp1lplwp9ii4d3l7dfa9jrv5bysm4ar5pb9kywrai"; + version = "83.0.4100.3"; + }; + stable = { + sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; + sha256bin64 = "1ig899cpahw1xfhdff5xj6w4k8jja5smxvrcbw6b0jcjmawdrf72"; + version = "81.0.4044.92"; + }; +} diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 9c6eec1a3363..d457ddd98bfe 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -37,6 +37,6 @@ buildGoPackage rec { homepage = "https://github.com/containernetworking/plugins"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan saschagrunert ]; + maintainers = with maintainers; [ cstrahan ] ++ teams.podman.members; }; } diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index aee162ba6f22..0eac175a1707 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "0pg5cwgyfb4isy2fn233kj3bdn0i8qqp90yzix0khs5maalpnrk1"; + sha256 = "1j6pr1a9ff32bnjq9rncllmfpraip5r2fj3zsljw5jq68x5wamdc"; }; modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8"; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 3f0a83d015da..e8500872d52c 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -6,8 +6,6 @@ buildGoPackage rec { goPackagePath = "github.com/StackExchange/dnscontrol"; - goDeps = ./deps.nix; - src = fetchFromGitHub { owner = "StackExchange"; repo = pname; @@ -15,9 +13,7 @@ buildGoPackage rec { sha256 = "1j8i4k7bqkqmi6dmc9fxfab49a7qigig72rlbga902lw336p6cc7"; }; - postInstall = '' - rm $bin/bin/{build,convertzone,generate,validate} - ''; + subPackages = [ "." ]; meta = with stdenv.lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; diff --git a/pkgs/applications/networking/dnscontrol/deps.nix b/pkgs/applications/networking/dnscontrol/deps.nix deleted file mode 100644 index 55cb5daa18f8..000000000000 --- a/pkgs/applications/networking/dnscontrol/deps.nix +++ /dev/null @@ -1,1236 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "335e9e09b93e"; - sha256 = "1aiglr6d2369nf3s9ig1kc0nixsivcmh7p1fyzkcf6n6ql0p2zsm"; - }; - } - { - goPackagePath = "github.com/Azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-sdk-for-go"; - rev = "v39.1.0"; - sha256 = "1s0j7gh3d3p157py7v6525c6zs07hdiry97dhg4c8z7ww35wxhj7"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/BurntSushi/xgb"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/xgb"; - rev = "27f122750802"; - sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; - }; - } - { - goPackagePath = "github.com/DisposaBoy/JsonConfigReader"; - fetch = { - type = "git"; - url = "https://github.com/DisposaBoy/JsonConfigReader"; - rev = "5ea4d0ddac55"; - sha256 = "022wzrkf0rni9yb15439w81kj0kb4667zx6n2zq07ysw7lk6ahqz"; - }; - } - { - goPackagePath = "github.com/TomOnTime/utfutil"; - fetch = { - type = "git"; - url = "https://github.com/TomOnTime/utfutil"; - rev = "09c41003ee1d"; - sha256 = "01d6w8migw5px19jg0mm7qhsa1ydcz9wvl838nsclfw63x5sy70i"; - }; - } - { - goPackagePath = "github.com/alecthomas/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a751"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "f65c72e2690d"; - sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; - }; - } - { - goPackagePath = "github.com/andreyvit/diff"; - fetch = { - type = "git"; - url = "https://github.com/andreyvit/diff"; - rev = "c7f18ee00883"; - sha256 = "1s4qjkxig5yqahpzfl4xqh4kzi9mymdpkzq6kj3f4dr5dl3hlynr"; - }; - } - { - goPackagePath = "github.com/armon/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-metrics"; - rev = "f0300d1749da"; - sha256 = "13l7c35ps0r27vxfil2w0xhhc7w5rh00awvlmn4cz0a937b9ffpv"; - }; - } - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "7fddfc383310"; - sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "v1.29.21"; - sha256 = "0q97abz6cjj1gf3gfd52gjx39grfhlcjax8306zw9038a8v0nadc"; - }; - } - { - goPackagePath = "github.com/bgentry/speakeasy"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/speakeasy"; - rev = "v0.1.0"; - sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; - }; - } - { - goPackagePath = "github.com/billputer/go-namecheap"; - fetch = { - type = "git"; - url = "https://github.com/billputer/go-namecheap"; - rev = "0c7adb0710f8"; - sha256 = "09jkymml6f0nvz7md7s4ayj75xdms77ziz9rkw4kvj7jhv36302p"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.1.1"; - sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; - }; - } - { - goPackagePath = "github.com/census-instrumentation/opencensus-proto"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-proto"; - rev = "v0.2.1"; - sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; - }; - } - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v2.0.0"; - sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/digitalocean/godo"; - fetch = { - type = "git"; - url = "https://github.com/digitalocean/godo"; - rev = "v1.30.0"; - sha256 = "0z38lg1zd57b5ymxdxhz5rs5rynpzhqmbvm0marhh0v7v9bbk0rx"; - }; - } - { - goPackagePath = "github.com/dimchansky/utfbom"; - fetch = { - type = "git"; - url = "https://github.com/dimchansky/utfbom"; - rev = "v1.1.0"; - sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww"; - }; - } - { - goPackagePath = "github.com/dnsimple/dnsimple-go"; - fetch = { - type = "git"; - url = "https://github.com/dnsimple/dnsimple-go"; - rev = "v0.31.0"; - sha256 = "0i074r3m0bqggmplswymgj6yfzbsrcqw8gn6py9x8g3kyl4si0x0"; - }; - } - { - goPackagePath = "github.com/envoyproxy/go-control-plane"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/go-control-plane"; - rev = "5f8ba28d4473"; - sha256 = "1f1s764rd41vd9vgk3r14h1m6fz6pdvxj6fd83q58gxifbc4q5w4"; - }; - } - { - goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/protoc-gen-validate"; - rev = "v0.1.0"; - sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; - }; - } - { - goPackagePath = "github.com/exoscale/egoscale"; - fetch = { - type = "git"; - url = "https://github.com/exoscale/egoscale"; - rev = "v0.23.0"; - sha256 = "0dgc08sdvy2cj7yygrlnyp6v9m829h4v0pm3vdsj9yx3bps5v7iy"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fatih/structs"; - fetch = { - type = "git"; - url = "https://github.com/fatih/structs"; - rev = "v1.1.0"; - sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q"; - }; - } - { - goPackagePath = "github.com/go-acme/lego"; - fetch = { - type = "git"; - url = "https://github.com/go-acme/lego"; - rev = "v2.7.2"; - sha256 = "1137l22jrwk8hvdzjbmfkvd9nllp6sznzy66ngmcsc0ybp19hcry"; - }; - } - { - goPackagePath = "github.com/go-ldap/ldap"; - fetch = { - type = "git"; - url = "https://github.com/go-ldap/ldap"; - rev = "v3.0.2"; - sha256 = "1srb1nkcbs0v1hcdz6j4zhg000h763j83jlklsiwanvbp48y4lhz"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.5.0"; - sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; - }; - } - { - goPackagePath = "github.com/go-test/deep"; - fetch = { - type = "git"; - url = "https://github.com/go-test/deep"; - rev = "042da051cf31"; - sha256 = "08bya0s7m15f5qm1kn2r42g1r4lpq0svpaqr0zaac4hmaxj7vnid"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "e7a84e9525fe"; - sha256 = "1v6vjklq06wqddv46ihajahaj1slv0imgaivlxr8bsx59i90js5q"; - }; - } - { - goPackagePath = "github.com/gofrs/uuid"; - fetch = { - type = "git"; - url = "https://github.com/gofrs/uuid"; - rev = "v3.2.0"; - sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.3.1"; - sha256 = "1wnfa8njxdym1qb664dmfnkpm4pmqy22hqjlqpwaaiqhglb5g9d1"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.3"; - sha256 = "1cyyr52yhj3fzrily3rmsbqyj8va4ld75lmry0857m39rgpv8sy1"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "v0.0.1"; - sha256 = "0gp3kkzlm3wh37kgkhbqxq3zx07iqbgis5w9mf4d64h6vjq760is"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "v1.0.0"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; - }; - } - { - goPackagePath = "github.com/google/go-github"; - fetch = { - type = "git"; - url = "https://github.com/google/go-github"; - rev = "v17.0.0"; - sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "c8c88dbee036"; - sha256 = "1yckg2052mz7ps1m68wri6kyb5n4g0vx2yf7s0xs9gdqvvscp57l"; - }; - } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } - { - goPackagePath = "github.com/google/pprof"; - fetch = { - type = "git"; - url = "https://github.com/google/pprof"; - rev = "54271f7e092f"; - sha256 = "14x4ydifz23rzaylggvwbm3dwlv1bc6s0bclmkxck9nbjbqw89vy"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.5"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0766667cb4d1"; - sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; - }; - } - { - goPackagePath = "github.com/gopherjs/jquery"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/jquery"; - rev = "73f4c7416038"; - sha256 = "1xhl0k52v3djalnd02a0ph572f85i1szj2x4q3lglkq40j7racd2"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "v1.0.0"; - sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "v0.5.1"; - sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-hclog"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-hclog"; - rev = "v0.9.2"; - sha256 = "0pakba7rdkjgq50r79sbbpavymbyib77cy613wl734mpi30ywrxm"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-immutable-radix"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "v1.0.0"; - sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "v1.0.0"; - sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-plugin"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-plugin"; - rev = "v1.0.1"; - sha256 = "0aama8vdyrfzjdhxc1l4cwhmgydl989lywhq3pg3slzjg6r00rda"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-retryablehttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-retryablehttp"; - rev = "v0.6.3"; - sha256 = "1vnhr7yry71jldmmj5gxhq49crhi9vrmqc2i41mycpnva2zd8a0i"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-rootcerts"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-rootcerts"; - rev = "v1.0.1"; - sha256 = "0ca5h7vlvrghf24dzh8l6w5px293n173qxfkjxb9kgsl6hsrsl3y"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-sockaddr"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-sockaddr"; - rev = "v1.0.2"; - sha256 = "0y106nhd3s63lj7h7k21iq0br97h0z9qjrvx028zqcsq9407k9is"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-uuid"; - rev = "v1.0.1"; - sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-version"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-version"; - rev = "v1.1.0"; - sha256 = "1ykh3jl5zj5a4irkgp5mq936bqkznmf9lp23qk741vh4r5874vi8"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.1"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/hashicorp/yamux"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/yamux"; - rev = "2f1d1f20f75d"; - sha256 = "1fga3p6j2g24ip9qjfwn3nqjr00m4nnjz92app7ms3sz7vgq2a7s"; - }; - } - { - goPackagePath = "github.com/hexonet/go-sdk"; - fetch = { - type = "git"; - url = "https://github.com/hexonet/go-sdk"; - rev = "v2.2.3"; - sha256 = "0mgkfrc7qlm4xf1v7kb29p7wq6rmaaha9zv8kwa27r8hjx6qnb8c"; - }; - } - { - goPackagePath = "github.com/jarcoal/httpmock"; - fetch = { - type = "git"; - url = "https://github.com/jarcoal/httpmock"; - rev = "v1.0.4"; - sha256 = "1x04i9hhvdxi9xmyf0vbi5azlh7rr4blsq7fbhps8i2gdpga612y"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "2437e8417af5"; - sha256 = "1hwcbr7nrlfshwr4hrac8ch8gvfpf07qi72bpqmqi272c67ma89v"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "af01ea7f8024"; - sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.20.0"; - sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/malexdev/utfutil"; - fetch = { - type = "git"; - url = "https://github.com/malexdev/utfutil"; - rev = "00c8d4a8e7a8"; - sha256 = "01d6w8migw5px19jg0mm7qhsa1ydcz9wvl838nsclfw63x5sy70i"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.3"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.1.27"; - sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1"; - }; - } - { - goPackagePath = "github.com/mitchellh/cli"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/cli"; - rev = "v1.0.0"; - sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; - }; - } - { - goPackagePath = "github.com/mitchellh/copystructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/copystructure"; - rev = "v1.0.0"; - sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-testing-interface"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-testing-interface"; - rev = "v1.0.0"; - sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-wordwrap"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-wordwrap"; - rev = "v1.0.0"; - sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/mitchellh/reflectwalk"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/reflectwalk"; - rev = "v1.0.0"; - sha256 = "0wzkp0fdx22n8f7y9y37dgmnlrlfsv9zjdb48cbx7rsqsbnny7l0"; - }; - } - { - goPackagePath = "github.com/mjibson/esc"; - fetch = { - type = "git"; - url = "https://github.com/mjibson/esc"; - rev = "v0.2.0"; - sha256 = "0ci3bdm01prm114plcwkgzbqn825lh0zc1iqaw3jicjay5sh0bis"; - }; - } - { - goPackagePath = "github.com/namedotcom/go"; - fetch = { - type = "git"; - url = "https://github.com/namedotcom/go"; - rev = "08470befbe04"; - sha256 = "00ai7fd74sn4alqmpqsiyczirli50b7m059b6zzg1izy9g4cdd4g"; - }; - } - { - goPackagePath = "github.com/oklog/run"; - fetch = { - type = "git"; - url = "https://github.com/oklog/run"; - rev = "v1.0.0"; - sha256 = "1pbjza4claaj95fpqvvfrysvs10y7dm0pl6qr5lzh6qy1vnhmcgw"; - }; - } - { - goPackagePath = "github.com/ovh/go-ovh"; - fetch = { - type = "git"; - url = "https://github.com/ovh/go-ovh"; - rev = "ba5adb4cf014"; - sha256 = "1rwxib0pn2ni6nfn2sijvb6cd424n95gnqhs21q6mz08n9hnzspy"; - }; - } - { - goPackagePath = "github.com/pascaldekloe/goe"; - fetch = { - type = "git"; - url = "https://github.com/pascaldekloe/goe"; - rev = "v0.1.0"; - sha256 = "1dqd3mfb4z2vmv6pg6fhgvfc53vhndk24wcl9lj1rz02n6m279fq"; - }; - } - { - goPackagePath = "github.com/philhug/opensrs-go"; - fetch = { - type = "git"; - url = "https://github.com/philhug/opensrs-go"; - rev = "9dfa7433020d"; - sha256 = "1bjw3llpx5n1srylw08310ch14sz1pw5mban1yakax8606q3dqdf"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "v2.0.5"; - sha256 = "0y5rh7z01zycd59nnjpkqq0ydyjmcg9j1xw15q1i600l9j9g617p"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.9.1"; - sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/posener/complete"; - fetch = { - type = "git"; - url = "https://github.com/posener/complete"; - rev = "v1.1.1"; - sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/renier/xmlrpc"; - fetch = { - type = "git"; - url = "https://github.com/renier/xmlrpc"; - rev = "ce4a1a486c03"; - sha256 = "0byvacdwhagva53r2frzqws3f5j7qzigmxzxahpcv300i8pm9i50"; - }; - } - { - goPackagePath = "github.com/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "c382bd3c16ff"; - sha256 = "043y6l647snsz71mdy84s2d3kn22aj6rbqd6c1vd8absvamqhlxa"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v2.0.1"; - sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; - }; - } - { - goPackagePath = "github.com/ryanuber/columnize"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/columnize"; - rev = "v2.1.0"; - sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; - }; - } - { - goPackagePath = "github.com/ryanuber/go-glob"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/go-glob"; - rev = "v1.0.0"; - sha256 = "0mhrjy0iba3jr6bsgy7q50zjr42ar1njn1sb2fvihlkhxgb2ahv2"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.1.0"; - sha256 = "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "v1.0.0"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "b2de0cb4f26d"; - sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "68dc04aab96a"; - sha256 = "1kas5v95fzhr88hg4rjy0vp03y4pzvy3pwwgkfz2yhn5nlj29nk6"; - }; - } - { - goPackagePath = "github.com/softlayer/softlayer-go"; - fetch = { - type = "git"; - url = "https://github.com/softlayer/softlayer-go"; - rev = "5e1c8cccc730"; - sha256 = "0jsi0f60gx92qm1n2lcz65v425bbqf59dsr0dw4x1wmychp25mk7"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "github.com/tdewolff/minify"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/minify"; - rev = "v2.3.6"; - sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb"; - }; - } - { - goPackagePath = "github.com/tdewolff/parse"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/parse"; - rev = "v2.3.4"; - sha256 = "00hclphbjgc5vjrqgnclp72v8c45k35vmj84d2a0f7bw8cc88zcd"; - }; - } - { - goPackagePath = "github.com/tdewolff/test"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/test"; - rev = "v1.0.6"; - sha256 = "12glhjb4cwp6yxwd17rwa6b4gxna3lm01bgc7yn9di58chc7lyh3"; - }; - } - { - goPackagePath = "github.com/tiramiseb/go-gandi"; - fetch = { - type = "git"; - url = "https://github.com/tiramiseb/go-gandi"; - rev = "e1cf2e430b3a"; - sha256 = "1m6wzif0dgssh5hzffwqg39789k9nwvj8xaq0d492f0fr14w0nng"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v2.1.1"; - sha256 = "0znf7pim7xsl8x6pcgi9vm0px48xrqfkw6ysn4yv6xc2569zpjs1"; - }; - } - { - goPackagePath = "github.com/vultr/govultr"; - fetch = { - type = "git"; - url = "https://github.com/vultr/govultr"; - rev = "v0.2.0"; - sha256 = "09103hb2rx93d6vyr54bqdai35d6l5q3klk09k53aqrijp8pycfz"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.22.0"; - sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "2aa609cf4a9d"; - sha256 = "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "efd6b22b2522"; - sha256 = "0ysahwb7p6y09izks4ca8nk2w414gmjxzz44l5rmadlvk3k66cgp"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "0694c2d4d067"; - sha256 = "0v4rs4xpi7agbdzjw713mp7gzij8z89058s0yfj3276mzlns3zk4"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "959b441ac422"; - sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "d3739f865fa6"; - sha256 = "079ck2dyikacnph9s5mf0hrjnqlk6lc8q64dwnyw45w3xbbc50mg"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "v0.2.0"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "0de0cce0169b"; - sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "cb0a6d8edb6c"; - sha256 = "0xkrf2k6nn1qh64ckrc4rmf1vhkzs0p7f1rnhv4v4pz9mvgh3v6w"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "9d24e82272b4"; - sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "20ab64c0d93f"; - sha256 = "1gfhw6daabjy771b3c0k0yga18ja50845n648mgagsa441dxvlch"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "v0.20.0"; - sha256 = "13syr1x33k6mrn5w6l4sgdbzn368w3m60vf6kk2j10fwa45125rg"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.6.5"; - sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "24fa4b261c55"; - sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.27.0"; - sha256 = "1ijrmgrxyabfn51nm3p9l81iaasq5fg237wnr6mdc4dzsfcg8kd7"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/asn1-ber.v1"; - rev = "f715ec2f112d"; - sha256 = "00ixms8x3lrhywbvq5v2sagcqsxa1pcnlk17dp5lnwckv3xg4psb"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "41f04d3bba15"; - sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "v1.42.0"; - sha256 = "18ywm8zyv091j1pp5mvx8szl7928chk8lw02br6jy568d7rk4xal"; - }; - } - { - goPackagePath = "gopkg.in/ns1/ns1-go.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/ns1/ns1-go.v2"; - rev = "c563826f4cbe"; - sha256 = "0swpsy0bdkwqlb7i0fgxs55sdfsy7pbnh6a09crhbw5xldvswq5k"; - }; - } - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/sourcemap.v1"; - rev = "v1.0.5"; - sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/square/go-jose.v2"; - rev = "v2.3.1"; - sha256 = "11r93g9xrcjqj7qvq8sbd5hy5rnbpmim0vdsp6rbav8gl7wimaa3"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.8"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "ea95bdfd59fc"; - sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; - }; - } - { - goPackagePath = "rsc.io/binaryregexp"; - fetch = { - type = "git"; - url = "https://github.com/rsc/binaryregexp"; - rev = "v0.2.0"; - sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; - }; - } -] diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 325dc653e5b4..6b1a7ace902a 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -1,9 +1,9 @@ { lib , fetchFromGitHub -, python3 +, python3Packages }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { --replace "urwidtrees>=1.0.3dev0" "urwidtrees" ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python3Packages; [ urwid urwidtrees aiohttp @@ -38,17 +38,23 @@ python3.pkgs.buildPythonApplication rec { setproctitle ]; - checkInputs = with python3.pkgs; [ + checkInputs = with python3Packages; [ asynctest - pytest + pytestCheckHook ]; - # test_string__month_day_hour_minute_second fails on darwin - checkPhase = '' - LC_ALL=en_US.utf8 pytest tests \ - --deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second + dontUseSetuptoolsCheck = true; + + preCheck = '' + export LC_ALL=C ''; + pytestFlagsArray = [ + "tests" + # test_string__month_day_hour_minute_second fails on darwin + "--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second" + ]; + meta = with lib; { description = "TUI and CLI for the BitTorrent client Transmission"; homepage = "https://github.com/rndusr/stig"; diff --git a/pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch b/pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch deleted file mode 100644 index ede3bc7a6ad3..000000000000 --- a/pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch +++ /dev/null @@ -1,84 +0,0 @@ -From a6d8bd67416c848f9bf52f4746bda34216ae9993 Mon Sep 17 00:00:00 2001 -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Sun, 19 Apr 2020 12:48:59 -0400 -Subject: [PATCH] Revert "Add patch" - -This reverts commit c44127936b785afda0e914da4c1dc1e66a0ac97b. ---- - src/Application.vala | 49 -------------------------------------------- - 1 file changed, 49 deletions(-) - -diff --git a/src/Application.vala b/src/Application.vala -index 43d52fbc..82a9ebe5 100644 ---- a/src/Application.vala -+++ b/src/Application.vala -@@ -127,66 +127,17 @@ public class Planner : Gtk.Application { - - utils.apply_theme_changed (); - -- // Set Theme and Icon - Gtk.Settings.get_default ().set_property ("gtk-icon-theme-name", "elementary"); - Gtk.Settings.get_default ().set_property ("gtk-theme-name", "elementary"); - -- // Path Theme -- var command = new Granite.Services.SimpleCommand (".", "echo $DESKTOP_SESSION"); -- command.run (); -- command.output_changed.connect ((text) => { -- print ("DESKTOP_SESSION: %s\n".printf (text)); -- }); -- -- if (get_os_info ("PRETTY_NAME") == null || get_os_info ("PRETTY_NAME").index_of ("elementary") == -1) { -- string CSS = """ -- window decoration { -- box-shadow: none; -- margin: 1px; -- } -- """; -- -- var _provider = new Gtk.CssProvider (); -- _provider.load_from_data (CSS, CSS.length); -- -- Gtk.StyleContext.add_provider_for_screen ( -- Gdk.Screen.get_default (), _provider, -- Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION -- ); -- } -- - // Set shortcut - string quick_add_shortcut = settings.get_string ("quick-add-shortcut"); - if (quick_add_shortcut == "") { - quick_add_shortcut = "<Primary>Tab"; - settings.set_string ("quick-add-shortcut", quick_add_shortcut); - } -- - utils.set_quick_add_shortcut (quick_add_shortcut); - } -- -- public string get_os_info (string field) { -- string return_value = ""; -- var file = File.new_for_path ("/etc/os-release"); -- try { -- var osrel = new Gee.HashMap<string, string> (); -- var dis = new DataInputStream (file.read ()); -- string line; -- // Read lines until end of file (null) is reached -- while ((line = dis.read_line (null)) != null) { -- var osrel_component = line.split ("=", 2); -- if (osrel_component.length == 2) { -- osrel[osrel_component[0]] = osrel_component[1].replace ("\"", ""); -- } -- } -- -- return_value = osrel[field]; -- } catch (Error e) { -- warning ("Couldn't read os-release file, assuming elementary OS"); -- } -- -- return return_value; -- } - - public override int command_line (ApplicationCommandLine command_line) { - bool silence_mode = false; --- -2.25.1 - diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 0f5ec6137d61..3e3765ca77f6 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -21,25 +21,15 @@ stdenv.mkDerivation rec { pname = "elementary-planner"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "alainm23"; repo = "planner"; rev = version; - sha256 = "1kjk1zafx71zmax3whzpx6mzl037wlxri30bl2k9y9rg3fd09arr"; + sha256 = "1jc668hg26vb1q50abm6k566v9qimgs9skkwmlgi5h37vxm3ai1x"; }; - patches = [ - # Revert a patch the works around some stylesheet issues: - # https://github.com/alainm23/planner/issues/268 - # https://github.com/alainm23/planner/issues/303 - # The don't seem to be a problem with Pantheon on NixOS - # and for some reason produce the opposite effect with - # pantheon's stylesheet. - ./0001-Revert-Add-patch.patch - ]; - nativeBuildInputs = [ desktop-file-utils meson diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 3ee467cd290d..74a316ef52a1 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -57,7 +57,7 @@ in buildGoPackage rec { description = ''Open Container Initiative-based implementation of the Kubernetes Container Runtime Interface''; license = licenses.asl20; - maintainers = with maintainers; [ saschagrunert ]; + maintainers = with maintainers; [ ] ++ teams.podman.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 9d784d88a4f5..df7b81a43c8a 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -19,10 +19,9 @@ with stdenv.lib; let python = python3; buildType = "release"; - # Remember to change the extpackRev and version in extpack.nix and - # guest-additions/default.nix as well. - main = "59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99"; - version = "6.1.4"; + # Use maintainers/scripts/update.nix to update the version and all related hashes or + # change the hashes in extpack.nix and guest-additions/default.nix as well manually. + version = "6.1.6"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -39,7 +38,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = main; + sha256 = "b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f"; }; outputs = [ "out" "modsrc" ]; @@ -108,6 +107,10 @@ in stdenv.mkDerivation { postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp + '' + optionalString headless '' + # Fix compile error in version 6.1.6 + substituteInPlace src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11-stubs.cpp \ + --replace PSHCLFORMATDATA PSHCLFORMATS ''; # first line: ugly hack, and it isn't yet clear why it's a problem @@ -216,6 +219,7 @@ in stdenv.mkDerivation { passthru = { inherit version; # for guest additions inherit extensionPack; # for inclusion in profile to prevent gc + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index d50d3b59e24b..c9918b1cedf4 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "3b73798d776ff223ea8025b1a45001762f8d4e5bcd1ea61449773c1249935800"; + let value = "80b96b4b51a502141f6a8981f1493ade08a00762622c39e48319e5b122119bf3"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index fdb393a94ebe..4275bc0542e8 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "e2846a7576cce1b92a7c0744f41eaac750248d6e31dfca5c45d5766648b394c7"; + sha256 = "bcde4691dea7de93b65a10a43dda2b8f52e570f820992ad281c9bb5c8dede181"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/applications/virtualization/virtualbox/update.py b/pkgs/applications/virtualization/virtualbox/update.py deleted file mode 100755 index 6e8bfd5c8250..000000000000 --- a/pkgs/applications/virtualization/virtualbox/update.py +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i python3 -p python3 - -import os -import re -import json -import urllib.request - -from distutils.version import LooseVersion - -UPSTREAM_INFO_FILE = os.path.join( - os.path.dirname(os.path.abspath(__file__)), - "upstream-info.json" -) - - -def fetch_latest_version(): - url = "http://download.virtualbox.org/virtualbox/LATEST.TXT" - return urllib.request.urlopen(url).read().strip().decode() - - -def load_upstream_info(): - try: - with open(UPSTREAM_INFO_FILE, 'r') as fp: - return json.load(fp) - except FileNotFoundError: - return {'version': "0"} - - -def save_upstream_info(contents): - remark = "Generated using update.py from the same directory." - contents['__NOTE'] = remark - data = json.dumps(contents, indent=2, sort_keys=True) - with open(UPSTREAM_INFO_FILE, 'w') as fp: - fp.write(data + "\n") - - -def fetch_file_table(version): - url = "http://download.virtualbox.org/virtualbox/{}/SHA256SUMS" - url = url.format(version) - result = {} - for line in urllib.request.urlopen(url): - sha, name = line.rstrip().split() - result[name.lstrip(b'*').decode()] = sha.decode() - return result - - -def update_to_version(version): - extpack_start = 'Oracle_VM_VirtualBox_Extension_Pack-' - version_re = version.replace('.', '\\.') - attribute_map = { - 'extpack': r'^' + extpack_start + r'[^-]+-[^.]+.vbox-extpack$', - 'extpackRev': r'^' + extpack_start + r'[^-]+-([^.]+).vbox-extpack$', - 'main': r'^VirtualBox-' + version_re + r'.tar.bz2$', - 'guest': r'^VBoxGuestAdditions_' + version_re + r'.iso$', - } - table = fetch_file_table(version) - new_attrs = {'version': version} - for attr, searchexpr in attribute_map.items(): - result = [re.search(searchexpr, key) for key in table.keys()] - filtered = filter(lambda m: m is not None, result) - found = [m.groups()[0] if len(m.groups()) > 0 else table[m.group(0)] - for m in filtered if m is not None] - - if len(found) == 0: - msg = "No package found for attribute {}".format(attr) - raise AssertionError(msg) - elif len(found) != 1: - msg = "More than one package found for attribute {}: ".format(attr) - msg += ', '.join(found) - raise AssertionError(msg) - else: - new_attrs[attr] = found[0] - return new_attrs - - -info = load_upstream_info() -latest = fetch_latest_version() -if LooseVersion(info['version']) < LooseVersion(latest): - print("Updating to version {}...".format(latest), end="", flush=True) - new_attrs = update_to_version(latest) - save_upstream_info(new_attrs) - print(" done.") -else: - print("Version {} is already the latest one.".format(info['version'])) diff --git a/pkgs/applications/virtualization/virtualbox/update.sh b/pkgs/applications/virtualization/virtualbox/update.sh new file mode 100755 index 000000000000..fcd02ae8a27b --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/update.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts nix-prefetch-scripts jq + +set -xeuo pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" + +attr=virtualbox +oldVersion="$(nix-instantiate --eval -E "with import $nixpkgs {}; $attr.version or (builtins.parseDrvName $attr.name).version" | tr -d '"')" +latestVersion="$(curl -sS https://download.virtualbox.org/virtualbox/LATEST.TXT)" + +function fileShaSum() { + echo "$1" | grep -w $2 | cut -f1 -d' ' +} +function oldHash() { + nix-instantiate --eval --strict -A "$1.drvAttrs.outputHash" | tr -d '"' +} +function nixFile() { + nix-instantiate --eval --strict -A "${1}.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/' +} + +if [ ! "$oldVersion" = "$latestVersion" ]; then + shaSums=$(curl -sS https://download.virtualbox.org/virtualbox/$latestVersion/SHA256SUMS) + + virtualBoxShaSum=$(fileShaSum "$shaSums" "VirtualBox-$latestVersion.tar.bz2") + extpackShaSum=$(fileShaSum "$shaSums" "Oracle_VM_VirtualBox_Extension_Pack-$latestVersion.vbox-extpack") + guestAdditionsShaSum=$(fileShaSum "$shaSums" "*VBoxGuestAdditions_$latestVersion.iso") + + virtualboxNixFile=$(nixFile ${attr}) + extpackNixFile=$(nixFile ${attr}Extpack) + guestAdditionsNixFile=$(nixFile linuxPackages.${attr}GuestAdditions) + + extpackOldShaSum=$(oldHash ${attr}Extpack) + guestAdditionsOldShaSum=$(oldHash linuxPackages.${attr}GuestAdditions.src) + + update-source-version $attr $latestVersion $virtualBoxShaSum + sed -i -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' $extpackNixFile + sed -i -e 's|sha256 = "'$guestAdditionsOldShaSum'"|sha256 = "'$guestAdditionsShaSum'"|' $guestAdditionsNixFile + + git add $virtualboxNixFile $extpackNixFile $guestAdditionsNixFile + git commit -m "$attr: ${oldVersion} -> ${latestVersion}" +else + echo "$attr is already up-to-date" +fi diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 7c59b8b7cde4..3e12e3fcc55f 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -14,8 +14,8 @@ let baseWrapper = writeShellScriptBin "sway" '' set -o errexit if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then - export _SWAY_WRAPPER_ALREADY_EXECUTED=1 ${extraSessionCommands} + export _SWAY_WRAPPER_ALREADY_EXECUTED=1 fi if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then export DBUS_SESSION_BUS_ADDRESS diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index 4e464f370229..0e835cbedea1 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -1,4 +1,4 @@ -# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/tree/454acad50ba584d9602ccd4238fc5e585abc15c9 +# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts # The main difference is that we use “Twitter Color Emoji” name (which is recognized by upstream fontconfig) { stdenv @@ -15,14 +15,14 @@ }: let - version = "12.1.2"; + version = "12.1.5"; twemojiSrc = fetchFromGitHub { name = "twemoji"; owner = "twitter"; repo = "twemoji"; rev = "v${version}"; - sha256 = "0vzmlp83vnk4njcfkn03jcc1vkg2rf12zf5kj3p3a373xr4ds1zn"; + hash = "sha256-qb3bLiUgtA8QQ13u928kvM+3qwmQpyjUk0EPKja1kSk="; }; in @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { ]; patches = [ - # ImageMagick -> GrahphicsMagick + # ImageMagick -> GraphicsMagick (fetchpatch { - url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/3bc176c10ced2824fe03da5ff561e22a36bf8ccd/f/noto-emoji-use-gm.patch"; - sha256 = "0yfmfzaaiq5163c06172g4r734aysiqyv1s28siv642vqzsqh4i2"; + url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/07778605d50696f6aa929020e82611a01d254c90/f/noto-emoji-use-gm.patch"; + sha256 = "sha256-kyJwT1SKS1vnXxvPTiIMK6TRHMp1ZOSlb6rodL4Jbxs="; }) ]; @@ -114,7 +114,9 @@ stdenv.mkDerivation rec { # In twemoji source ## Artwork is Creative Commons Attribution 4.0 International ## Non-artwork is MIT + # In Fedora twitter-twemoji-fonts source + ## spec files are MIT: https://fedoraproject.org/wiki/Licensing:Main#License_of_Fedora_SPEC_Files license = with licenses; [ asl20 ofl cc-by-40 mit ]; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar emily ]; }; } diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 1243d5fa5cb6..a735d9f446d2 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0p22jxcagamvp08xfglz4cz1sp8w4p101npw0ggrkhh7vm8yb9bh"; + sha256 = "1lkb0m8ys13sy3b6c1kj3cqrqf5d1dqvhbp8spz8v9yjv3d7z3r6"; }; LANG = "en_US.UTF-8"; # postinstall.py diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index d508222188b8..3784f1099001 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -1,27 +1,34 @@ -{ stdenv, fetchFromGitHub, glib, gettext }: +{ stdenv +, fetchFromGitHub +, glib +, gettext +}: stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-dock-unstable"; - version = "2020-03-19"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; # rev = "extensions.gnome.org-v" + version; - rev = "8c94a8d6db47ebc1273e690f4e0ba5e592f7f268"; - sha256 = "7nNfxAINqOIJCgYXYaPck2EJ1IOmzt6AkfDFknZ8GaI="; + rev = "1788f31b049b622f78d0e65c56bef76169022ca9"; + sha256 = "M3tlRbQ1PjKvNrKNtg0+CBEtzLSFQYauXJXQojdkHuk="; }; nativeBuildInputs = [ - glib gettext + glib + gettext ]; - makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + makeFlags = [ + "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" + ]; meta = with stdenv.lib; { description = "A dock for the Gnome Shell"; - license = licenses.gpl2; - maintainers = with maintainers; [ eperuffo ]; homepage = "https://micheleg.github.io/dash-to-dock/"; + license = licenses.gpl2; + maintainers = with maintainers; [ eperuffo jtojnar ]; }; } diff --git a/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch b/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch deleted file mode 100644 index c49ebb550f3f..000000000000 --- a/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/addons/allegrogl/include/alleggl.h -+++ b/addons/allegrogl/include/alleggl.h -@@ -63,9 +63,11 @@ typedef __int64 INT64; - /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ - #define __glext_h_ - #define __glxext_h_ -+#define __glx_glxext_h_ - #include <GL/gl.h> - #undef __glext_h_ - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #endif /* ALLEGRO_MACOSX */ - ---- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h -+++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h -@@ -1,7 +1,9 @@ - /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ - #define __glxext_h_ -+#define __glx_glxext_h_ - #include <GL/glx.h> - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #ifndef GLX_VERSION_1_3 - #define AGLX_VERSION_1_3 diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 963590d4faf2..6071f63255d9 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -5,15 +5,14 @@ stdenv.mkDerivation rec { pname = "allegro"; - version="4.4.2"; + version="4.4.3.1"; src = fetchurl { url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; + sha256 = "1m6lz35nk07dli26kkwz3wa50jsrxs1kb6w1nj14a911l34xn6gc"; }; patches = [ - ./allegro4-mesa-18.2.5.patch ./nix-unstable-sandbox-fix.patch ]; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 17aab0c8a34e..42e1a252a768 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "fmt"; - version = "6.1.2"; + version = "6.2.0"; src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; rev = version; - sha256 = "1ngb2fd7c2jnxi3x5kjgxmpixmyc737f77vibij43dl77ybiaihi"; + sha256 = "1vr08a8q94j66gas7ddbpdbq72b2ikd0mkgd5zd3l63610n8qajs"; }; + patches = [ + # Fix BC break breaking Kodi + # https://github.com/xbmc/xbmc/issues/17629 + # https://github.com/fmtlib/fmt/issues/1620 + (fetchpatch { + url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch"; + sha256 = "vdttRGgdltabeRAs4/z0BNtW2dLOhCxtXQFGVFKpEG0="; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index 27a4d6ceb64c..ee31e22628c8 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -8,20 +8,24 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "1qk513fgfh4hwb1ajjmvg9m1bl97m3n731ymxqsh1c3fj468a2am"; + sha256 = "1hajbdwx20a48hp8kv6jqbjvnzjvcdqmbjfsymzy2xa80idqkfab"; }; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib ]; + postPatch = '' + echo ${version} > .tarball-version + ''; + meta = with stdenv.lib; { description = "General purpose TCP-IP emulator"; homepage = "https://gitlab.freedesktop.org/slirp/libslirp"; diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 9740c66c9744..434cc707babb 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -22,67 +22,67 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.901.1" = { + "@angular-devkit/architect-0.901.3" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.901.1"; + version = "0.901.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.1.tgz"; - sha512 = "foWDAurMfBDYLAJxHpTFkJBub1c2A8+eWHbBjgqIHmT8xadnE7t8nSA9XDl+k/kIoWw/qFU+6IttPirudYc/vw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.3.tgz"; + sha512 = "CFjSj48nOJwejmFFtenIqSZWyxRe4fRQsg16l0R4sagW7YwMJSaW6Yl9hRHM8bviPRrTpGHnxeq1x506v1ARLw=="; }; }; - "@angular-devkit/core-9.1.1" = { + "@angular-devkit/core-9.1.3" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.1.1"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.1.tgz"; - sha512 = "57MNew2u1QwVb69jxZyhXgdW9kqcGyWyRy2ui/hWCkWLg7RumWtyypmdTs89FNExB4HqtXlQ2eO3JZxfs7QR3w=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.3.tgz"; + sha512 = "VRV96prPy0Kdlm6XmI7DITqSMSc1bINimnOhzQre3euDX5OQty+EUqaexHtMv/SPDZX1agP+buHr6viv9YEhzA=="; }; }; - "@angular-devkit/schematics-9.1.1" = { + "@angular-devkit/schematics-9.1.3" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.1.1"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.1.tgz"; - sha512 = "6wx2HcvafHvEjEa1tjDzW2hXrOiSE8ALqJUArb3+NoO1BDM42aGcqyPo0ODzKtDk12CgSsFXdNKRpQ5AmpSPtw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.3.tgz"; + sha512 = "nNRoQPqoin5jzLKmTabIPLSqVw2Zjnk78XC4AhAM7rSisWMsZ6pw5+BNDITiKfq0LkSXfOs0DoJV/Vr9mLkn/A=="; }; }; - "@antora/asciidoc-loader-2.2.0" = { + "@antora/asciidoc-loader-2.3.0" = { name = "_at_antora_slash_asciidoc-loader"; packageName = "@antora/asciidoc-loader"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.2.0.tgz"; - sha512 = "dwKXao6eqbAh8O7OS1ZUgVHmbfl38z7RzBCM6DbTb1VODk1HGIgp6gxauGmy5rBvjrJTtz7M1Dxs+BzBApeyMw=="; + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.0.tgz"; + sha512 = "mncSlmkk6rYH5SGplZtHjuieG3ve5bhm4x0f9WIFE+GhqajIogDjxTBNWNr9B2dVA4bMves7Sy+c5h+f9V3iVw=="; }; }; - "@antora/content-aggregator-2.2.0" = { + "@antora/content-aggregator-2.3.0" = { name = "_at_antora_slash_content-aggregator"; packageName = "@antora/content-aggregator"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.2.0.tgz"; - sha512 = "Dd3jvjIty75G5X04lf6XFK8wKwKo1bfJfafsvwwJuApILASt0Nrv+Z3O+rfc4MhaswgZNqVBrEcSJW9BJxXPtw=="; + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.0.tgz"; + sha512 = "LbH65Hw5uk3QCX8sCsJGnIVapQbtkxgyaDAfxYJlXnBI4jjd92391k0vitFL7f+9dzEvSdzxUHJU/lPyi9eB6g=="; }; }; - "@antora/content-classifier-2.2.0" = { + "@antora/content-classifier-2.3.0" = { name = "_at_antora_slash_content-classifier"; packageName = "@antora/content-classifier"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.2.0.tgz"; - sha512 = "cVoL7aR619FNFN3bKiiFhLinaFktQ06OmMG+QMJW0tNRaeI1ATYtrpUvwG5KVuciwDZFKp+GboRUoud0OGLfJQ=="; + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.0.tgz"; + sha512 = "x/GUrm62+zSA8uQYaPG1y8NDALSDeKKl+um0CrxV5nt8c6vEO80KODN4YEPqoC0tOq8zdT99J6ElYblpkxrW6Q=="; }; }; - "@antora/document-converter-2.2.0" = { + "@antora/document-converter-2.3.0" = { name = "_at_antora_slash_document-converter"; packageName = "@antora/document-converter"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.2.0.tgz"; - sha512 = "Ka3moJL5HRoaHUz6U1s9M36WGJg8vUmlQziUpKsC96GbgWyiNXIvNwvQN9kdAW0AXR1CNpIcZ8sl7ygIaa7pLA=="; + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.0.tgz"; + sha512 = "RMvdqBIz+pXf5znuyVeR7GF8qw/zLfaRMmEzMzywYa+8Cappxy+pgs+BuAuH1TdAnsFzpPrIO211c2FE1OxXBg=="; }; }; "@antora/expand-path-helper-1.0.0" = { @@ -94,76 +94,76 @@ let sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw=="; }; }; - "@antora/navigation-builder-2.2.0" = { + "@antora/navigation-builder-2.3.0" = { name = "_at_antora_slash_navigation-builder"; packageName = "@antora/navigation-builder"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.2.0.tgz"; - sha512 = "r78NVNN/PbbSbXI5+NJ4d5G0RM1cklv++djPI0xIjFPK8R7GsuQagAaEpZS9o8UKcRlIyyGTeaT8dWKnFxZh2w=="; + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.0.tgz"; + sha512 = "bpdT50pUW8IbRHAwlwaRdMlqwdTCOGdh0novW2Z6uBi6KKKbl6K3BdbaVs/jwXalESWqkYHcyBpinMivsX4bBA=="; }; }; - "@antora/page-composer-2.2.0" = { + "@antora/page-composer-2.3.0" = { name = "_at_antora_slash_page-composer"; packageName = "@antora/page-composer"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.2.0.tgz"; - sha512 = "JBRqWjJE8pUJG7AU6GMYWo2avBHLzxBisyfFq9FGH7Uf+Shv+0RYImFH0fDX0Et+83sfg2i3y39SfTYXKLsc3g=="; + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.0.tgz"; + sha512 = "ve4h3uColNuqGehSJ2qUw5dar1Ls3i+RBYh2HyVZZ84qjLoOjPGAALFYzRVJnYlEX6nAswNFhh5ll/hIuaxuHQ=="; }; }; - "@antora/playbook-builder-2.2.0" = { + "@antora/playbook-builder-2.3.0" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.2.0.tgz"; - sha512 = "GIbkyCnwdTJVHYwSEG4d6Px2Uh/zBiwLXK7zGsaMY4/DmbYBKzNK4xpt7fHXvIw2IyH9GA1XRQ7+vpBSg8VP8w=="; + url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.0.tgz"; + sha512 = "zuuTqY5dDXYhu4LfmFW3qzdFXSrXSo9NCDX9eBJ6MCXsuj64PqdOljzv4rWNy3HvmKOSCupfWCashJS0vuH2Dw=="; }; }; - "@antora/redirect-producer-2.2.0" = { + "@antora/redirect-producer-2.3.0" = { name = "_at_antora_slash_redirect-producer"; packageName = "@antora/redirect-producer"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.2.0.tgz"; - sha512 = "ZkUe95Wj3TiFrbXA0sRDCv+0yD1HxI84/2pQj6cnMV01vrfj9HKeMdbBG1Sgf5bmaDDJ1nImlT0l2g6t+pBIJg=="; + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.0.tgz"; + sha512 = "/632VZlkpFIh5KlV3A9LqE4yGtYyQ+1vOb5A9yajYWsCnhqNfEMslMWuoLoQk4gzs3Ju+hz5MrAXp8sn1vbRvg=="; }; }; - "@antora/site-mapper-2.2.0" = { + "@antora/site-mapper-2.3.0" = { name = "_at_antora_slash_site-mapper"; packageName = "@antora/site-mapper"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.2.0.tgz"; - sha512 = "318hg4n6SjisAA5e3uq02IdSeW6hQwCo+2TfQQQlCY/+DlFV0V2ML2bicwSrdfweJ42o5TxgSQAtTuOc1YPjgA=="; + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.0.tgz"; + sha512 = "XzIoYKJQXgOzsDeUlL/edVR9B9aaCYUHADvzYqDc1S5/czFQxpqIIgMfYCiYYc7pHk6nmj5rgx/6HfvDImv87w=="; }; }; - "@antora/site-publisher-2.2.0" = { + "@antora/site-publisher-2.3.0" = { name = "_at_antora_slash_site-publisher"; packageName = "@antora/site-publisher"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.2.0.tgz"; - sha512 = "3pcGacS72sOKnm7Hnx328AUWGMEDsNHHQla6lwHL7gtWGtn/9tpt0M+MtgkxZnOLmoif8pt/JWPmlnv6td2xSw=="; + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.0.tgz"; + sha512 = "2qC0fDE70VKtyttPpRx9glPWL4M5x7HYVCs1K6+GmpuISmljO3c/09L+ExPsJiSVVFarnWmMu0w+76XqSRHlog=="; }; }; - "@antora/ui-loader-2.2.0" = { + "@antora/ui-loader-2.3.0" = { name = "_at_antora_slash_ui-loader"; packageName = "@antora/ui-loader"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.2.0.tgz"; - sha512 = "3d6SqtknM3PiLRw2wLtcMVVfmyHtfNuWo8+ZBRmUrZs8HfhGteV8/s4vpiOJZmLYhW4KLFgIgG09lFdD5t78Ow=="; + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.0.tgz"; + sha512 = "EcBUwd4ImWI/BH0dZpH6CfDzBnAtQ2qUPChaeqVbmfCNpBvH6t09YYRVA713no21ypAF3AwBs3FGU1+vR6T/IQ=="; }; }; - "@apollo/federation-0.14.0" = { + "@apollo/federation-0.14.1" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.14.0.tgz"; - sha512 = "JNIWj8p9vd4c1kZFl70B1wUt2RwttSUHVef4UfTAyhN7PHX5D4J+IHTYurgOIC/yUqIURi7iVh8vAtudhpxtEA=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.14.1.tgz"; + sha512 = "QuX2O3xO6mcTZdqttxHaMKWgq1v0nYRiDLe4k7DwAxVtb9nF8lsJDlup4Zicx3LBYhBCGQvumrYILuF/Amn6WQ=="; }; }; "@apollo/protobufjs-1.0.3" = { @@ -175,13 +175,13 @@ let sha512 = "gqeT810Ect9WIqsrgfUvr+ljSB5m1PyBae9HGdrRyQ3HjHjTcjVvxpsMYXlUk4rUHnrfUqyoGvLSy2yLlRGEOw=="; }; }; - "@apollographql/apollo-tools-0.4.5" = { + "@apollographql/apollo-tools-0.4.7" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; - version = "0.4.5"; + version = "0.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.5.tgz"; - sha512 = "KOZC4Y+JM4iQQ7P4CVC878Ee7ya0QoHApGHu4klwjwZkYyOdWIvbML7JfXOUb/AfCO4DFmJfHCjRdAX09Ga6sQ=="; + url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.7.tgz"; + sha512 = "6QjZz6aLq6QXHgJ1AmSg4C4cBmhF5z3g7LPsk4g+zJoWKxiFuSIbrTe12ETtn6wgPq//e5p2agbXYydIjqs7gw=="; }; }; "@apollographql/graphql-language-service-interface-2.0.2" = { @@ -283,15 +283,6 @@ let sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA=="; }; }; - "@babel/generator-7.9.4" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.9.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz"; - sha512 = "rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA=="; - }; - }; "@babel/generator-7.9.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -1210,15 +1201,6 @@ let sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q=="; }; }; - "@babel/types-7.9.0" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz"; - sha512 = "BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng=="; - }; - }; "@babel/types-7.9.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -1453,13 +1435,13 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; - "@iarna/toml-2.2.3" = { + "@iarna/toml-2.2.5" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; - version = "2.2.3"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.3.tgz"; - sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="; + url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz"; + sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; "@ionic/cli-framework-3.0.6" = { @@ -1579,22 +1561,22 @@ let sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; }; - "@jest/transform-25.3.0" = { + "@jest/transform-25.4.0" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "25.3.0"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-25.3.0.tgz"; - sha512 = "W01p8kTDvvEX6kd0tJc7Y5VdYyFaKwNWy1HQz6Jqlhu48z/8Gxp+yFCDVj+H8Rc7ezl3Mg0hDaGuFVkmHOqirg=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz"; + sha512 = "t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g=="; }; }; - "@jest/types-25.3.0" = { + "@jest/types-25.4.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "25.3.0"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-25.3.0.tgz"; - sha512 = "UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw=="; + url = "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz"; + sha512 = "XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -2299,13 +2281,13 @@ let sha512 = "6+iaCMh/JXJaB2QWikqvGE9//wLEVYYwZd5sud8aLoLKog1Q75naZh2vlGVtg5Mq/NqpqGQvdIjJb3Bm+64AUQ=="; }; }; - "@oclif/config-1.14.0" = { + "@oclif/config-1.15.1" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.14.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.14.0.tgz"; - sha512 = "KsOP/mx9lzTah+EtGqLUXN3PDL0J3zb9/dTneFyiUK2K6T7vFEGhV6OasmqTh4uMZHGYTGrNPV8x/Yw6qZNL6A=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.15.1.tgz"; + sha512 = "GdyHpEZuWlfU8GSaZoiywtfVBsPcfYn1KuSLT1JTfvZGpPG6vShcGr24YZ3HG2jXUFlIuAqDcYlTzOrqOdTPNQ=="; }; }; "@oclif/errors-1.2.2" = { @@ -2398,13 +2380,13 @@ let sha512 = "eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg=="; }; }; - "@octokit/endpoint-6.0.0" = { + "@octokit/endpoint-6.0.1" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.0.tgz"; - sha512 = "3nx+MEYoZeD0uJ+7F/gvELLvQJzLXhep2Az0bBSXagbApDvDW0LWwpnAIY/hb0Jwe17A0fJdz0O12dPh05cj7A=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.1.tgz"; + sha512 = "pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A=="; }; }; "@octokit/plugin-enterprise-rest-3.6.2" = { @@ -2443,13 +2425,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.0" = { + "@octokit/request-5.4.2" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.0"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.0.tgz"; - sha512 = "uAJO6GI8z8VHBqtY7VTL9iFy1Y+UTp5ShpI97tY5z0qBfYKE9rZCRsCm23VmF00x+IoNJ7a0nuVITs/+wS9/mg=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.2.tgz"; + sha512 = "zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw=="; }; }; "@octokit/request-error-1.2.1" = { @@ -2479,13 +2461,13 @@ let sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw=="; }; }; - "@octokit/types-2.10.0" = { + "@octokit/types-2.12.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "2.10.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-2.10.0.tgz"; - sha512 = "0/NN22MgQvNNgMjTwzWUzcIfFfks3faqiP1D1oQQz49KYeOWc+KkRG9ASbAPurrAnOaDiqnnuDYzhNT9cq4e8Q=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-2.12.1.tgz"; + sha512 = "LRLR1tjbcCfAmUElvTmMvLEzstpx6Xt/aQVTg2xvd+kHA2Ekp1eWl5t+gU7bcwjXHYEAzh4hH4WH+kS3vh+wRw=="; }; }; "@parcel/fs-1.11.0" = { @@ -2677,22 +2659,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.1.1" = { + "@schematics/angular-9.1.3" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.1.1"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.1.tgz"; - sha512 = "V0DcDNgHQ2YR+PGZI6+pf/mUNNxt5SusShkZ1PbwIMk/HUQpzEGkLjm3v1Jw9eIZKiuDx615GNU1xDzQ/KyNRQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.3.tgz"; + sha512 = "3vxrPyvcIWvyWgbx/fpeQvMThXlmcnHTXVn2dpTcE2BzstAYdG17W3qouhvmlqd6m28orxkKKiZaJYMNTtnV/A=="; }; }; - "@schematics/update-0.901.1" = { + "@schematics/update-0.901.3" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.901.1"; + version = "0.901.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.1.tgz"; - sha512 = "g5B8hjXKCbUNLKCkWQxc5r2D9lOQXRTLZJNIqva+l/ck0AML5MpelxkqQId9ZGLfQqfFk/XjdSHRWgcmUs1WnA=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.3.tgz"; + sha512 = "kwfc9LMMi6ryN2oiat9vTqGMK1jKwI1c45Nm1xala35nsbQSQ12qeL3MrVmnSCeI14+cinFUbp8mWI9/3M+/Lg=="; }; }; "@serverless/cli-1.4.0" = { @@ -2713,13 +2695,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.29.3" = { + "@serverless/components-2.30.1" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.29.3"; + version = "2.30.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.29.3.tgz"; - sha512 = "Qrucf/k4QStcVLIvumGvf3oJlotxrcIswO0LnTu6WosPQHrVXy6uMTd2QF5raNMi4UTnOA86ZM//XXYkgGbDnw=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.1.tgz"; + sha512 = "blqZP6aRg9oj1A30ip2hndcvA1g+J8g8vFbUHtAfs5mp/r4KTD63tNagscSNKTSbc6csM3Z9w6yjW4KSarl8LQ=="; }; }; "@serverless/core-1.1.2" = { @@ -2776,13 +2758,13 @@ let sha512 = "29JV8XpJPTUSWgDwxhvZZ9fi9/5jCn1x5IeT+xEiEkpuXZU79wXlSfMfc8XtptOsDouZnOhBpKEZrItGp67CFw=="; }; }; - "@serverless/platform-client-china-1.0.5" = { + "@serverless/platform-client-china-1.0.6" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.5.tgz"; - sha512 = "EhiVkC3qh8uZQjcIXbN7n1eVCKiyvriJjghbOe4cigkNhT/dHPTFM23aK3h/rJowfP9P5+R4xfKsaCWRjA8Y3Q=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.6.tgz"; + sha512 = "565LsU74rDQQJAN6y8dTJpDNktqGGs2EvafXXEX021F+YlN3fIJebXRASN2Mgj4XWmzY7DbqC3v2wXF9j3LsGg=="; }; }; "@serverless/platform-sdk-2.3.0" = { @@ -2803,13 +2785,13 @@ let sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ=="; }; }; - "@serverless/utils-china-0.1.3" = { + "@serverless/utils-china-0.1.6" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.3"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.3.tgz"; - sha512 = "2KtmNFNGvWC/TAOkcnp8oDchAlLh/anpnxLifBb2xjbP50m3tOnoea5eU1QRENPOtCrg0iqCpfmfJ3eiCkaf0A=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.6.tgz"; + sha512 = "BPaKkRJ47yKTIqRkwF62V5Z/SGdNDmNtinu3fK4988CG1gXBVG2yb3Cq34A98B4BAwZdKzxKCV2n9q4dl1zolw=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -2830,13 +2812,13 @@ let sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; }; }; - "@sindresorhus/is-2.1.0" = { + "@sindresorhus/is-2.1.1" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.0.tgz"; - sha512 = "lXKXfypKo644k4Da4yXkPCrwcvn6SlUW2X2zFbuflKHNjf0w9htru01bo26uMhleMXsDmnZ12eJLdrAZa9MANg=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz"; + sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; }; }; "@slack/client-3.16.0" = { @@ -2875,22 +2857,13 @@ let sha512 = "ecbylK5Ol2ySb/WbfPj0s0GuLQR+KWKFzUgVaoNHaSoN6371qRWwf2uVr+hPUP4gXqCai21Ug/RDArfOhlPwrQ=="; }; }; - "@snyk/cli-interface-2.3.1" = { - name = "_at_snyk_slash_cli-interface"; - packageName = "@snyk/cli-interface"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.1.tgz"; - sha512 = "JZvsmhDXSyjv1dkc12lPI3tNTNYlIaOiIQMYFg2RgqF3QmWjTyBUgRZcF7LoKyufHtS4dIudM6k1aHBpSaDrhw=="; - }; - }; - "@snyk/cli-interface-2.3.2" = { + "@snyk/cli-interface-2.4.0" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz"; - sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.4.0.tgz"; + sha512 = "FH3RpJV83SFmNWR7FXS4O4sAF7oZZxAWmN6vwhADGJNAdgJYW4Acc6677ZSMnRpIHiFBHrsxso3Au+NQuu73xA=="; }; }; "@snyk/cocoapods-lockfile-parser-3.1.0" = { @@ -2938,6 +2911,15 @@ let sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; }; }; + "@snyk/java-call-graph-builder-1.3.4" = { + name = "_at_snyk_slash_java-call-graph-builder"; + packageName = "@snyk/java-call-graph-builder"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.3.4.tgz"; + sha512 = "3KXA5hTqvn6EZBEyMhA5zj0QCzu1WBPVBeUbQ4sNfftbVgfy/OFc9I/NPi39ALA2+tFYl1aKVIy1ECRea4Mc1w=="; + }; + }; "@snyk/ruby-semver-2.1.0" = { name = "_at_snyk_slash_ruby-semver"; packageName = "@snyk/ruby-semver"; @@ -3226,13 +3208,13 @@ let sha512 = "XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w=="; }; }; - "@tootallnate/once-1.0.0" = { + "@tootallnate/once-1.1.2" = { name = "_at_tootallnate_slash_once"; packageName = "@tootallnate/once"; - version = "1.0.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz"; - sha512 = "KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA=="; + url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"; + sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; "@types/accepts-1.3.5" = { @@ -3586,13 +3568,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.149" = { + "@types/lodash-4.14.150" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.149"; + version = "4.14.150"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz"; - sha512 = "ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.150.tgz"; + sha512 = "kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w=="; }; }; "@types/long-4.0.1" = { @@ -3631,31 +3613,31 @@ let sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; }; }; - "@types/node-10.17.19" = { + "@types/node-10.17.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.19"; + version = "10.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.19.tgz"; - sha512 = "46/xThm3zvvc9t9/7M3AaLEqtOpqlYYYcCZbpYVAQHG20+oMZBkae/VMrn4BTi6AJ8cpack0mEXhGiKmDNbLrQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.21.tgz"; + sha512 = "PQKsydPxYxF1DsAFWmunaxd3sOi3iMt6Zmx/tgaagHYmwJ/9cRH91hQkeJZaUGWbvn0K5HlSVEXkn5U/llWPpQ=="; }; }; - "@types/node-12.12.35" = { + "@types/node-12.12.37" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.12.35"; + version = "12.12.37"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.35.tgz"; - sha512 = "ASYsaKecA7TUsDrqIGPNk3JeEox0z/0XR/WsJJ8BIX/9+SkMSImQXKWfU/yBrSyc7ZSE/NPqLu36Nur0miCFfQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.12.37.tgz"; + sha512 = "4mXKoDptrXAwZErQHrLzpe0FN/0Wmf5JRniSVIdwUrtDf9wnmEV1teCNLBo/TwuXhkK/bVegoEn/wmb+x0AuPg=="; }; }; - "@types/node-13.11.1" = { + "@types/node-13.13.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.11.1"; + version = "13.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.11.1.tgz"; - sha512 = "eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz"; + sha512 = "LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A=="; }; }; "@types/node-6.14.10" = { @@ -3667,15 +3649,6 @@ let sha512 = "pF4HjZGSog75kGq7B1InK/wt/N08BuPATo+7HRfv7gZUzccebwv/fmWVGs/j6LvSiLWpCuGGhql51M/wcQsNzA=="; }; }; - "@types/node-fetch-2.5.5" = { - name = "_at_types_slash_node-fetch"; - packageName = "@types/node-fetch"; - version = "2.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.5.tgz"; - sha512 = "IWwjsyYjGw+em3xTvWVQi5MgYKbRs0du57klfTaZkv/B24AEQ/p/IopNeqIYNy3EsfHOpg8ieQSDomPcsYMHpA=="; - }; - }; "@types/node-fetch-2.5.6" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; @@ -3802,13 +3775,13 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.43.0" = { + "@types/vscode-1.44.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.43.0.tgz"; - sha512 = "kIaR9qzd80rJOxePKpCB/mdy00mz8Apt2QA5Y6rdrKFn13QNFNeP3Hzmsf37Bwh/3cS7QjtAeGSK7wSqAU0sYQ=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.44.0.tgz"; + sha512 = "WJZtZlinE3meRdH+I7wTsIhpz/GLhqEQwmPGeh4s1irWLwMzCeTV8WZ+pgPTwrDXoafVUWwo1LiZ9HJVHFlJSQ=="; }; }; "@types/ws-6.0.4" = { @@ -3865,13 +3838,13 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@typescript-eslint/eslint-plugin-2.28.0" = { + "@typescript-eslint/eslint-plugin-2.29.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "2.28.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.28.0.tgz"; - sha512 = "w0Ugcq2iatloEabQP56BRWJowliXUP5Wv6f9fKzjJmDW81hOTBxRoJ4LoEOxRpz9gcY51Libytd2ba3yLmSOfg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.29.0.tgz"; + sha512 = "X/YAY7azKirENm4QRpT7OVmzok02cSkqeIcLmdz6gXUQG4Hk0Fi9oBAynSAyNXeGdMRuZvjBa0c1Lu0dn/u6VA=="; }; }; "@typescript-eslint/experimental-utils-1.13.0" = { @@ -3883,13 +3856,13 @@ let sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; }; }; - "@typescript-eslint/experimental-utils-2.28.0" = { + "@typescript-eslint/experimental-utils-2.29.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "2.28.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.28.0.tgz"; - sha512 = "4SL9OWjvFbHumM/Zh/ZeEjUFxrYKtdCi7At4GyKTbQlrj1HcphIDXlje4Uu4cY+qzszR5NdVin4CCm6AXCjd6w=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.29.0.tgz"; + sha512 = "H/6VJr6eWYstyqjWXBP2Nn1hQJyvJoFdDtsHxGiD+lEP7piGnGpb/ZQd+z1ZSB1F7dN+WsxUDh8+S4LwI+f3jw=="; }; }; "@typescript-eslint/parser-1.13.0" = { @@ -3901,13 +3874,13 @@ let sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; }; }; - "@typescript-eslint/parser-2.28.0" = { + "@typescript-eslint/parser-2.29.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "2.28.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.28.0.tgz"; - sha512 = "RqPybRDquui9d+K86lL7iPqH6Dfp9461oyqvlXMNtap+PyqYbkY5dB7LawQjDzot99fqzvS0ZLZdfe+1Bt3Jgw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.29.0.tgz"; + sha512 = "H78M+jcu5Tf6m/5N8iiFblUUv+HJDguMSdFfzwa6vSg9lKR8Mk9BsgeSjO8l2EshKnJKcbv0e8IDDOvSNjl0EA=="; }; }; "@typescript-eslint/typescript-estree-1.13.0" = { @@ -3919,13 +3892,13 @@ let sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw=="; }; }; - "@typescript-eslint/typescript-estree-2.28.0" = { + "@typescript-eslint/typescript-estree-2.29.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "2.28.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.28.0.tgz"; - sha512 = "HDr8MP9wfwkiuqzRVkuM3BeDrOC4cKbO5a6BymZBHUt5y/2pL0BXD6I/C/ceq2IZoHWhcASk+5/zo+dwgu9V8Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.29.0.tgz"; + sha512 = "3YGbtnWy4az16Egy5Fj5CckkVlpIh0MADtAQza+jiMADRSKkjdpzZp/5WuvwK/Qib3Z0HtzrDFeWanS99dNhnA=="; }; }; "@vue/cli-shared-utils-4.3.1" = { @@ -4729,13 +4702,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.20.0" = { + "addons-linter-1.23.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.20.0"; + version = "1.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.20.0.tgz"; - sha512 = "EIyJnIkvXhBKgOzVFR873uGa4ny07odIl8i8qWxHAuVJWM/ZQtLouAbndA+cVRDbD66sK6HsO1oWN6WkdCr/uA=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.23.0.tgz"; + sha512 = "4ozo5E+KnsU9h94J496WQs6NYSnofxtw5/Sy63PmeB5FJ3KWERx1S9D8A+ixMAIMgaSiexHpp5alp9yjE0t4gg=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -4927,22 +4900,22 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.10.2" = { + "ajv-6.12.0" = { name = "ajv"; packageName = "ajv"; - version = "6.10.2"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; - sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; + sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; }; }; - "ajv-6.12.0" = { + "ajv-6.12.2" = { name = "ajv"; packageName = "ajv"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; }; "ajv-6.5.3" = { @@ -5422,13 +5395,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.27.0" = { + "apollo-2.27.3" = { name = "apollo"; packageName = "apollo"; - version = "2.27.0"; + version = "2.27.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.27.0.tgz"; - sha512 = "yA4/DihmCuz+8k1zsHCtuEslVtAY1oc9mCv7YLUr2B7TVLgbEzNNzNciMbSa5SIczt0S5I+tr6pBhMYPgsLN3A=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.27.3.tgz"; + sha512 = "9GWIdwah0o4XiNTGcoc4JIflBYf+3+JflKeqS3YfJ8uOzUPGSaFIt0Z42p43TJ9ALvJqnlcYy/cBCizihne3Xg=="; }; }; "apollo-cache-1.3.4" = { @@ -5485,13 +5458,13 @@ let sha512 = "sanUIqXWyyDpxY3fYOVU+Hsxwxdj5fmn3Zcy6CcMGnWmh9o7tautQAuod2a63wrDs1jcNQcFq3EKIpeB+2xECw=="; }; }; - "apollo-codegen-core-0.36.6" = { + "apollo-codegen-core-0.36.8" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.36.6"; + version = "0.36.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.6.tgz"; - sha512 = "wVQkjYrbJa3Ut98pP9z/DnPPdtYaXLmOe83TOM1/krX3MlhTD17VWx1pkLht+1Tuy7hEZErxA5d2bwaynSNfCg=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.8.tgz"; + sha512 = "T/JhiGIJHpqVw6YAbdxhDXUYqZjm5wqoGL4yc3rgpNH7Wo/TOFpiFu0FDQyncq2uU7za062Pj8lXj1jhC6uNzQ=="; }; }; "apollo-codegen-flow-0.20.0" = { @@ -5503,13 +5476,13 @@ let sha512 = "XgKE19B0Q74PBLVqHP/77NcCFrcvrN9wi3CcotH+FV8BeHTjvpHlilTsQMmd2STPt19cCvY2Qtz0EOeLXTUQ2Q=="; }; }; - "apollo-codegen-flow-0.34.6" = { + "apollo-codegen-flow-0.34.8" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.34.6"; + version = "0.34.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.6.tgz"; - sha512 = "jgoa9dlWNec+qD02hsWaLYtd2p9A97IbEcWX7aLaE5fifrK1rIA7lY6TLwlXc663YxBcgZzGaCfKtatqndfg9A=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.8.tgz"; + sha512 = "U81ZM2roWSSKrlZSqpltJfG5TRrDjqyyV+odC5GWzyYZUltYTqDqZjoleGeMguLBupDFOr21QUlM1LtJxeRAfQ=="; }; }; "apollo-codegen-flow-legacy-0.20.0" = { @@ -5530,13 +5503,13 @@ let sha512 = "NbnMOfUXXovlTGRj4mIZGXB9HvidQhwKfAmdYHox5peHPkjjsqEzxGCIuWCSnubWiCF2uHZnQoIkg4sXWf0KLw=="; }; }; - "apollo-codegen-scala-0.35.6" = { + "apollo-codegen-scala-0.35.8" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.35.6"; + version = "0.35.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.6.tgz"; - sha512 = "H5NAMdCb5cMB/YGUqCSDspPLRxMFklc9m2CBVpdo90cjIjb8YEJDJfqpLt1D6X5fX2xPhNYptCyeDkY1qXC9XQ=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.8.tgz"; + sha512 = "c9g7+2MLzDG217cy4KFMCCXxw+kBTjvUxjXG9+PwzP5cEMchFxlCQdMbOazY+s03Q8Uy4uYh6f+Kw0x0YaPoWw=="; }; }; "apollo-codegen-swift-0.20.0" = { @@ -5548,13 +5521,13 @@ let sha512 = "L9Y4StbXw0t/nuF+miz0ybSt/io6tsLc063Yeh1A8GCvhFFQyXE/yK0Rf3nO1Bl5Z9UZ5o8Aae9kK4GSWYIGNQ=="; }; }; - "apollo-codegen-swift-0.36.6" = { + "apollo-codegen-swift-0.36.8" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.36.6"; + version = "0.36.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.6.tgz"; - sha512 = "/F96GbAjBcLE8pKFv8+k4FyAaegPHl0vxF/2abxQEBfolwyLk5JufEBC2fSkS9Gf8PLQlDcEIxUFyqmBQzMbpA=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.8.tgz"; + sha512 = "PTZtRGfSFi8UkE8T92W2/zMFZ8GI59KQdotVWqUphaprhFnzHnig3YZf8L05eBgkbQuDPDckjBoRnICporG5Cw=="; }; }; "apollo-codegen-typescript-0.20.0" = { @@ -5566,13 +5539,13 @@ let sha512 = "mzlIJXz+5WPwzeALqRHHR9aPPEf6IlhSrjCawpUHmFU1NK9hgwbguYCEYZv9mKkYBUUgDY+9cGFK1cafJX70AQ=="; }; }; - "apollo-codegen-typescript-0.36.6" = { + "apollo-codegen-typescript-0.36.8" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.36.6"; + version = "0.36.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.6.tgz"; - sha512 = "Y6UZ+HP+RDp0zk3h+rCJ/7eHQKUea3fPB6YplZ80dAzcwYYfsx0WprtdSYnUgPT8Rimeg+WDZ4jzQpZ/udPiGQ=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.8.tgz"; + sha512 = "IL0UaqXuByNUjbn3oxEpBidnCIKwiNmXYpwj+EqKnnQhOVwiV7wyXYRhBFp3LoUQVW5UKZ+qulYujlCvYvaj0w=="; }; }; "apollo-codegen-typescript-legacy-0.20.0" = { @@ -5611,31 +5584,31 @@ let sha512 = "SGrIkUR7Q/VjU8YG98xcvo340C4DaNUhg/TXOtGsMlfiJDzHwVau/Bv6zifAzBafp2lj0XND6Daj5kyT/eSI/w=="; }; }; - "apollo-env-0.6.2" = { + "apollo-env-0.6.4" = { name = "apollo-env"; packageName = "apollo-env"; - version = "0.6.2"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.2.tgz"; - sha512 = "Vb/doL1ZbzkNDJCQ6kYGOrphRx63rMERYo3MT2pzm2pNEdm6AK60InMgJaeh3RLK3cjGllOXFAgP8IY+m+TaEg=="; + url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.4.tgz"; + sha512 = "8tGDMFv3sZLd76b/ZAo8GbdWU5Qt3VEUWSB+FLN41p/hVShZw0XIo2s/i8pVCTAhaWiEiD0Cr+d/zi0/h5UTxA=="; }; }; - "apollo-graphql-0.4.1" = { + "apollo-graphql-0.4.3" = { name = "apollo-graphql"; packageName = "apollo-graphql"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.1.tgz"; - sha512 = "dz2wtGeCqUDAKAj4KXLKLZiFY791aoXduul3KcLo8/6SwqWlsuZiPe0oB8mENHZZc/EchCpTMTJZX2ZENsOt2A=="; + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.3.tgz"; + sha512 = "eAl8w6TeuY0Q3x7TVqBjt4JObA34vUyctuDn2lOmkdIqlu1EKxNAnTlRtXkjQM89qUt0rK0teU8No0a2lMNGuw=="; }; }; - "apollo-language-server-1.21.1" = { + "apollo-language-server-1.21.3" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.21.1"; + version = "1.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.21.1.tgz"; - sha512 = "Yu5nw+0lGWNY9PmgogzXVRvnCNluGImeNmg4jQkXQlBR2TsQ9P3YSwujDIJ5cWWKjyi/0+3PtRYvIna58xZ/fg=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.21.3.tgz"; + sha512 = "PSPiOwR7Zd0alnZ0zeuUs7kEnWwV3jWIU01bsoy8eaF4Bi2fJD7AHnEyUOiu7V3V7xdJtnsJNTjyZy5MC0+Ohg=="; }; }; "apollo-link-1.2.14" = { @@ -6736,15 +6709,6 @@ let sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; }; }; - "async-3.1.1" = { - name = "async"; - packageName = "async"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.1.1.tgz"; - sha512 = "X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g=="; - }; - }; "async-3.2.0" = { name = "async"; packageName = "async"; @@ -6997,13 +6961,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.657.0" = { + "aws-sdk-2.661.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.657.0"; + version = "2.661.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.657.0.tgz"; - sha512 = "CGxnYEFkZwIflH0cnylMtyNNmjkQIK5gG9L0MRGha4ANSogBrCXfWcjSWP1ziDK0FhRBAyJVdMX0il/kW4ya+A=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.661.0.tgz"; + sha512 = "dfGtbRQQUmcpj6WGVhj7q2PADCvDhLf+/aRGPXcMrm0cnHavkmHPVaSvrw2lJJJ5N9MsBKoUyacrVcIQkfNsgw=="; }; }; "aws-sign2-0.6.0" = { @@ -7141,13 +7105,13 @@ let sha512 = "m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA=="; }; }; - "babel-jest-25.3.0" = { + "babel-jest-25.4.0" = { name = "babel-jest"; packageName = "babel-jest"; - version = "25.3.0"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.3.0.tgz"; - sha512 = "qiXeX1Cmw4JZ5yQ4H57WpkO0MZ61Qj+YnsVUwAMnDV5ls+yHon11XjarDdgP7H8lTmiEi6biiZA8y3Tmvx6pCg=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.4.0.tgz"; + sha512 = "p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog=="; }; }; "babel-loader-8.1.0" = { @@ -7159,13 +7123,13 @@ let sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; }; }; - "babel-plugin-dynamic-import-node-2.3.0" = { + "babel-plugin-dynamic-import-node-2.3.3" = { name = "babel-plugin-dynamic-import-node"; packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; - sha512 = "o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ=="; + url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; }; }; "babel-plugin-istanbul-6.0.0" = { @@ -7177,13 +7141,13 @@ let sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-25.2.6" = { + "babel-plugin-jest-hoist-25.4.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "25.2.6"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.6.tgz"; - sha512 = "qE2xjMathybYxjiGFJg0mLFrz0qNp83aNZycWDY/SuHiZNq+vQfRQtuINqyXyue1ELd8Rd+1OhFSLjms8msMbw=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz"; + sha512 = "M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w=="; }; }; "babel-plugin-minify-builtins-0.5.0" = { @@ -7402,15 +7366,6 @@ let sha1 = "be241ca81404030678b748717322b89d0c8fe280"; }; }; - "babel-polyfill-6.26.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz"; - sha1 = "379937abc67d7895970adc621f284cd966cf2153"; - }; - }; "babel-preset-current-node-syntax-0.1.2" = { name = "babel-preset-current-node-syntax"; packageName = "babel-preset-current-node-syntax"; @@ -7420,13 +7375,13 @@ let sha512 = "u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw=="; }; }; - "babel-preset-jest-25.3.0" = { + "babel-preset-jest-25.4.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "25.3.0"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.3.0.tgz"; - sha512 = "tjdvLKNMwDI9r+QWz9sZUQGTq1dpoxjUqFUpEasAc7MOtHg9XuLT2fx0udFG+k1nvMV0WvHHVAN7VmCZ+1Zxbw=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz"; + sha512 = "PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ=="; }; }; "babel-preset-minify-0.5.1" = { @@ -8671,13 +8626,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.11.1" = { + "browserslist-4.12.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.11.1"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz"; - sha512 = "DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz"; + sha512 = "UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg=="; }; }; "bser-2.1.1" = { @@ -9400,15 +9355,6 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; - "camelcase-keys-6.1.2" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.1.2.tgz"; - sha512 = "QfFrU0CIw2oltVvpndW32kuJ/9YOJwUnmWrjlXt1nnJZHCaS9i6bfOpg9R4Lw8aZjStkJWM+jc0cdXjWBgVJSw=="; - }; - }; "camelcase-keys-6.2.2" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -9445,13 +9391,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001042" = { + "caniuse-lite-1.0.30001046" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001042"; + version = "1.0.30001046"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001042.tgz"; - sha512 = "igMQ4dlqnf4tWv0xjaaE02op9AJ2oQzXKjWf4EuAHFN694Uo9/EfPVIPJcmn2WkU9RqozCxx5e2KPcVClHDbDw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz"; + sha512 = "CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g=="; }; }; "capture-exit-2.0.0" = { @@ -9967,13 +9913,13 @@ let sha512 = "HqsYJgIc8ljJJOqOzLphjAs79EUuWSX3nzZi2LNkzlw3GIzAeZbaSektC8iT/tKvLqZq8yl1GJu5o6doA4TRbg=="; }; }; - "chrome-launcher-0.12.0" = { + "chrome-launcher-0.13.1" = { name = "chrome-launcher"; packageName = "chrome-launcher"; - version = "0.12.0"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.12.0.tgz"; - sha512 = "rBUP4tvWToiileDi3UR0SbWKoUoDCYTRmVND2sdoBL1xANBgVz8V9h1yQluj3MEQaBJg0fRw7hW82uOPrJus7A=="; + url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.1.tgz"; + sha512 = "q8UiCNAknw6kCUvCVBTAEw1BwT0vaxabCrSjN3B/NWohp12YBD9+DalymYElSoKRD4KpVSu4CCl0us4v/J81Sg=="; }; }; "chrome-net-3.3.3" = { @@ -10264,13 +10210,13 @@ let sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "cli-progress-3.7.0" = { + "cli-progress-3.8.0" = { name = "cli-progress"; packageName = "cli-progress"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.7.0.tgz"; - sha512 = "xo2HeQ3vNyAO2oYF5xfrk5YM6jzaDNEbeJRLAQir6QlH54g4f6AXW+fLyJ/f12gcTaCbJznsOdQcr/yusp/Kjg=="; + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.8.0.tgz"; + sha512 = "3e+m7ecKbVTF2yo186vrrt/5217ZwE64z61kMwhSFmgrF3qZiTUuV9Fdh2RyzSkhLRfsqFf721KiUDEAJlP5pA=="; }; }; "cli-spinner-0.2.10" = { @@ -11164,15 +11110,6 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "commander-3.0.2" = { - name = "commander"; - packageName = "commander"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; - sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; - }; - }; "commander-4.1.0" = { name = "commander"; packageName = "commander"; @@ -13145,13 +13082,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.24" = { + "dayjs-1.8.25" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.24"; + version = "1.8.25"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.24.tgz"; - sha512 = "bImQZbBv86zcOWOq6fLg7r4aqMx8fScdmykA7cSh+gH1Yh8AM0Dbw0gHYrsOrza6oBBnkK+/OaR+UAa9UsMrDw=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.25.tgz"; + sha512 = "Pk36juDfQQGDCgr0Lqd1kw15w3OS6xt21JaLPE3lCfsEf8KrERGwDNwvK1tRjrjqFC0uZBJncT4smZQ4F+uV5g=="; }; }; "de-indent-1.0.2" = { @@ -14387,13 +14324,13 @@ let sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; }; }; - "dispensary-0.49.0" = { + "dispensary-0.51.2" = { name = "dispensary"; packageName = "dispensary"; - version = "0.49.0"; + version = "0.51.2"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.49.0.tgz"; - sha512 = "szH0vDORmGWEfwQgIqrhmrMpSGU2yXL3z7oe0NGx4sCbmnJdXXr5SQvRccPNCPrRuRPn2zPIITvwD9Lf+pcOew=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.51.2.tgz"; + sha512 = "liUDx/g1xFEBFoOL6308Vr0aYAZlGAyXGcOvuXVa/6qVBZT4QZrv4pVNeb5QOeD5C/Flta+A+qTnLkLnhgs40g=="; }; }; "diveSync-0.3.0" = { @@ -15233,13 +15170,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.411" = { + "electron-to-chromium-1.3.415" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.411"; + version = "1.3.415"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.411.tgz"; - sha512 = "TDDfkuSYEbknN0kRPSAD8WzB452pJ6EmIxGbI9yQHkDxUNbD6Educ10DxyA9r/DuLL4z255IO1OZIw+eFK6XUw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.415.tgz"; + sha512 = "GbtYqKffx3sU8G0HxwXuJFfs58Q7+iwLa5rBwaULwET6jWW8IAQSrVnu7vEfiUIcMVfbYyFg7cw3zdm+EbBJmw=="; }; }; "elegant-spinner-1.0.1" = { @@ -15293,7 +15230,7 @@ let version = "1.0.1"; src = fetchurl { name = "emitter-1.0.1.tar.gz"; - url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1"; + url = https://codeload.github.com/component/emitter/tar.gz/1.0.1; sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; }; }; @@ -15522,13 +15459,13 @@ let sha512 = "+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w=="; }; }; - "engine.io-3.4.0" = { + "engine.io-3.4.1" = { name = "engine.io"; packageName = "engine.io"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.4.0.tgz"; - sha512 = "XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.4.1.tgz"; + sha512 = "8MfIfF1/IIfxuc2gv5K+XlFZczw/BpTvqBdl0E2fBLkYQp4miv4LuDTVtYt4yMyaIFLEr4vtaSgV4mjvll8Crw=="; }; }; "engine.io-client-1.3.1" = { @@ -15549,13 +15486,13 @@ let sha512 = "y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw=="; }; }; - "engine.io-client-3.4.0" = { + "engine.io-client-3.4.1" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz"; - sha512 = "a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA=="; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.1.tgz"; + sha512 = "RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw=="; }; }; "engine.io-parser-1.0.6" = { @@ -16233,15 +16170,6 @@ let sha512 = "qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A=="; }; }; - "espree-6.1.2" = { - name = "espree"; - packageName = "espree"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz"; - sha512 = "2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA=="; - }; - }; "espree-6.2.1" = { name = "espree"; packageName = "espree"; @@ -16926,6 +16854,15 @@ let sha512 = "t4oX2z7uoSqATbMfsxWMbNjAL0T5zpvcJCk3Z9wnPPN7ibddhnmDZXHfEcoBMG2ojKXZoCyPMc5FbtK+G7SoDg=="; }; }; + "express-session-1.17.1" = { + name = "express-session"; + packageName = "express-session"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.17.1.tgz"; + sha512 = "UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q=="; + }; + }; "express-urlrewrite-1.2.0" = { name = "express-urlrewrite"; packageName = "express-urlrewrite"; @@ -17331,13 +17268,13 @@ let sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; - "fast-text-encoding-1.0.1" = { + "fast-text-encoding-1.0.2" = { name = "fast-text-encoding"; packageName = "fast-text-encoding"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.1.tgz"; - sha512 = "x4FEgaz3zNRtJfLFqJmHWxkMDDvXVtaznj2V9jiP8ACUJrUgist4bP9FmDL2Vew2Y9mEQI/tG4GqabaitYp9CQ=="; + url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.2.tgz"; + sha512 = "5rQdinSsycpzvAoHga2EDn+LRX1d5xLFsuNG0Kg61JrAT/tASXcLL0nf/33v+sAxlQcfYmWbTURa1mmAf55jGw=="; }; }; "fast-url-parser-1.1.3" = { @@ -17907,13 +17844,13 @@ let sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng=="; }; }; - "firefox-profile-1.3.0" = { + "firefox-profile-1.3.1" = { name = "firefox-profile"; packageName = "firefox-profile"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.3.0.tgz"; - sha512 = "3d7JPnFC3GrwGW8wonAqy2E4YCI7A8MO7yVDkqS09uQ3tLvMLCY3Ytt4ntvVXvyzjVMRmrLW9W/CubnnzrdLCA=="; + url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.3.1.tgz"; + sha512 = "8q7DnwVIXvuJuBm1shr5ivRh0Ih2ytWwOIMwHInDSlVyrjQVXy7Ik0frItDdWb/P5CIpQFcMk9fPsUwNqi2lyQ=="; }; }; "first-chunk-stream-1.0.0" = { @@ -18780,6 +18717,15 @@ let sha512 = "R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA=="; }; }; + "fsevents-2.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + }; + }; "fstream-0.1.31" = { name = "fstream"; packageName = "fstream"; @@ -19275,13 +19221,13 @@ let sha1 = "c57d1145eec16465ab9bfbdf575262b1691624d6"; }; }; - "git-parse-1.0.3" = { + "git-parse-1.0.4" = { name = "git-parse"; packageName = "git-parse"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/git-parse/-/git-parse-1.0.3.tgz"; - sha512 = "LlGDePBQ9Lr/jsL3ULrnV8SQL8sk3cdScyc+vAk6jVLkHBOxdIj3JosNWemH2o9pNnGtcqukl+ym1Nl6k5jw0Q=="; + url = "https://registry.npmjs.org/git-parse/-/git-parse-1.0.4.tgz"; + sha512 = "NSC71SqG6jN0XYPbib8t/mgguVLddw+xvkkLv2EsCFvHfsZjO+ZqMcGoGHHMqfhZllCDDAkOwZESkZEmICj9ZA=="; }; }; "git-raw-commits-2.0.0" = { @@ -19632,7 +19578,7 @@ let version = "2.0.1"; src = fetchurl { name = "global-2.0.1.tar.gz"; - url = "https://codeload.github.com/component/global/tar.gz/v2.0.1"; + url = https://codeload.github.com/component/global/tar.gz/v2.0.1; sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; }; }; @@ -20374,13 +20320,13 @@ let sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; }; }; - "gulp-vinyl-zip-2.1.3" = { + "gulp-vinyl-zip-2.2.0" = { name = "gulp-vinyl-zip"; packageName = "gulp-vinyl-zip"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.3.tgz"; - sha512 = "wOHNPddyZ45il4wNz3Bk9ChpEq5FK/P76SSkqAMCLVZSOVtLBiDIVXDbYWDlfZpoYEjZQl+28I+Uzmmr6pSnBQ=="; + url = "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.2.0.tgz"; + sha512 = "7tKXptewHdKnOV0HGIyB/5+dvfmwmHq+hnolAQ64zz/pPomUXJcFPeYCkatRmOztkfZOn+14zoIFS2G39PkzIg=="; }; }; "gulplog-1.0.0" = { @@ -20392,13 +20338,13 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; - "gunzip-maybe-1.4.1" = { + "gunzip-maybe-1.4.2" = { name = "gunzip-maybe"; packageName = "gunzip-maybe"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz"; - sha512 = "qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g=="; + url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz"; + sha512 = "4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw=="; }; }; "handle-thing-2.0.1" = { @@ -20410,15 +20356,6 @@ let sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; }; }; - "handlebars-4.5.3" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz"; - sha512 = "3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA=="; - }; - }; "handlebars-4.7.6" = { name = "handlebars"; packageName = "handlebars"; @@ -23012,13 +22949,13 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; - "is-function-1.0.1" = { + "is-function-1.0.2" = { name = "is-function"; packageName = "is-function"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz"; - sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; + url = "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz"; + sha512 = "lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="; }; }; "is-glob-2.0.1" = { @@ -23939,13 +23876,13 @@ let sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; }; }; - "isomorphic-git-0.70.4" = { + "isomorphic-git-0.78.5" = { name = "isomorphic-git"; packageName = "isomorphic-git"; - version = "0.70.4"; + version = "0.78.5"; src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-0.70.4.tgz"; - sha512 = "Nk/iD4iEL35zY1B4l2PgPOJpVgTQzVH9W0oRkKc3vDbMjcfvs7nle4Y8NRghXIG27Z6KQVSTi/om6lTbzpfl+A=="; + url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-0.78.5.tgz"; + sha512 = "LrF5t9x7RdFeg84NsYpZo9qF1MZeb56LpBm6Jv47qMjnWMv0Il/3wPTA8I/lUYywgVbvF/e7xypHauj5auKW3w=="; }; }; "isomorphic-textencoder-1.0.1" = { @@ -24065,13 +24002,13 @@ let sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }; }; - "jaeger-client-3.17.2" = { + "jaeger-client-3.18.0" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.17.2"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.17.2.tgz"; - sha512 = "19YloSidmKbrXHgecLWod8eXo7rm2ieUnsfg0ripTFGRCW5v2OWE96Gte4/tOQG/8N+T39VoLU2nMBdjbdMUJg=="; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.18.0.tgz"; + sha512 = "xZ9WvZDWLkZFq7SObpLwu1asMCKCgBRNcDxxGSvK+ZQ7OZyJC5xPlU+rJa4+s/P6autPBVwHpqMGbOERFxWuuA=="; }; }; "java-properties-1.0.2" = { @@ -24110,13 +24047,13 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; - "jest-haste-map-25.3.0" = { + "jest-haste-map-25.4.0" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "25.3.0"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.3.0.tgz"; - sha512 = "LjXaRa+F8wwtSxo9G+hHD/Cp63PPQzvaBL9XCVoJD2rrcJO0Zr2+YYzAFWWYJ5GlPUkoaJFJtOuk0sL6MJY80A=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz"; + sha512 = "5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ=="; }; }; "jest-regex-util-25.2.6" = { @@ -24137,22 +24074,22 @@ let sha512 = "RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ=="; }; }; - "jest-util-25.3.0" = { + "jest-util-25.4.0" = { name = "jest-util"; packageName = "jest-util"; - version = "25.3.0"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-25.3.0.tgz"; - sha512 = "dc625P/KS/CpWTJJJxKc4bA3A6c+PJGBAqS8JTJqx4HqPoKNqXg/Ec8biL2Z1TabwK7E7Ilf0/ukSEXM1VwzNA=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz"; + sha512 = "WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA=="; }; }; - "jest-worker-25.2.6" = { + "jest-worker-25.4.0" = { name = "jest-worker"; packageName = "jest-worker"; - version = "25.2.6"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.2.6.tgz"; - sha512 = "FJn9XDUSxcOR4cwDzRfL1z56rUofNTFs539FGASpd50RHdb6EVkhxQqktodW2mI49l+W3H+tFJDotCHUQF6dmA=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz"; + sha512 = "ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw=="; }; }; "jetpack-id-1.0.0" = { @@ -24254,13 +24191,13 @@ let sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4"; }; }; - "jquery.terminal-2.15.2" = { + "jquery.terminal-2.15.4" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.15.2"; + version = "2.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.2.tgz"; - sha512 = "/G5L/laZLLO0tEQ+a94mLnvDXB5+PbC9IuZB+ikbw4E7W3GQkRpa0I15Z3xA+WbOaVZj+hEtPcKyyQLcKdjULQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.4.tgz"; + sha512 = "7XSLLjc2Il+1wtJQYQWkir8A5WnTMFEkwb1fGx3mASxQ+lp0Yu4Ua3iQTSKZGdYR3FINor9ToK107lJHEWOeYA=="; }; }; "js-base64-2.5.2" = { @@ -24731,6 +24668,15 @@ let sha512 = "ma5F/Bs47dZfJfDZ0Dt37eIbzVBVKZIDqsZSqdCCAPNHxKn+s3+CfMA6ahVVlf8Y1hyIjXkVLFU7yv4XxRfihA=="; }; }; + "jsonata-1.8.3" = { + name = "jsonata"; + packageName = "jsonata"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.3.tgz"; + sha512 = "r6ztI6ohbpRo77AxBm6vMs3aHZi2L2PaakW7TCPwSkeGcuAZ/SxXGLWH2Npwqq5+YBM/fg/g0EXg/pI9HvXQ8Q=="; + }; + }; "jsonc-parser-1.0.3" = { name = "jsonc-parser"; packageName = "jsonc-parser"; @@ -24929,13 +24875,13 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.3.0" = { + "jszip-3.4.0" = { name = "jszip"; packageName = "jszip"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.3.0.tgz"; - sha512 = "EJ9k766htB1ZWnsV5ZMDkKLgA+201r/ouFF8R2OigVjVdcm2rurcBrrdXaeqBJbqnUVMko512PYmlncBKE1Huw=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz"; + sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; }; }; "jszip-git://github.com/anmonteiro/jszip#patch-1" = { @@ -27703,13 +27649,13 @@ let sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; - "make-dir-3.0.2" = { + "make-dir-3.1.0" = { name = "make-dir"; packageName = "make-dir"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz"; - sha512 = "rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w=="; + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; "make-error-1.3.6" = { @@ -28144,15 +28090,6 @@ let sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"; }; }; - "matcher-2.0.0" = { - name = "matcher"; - packageName = "matcher"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/matcher/-/matcher-2.0.0.tgz"; - sha512 = "nlmfSlgHBFx36j/Pl/KQPbIaqE8Zf0TqmSMjsuddHDg6PMSVgmyW9HpkLs0o0M1n2GIZ/S2BZBLIww/xjhiGng=="; - }; - }; "matcher-2.1.0" = { name = "matcher"; packageName = "matcher"; @@ -28261,13 +28198,13 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.3" = { + "mdn-browser-compat-data-1.0.15" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "1.0.3"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.3.tgz"; - sha512 = "5n7c20IVrUiuOPSuhbkd5xoJPSzEEGsoMrmrdEtPHIw6gRPzonydcsguAmqGfSBd4d2DRoDQg533sijLUpeJLg=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.15.tgz"; + sha512 = "0jxT4ZqqCzJJfktX9d4NKgfRENy60kFzhVNV0mXNHvlnw8KrMe2cKOlEKs/Bz+odlgO0rRZAxU0OKiptqVhAXg=="; }; }; "mdn-data-2.0.4" = { @@ -28639,13 +28576,13 @@ let sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; - "metals-languageclient-0.1.23" = { + "metals-languageclient-0.2.1" = { name = "metals-languageclient"; packageName = "metals-languageclient"; - version = "0.1.23"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.1.23.tgz"; - sha512 = "Gi/qomdchfurnRIiEH8RjLbYZ926zJDE/acOx8xCtAx7Ai9vA49ZyJnh/BP0BNqe8VXVvPHmadmqdM+4lC7hLQ=="; + url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.2.1.tgz"; + sha512 = "8iVF+wKKZVN7r1/9JSv4QCJO2lRyqQvxs6+kmTviKVj/pYsH0qBR8vo7ne+7MkKrvyz8lnZCX29siv6sOWf3Qw=="; }; }; "metalsmith-2.3.0" = { @@ -28846,6 +28783,15 @@ let sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; }; }; + "mime-db-1.44.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.44.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; + }; + }; "mime-types-2.0.14" = { name = "mime-types"; packageName = "mime-types"; @@ -29179,13 +29125,13 @@ let sha1 = "f98ee7b5fffd3f4dadc5733827db0aa57f861880"; }; }; - "mirror-folder-3.0.0" = { + "mirror-folder-3.0.1" = { name = "mirror-folder"; packageName = "mirror-folder"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.0.tgz"; - sha512 = "fh6wDXcSpFoKY7ZPHnEv1+xjLOS7tlkEpTvl4Y6ZsT0HNjIaYg6ktq9ng8MPthFruunS8D/3GnPeaWhoQD3X9g=="; + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.1.tgz"; + sha512 = "AWYvbeZbHljMuu+49wgCdLGVOekNh/vpIsIMkFZYcRAJCY9vH7+vHM/aEIY3mrbbrBkHyBDnbmoOWUTbHN4A8g=="; }; }; "mississippi-3.0.0" = { @@ -29260,6 +29206,15 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; + "mkdirp-1.0.3" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz"; + sha512 = "6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g=="; + }; + }; "mkdirp-1.0.4" = { name = "mkdirp"; packageName = "mkdirp"; @@ -29935,13 +29890,13 @@ let sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="; }; }; - "nan-2.14.0" = { + "nan-2.14.1" = { name = "nan"; packageName = "nan"; - version = "2.14.0"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; - sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + url = "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz"; + sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="; }; }; "nan-2.3.5" = { @@ -30263,13 +30218,13 @@ let sha1 = "06f58360c4c3b955bd467ddc85ae4511a3907a4c"; }; }; - "neat-input-1.11.0" = { + "neat-input-1.11.1" = { name = "neat-input"; packageName = "neat-input"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/neat-input/-/neat-input-1.11.0.tgz"; - sha512 = "B7VCdE3tMC8RnKGGHatjwcR0TsHB7SiDHmYXyZ7m9YzQRdOAOF9oSwWO/WP4DLqdCma22EXWuxzEGFD80JjBeA=="; + url = "https://registry.npmjs.org/neat-input/-/neat-input-1.11.1.tgz"; + sha512 = "fWo4KrgeLB2TPQ4d8BF1DexvOJYvYuj0IGtSL4Ri3UuT59lJnYiu90xMCMfciySXLVHdWhXq/10A/I/pBynh0g=="; }; }; "neat-log-2.4.0" = { @@ -30561,13 +30516,13 @@ let sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg=="; }; }; - "node-abi-2.15.0" = { + "node-abi-2.16.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.15.0"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.15.0.tgz"; - sha512 = "FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.16.0.tgz"; + sha512 = "+sa0XNlWDA6T+bDLmkCUYn6W5k5W6BPRL6mqzSCs6H/xUgtl4D5x2fORKDzopKiU6wsyn/+wXlRXwXeSp+mtoA=="; }; }; "node-addon-api-1.7.1" = { @@ -31657,7 +31612,7 @@ let version = "0.9.15"; src = fetchurl { name = "oauth-0.9.15.tar.gz"; - url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"; + url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; @@ -32192,15 +32147,6 @@ let sha1 = "707375e59ab9f73025899727679b20328171c9aa"; }; }; - "opentracing-0.13.0" = { - name = "opentracing"; - packageName = "opentracing"; - version = "0.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/opentracing/-/opentracing-0.13.0.tgz"; - sha1 = "6a341442f09d7d866bc11ed03de1e3828e3d6aab"; - }; - }; "opentracing-0.14.4" = { name = "opentracing"; packageName = "opentracing"; @@ -32372,6 +32318,15 @@ let sha512 = "fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg=="; }; }; + "ora-4.0.4" = { + name = "ora"; + packageName = "ora"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz"; + sha512 = "77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww=="; + }; + }; "orchestrator-0.3.8" = { name = "orchestrator"; packageName = "orchestrator"; @@ -32462,13 +32417,13 @@ let sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; }; }; - "os-locale-4.0.0" = { + "os-locale-5.0.0" = { name = "os-locale"; packageName = "os-locale"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-4.0.0.tgz"; - sha512 = "HsSR1+2l6as4Wp2SGZxqLnuFHxVvh1Ir9pvZxyujsC13egZVe7P0YeBLN0ijQzM/twrO5To3ia3jzBXAvpMTEA=="; + url = "https://registry.npmjs.org/os-locale/-/os-locale-5.0.0.tgz"; + sha512 = "tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA=="; }; }; "os-name-3.1.0" = { @@ -34001,13 +33956,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-5.15.0" = { + "pino-6.0.0" = { name = "pino"; packageName = "pino"; - version = "5.15.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.15.0.tgz"; - sha512 = "7+FXMTA3H3sNP5+2miY2K9JKnAAW5GKuhHfNWsukFCsPprGQY3ctqpwbV74wAHW3Nl93cEEQ1G82MgOLM8P7TQ=="; + url = "https://registry.npmjs.org/pino/-/pino-6.0.0.tgz"; + sha512 = "3RfX2L76o7v230FP1fZ3Fo/WX7Su+P1Ld+pvBm2j+MyUjtA/KqDYxMkzBqzcX3R00zbC7Gf/HqIzyuu3tgvi9Q=="; }; }; "pino-std-serializers-2.4.2" = { @@ -34326,15 +34281,6 @@ let sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; }; - "postcss-7.0.26" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.26"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.26.tgz"; - sha512 = "IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA=="; - }; - }; "postcss-7.0.27" = { name = "postcss"; packageName = "postcss"; @@ -34839,13 +34785,13 @@ let sha512 = "C2hrAPzmRdpuL3iH0TDdQ6XCc9M7Dcc3zEW5BLerY65G4tWWszwv6nG/ksi6ul5i2mx22ubdljgktXCtNkydkw=="; }; }; - "posthtml-0.12.2" = { + "posthtml-0.12.3" = { name = "posthtml"; packageName = "posthtml"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml/-/posthtml-0.12.2.tgz"; - sha512 = "vDMikGrmr2Ce4ralyBwfoTymA9Ycv2QSeaV+U9CdF/kHstsGSBVsTZ3Jt/BdACFuqCNyaICMdJI/rvGEreL7pA=="; + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.12.3.tgz"; + sha512 = "Fbpi95+JJyR0tqU7pUy1zTSQFjAsluuwB9pJ1h0jtnGk7n/O2TBtP5nDl9rV0JVACjQ1Lm5wSp4ppChr8u3MhA=="; }; }; "posthtml-parser-0.4.2" = { @@ -34938,13 +34884,13 @@ let sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; }; }; - "prettier-2.0.4" = { + "prettier-2.0.5" = { name = "prettier"; packageName = "prettier"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.0.4.tgz"; - sha512 = "SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz"; + sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; "prettier-bytes-1.0.4" = { @@ -35424,13 +35370,13 @@ let sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; }; }; - "protobufjs-6.8.9" = { + "protobufjs-6.9.0" = { name = "protobufjs"; packageName = "protobufjs"; - version = "6.8.9"; + version = "6.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.9.tgz"; - sha512 = "j2JlRdUeL/f4Z6x4aU4gj9I2LECglC+5qR2TrWb193Tla1qfdaNQTZ8I27Pt7K0Ajmvjjpft7O3KWTGciz4gpw=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.9.0.tgz"; + sha512 = "LlGVfEWDXoI/STstRDdZZKb/qusoAWUnmLg9R8OLSO473mBLWHowx8clbX5/+mKDEI+v7GzjoK9tRPZMMcoTrg=="; }; }; "protochain-1.0.5" = { @@ -36567,13 +36513,13 @@ let sha512 = "F9wwNePtXrzZenAB3ax0Y8TSKGvuB7Qw16J30hspEUTbfUM+H827XyN3rlpwhVmtm5wuZtbKIHjOnwDn7MUxWQ=="; }; }; - "quick-format-unescaped-3.0.3" = { + "quick-format-unescaped-4.0.1" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; - version = "3.0.3"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-3.0.3.tgz"; - sha512 = "dy1yjycmn9blucmJLXOfZDx1ikZJUi6E8bBZLnhPG5gBrVhHXx2xVyqqgKBubVNEXmx51dBACMHpoMQK/N/AXQ=="; + url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.1.tgz"; + sha512 = "RyYpQ6Q5/drsJyOhrWHYMWTedvjTIat+FTwv0K4yoUxzvekw2aRHMQJLlnvt8UantkZg2++bEzD9EdxXqkWf4A=="; }; }; "quick-lru-1.1.0" = { @@ -37260,6 +37206,15 @@ let sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ=="; }; }; + "recast-0.19.0" = { + name = "recast"; + packageName = "recast"; + version = "0.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/recast/-/recast-0.19.0.tgz"; + sha512 = "HymYANYaUFpKoAkOZ2od16SB7A/BwCZbvYIs9Rc8K+wNThQctiCJ0AjLkPbo9eWdy3w5Eemk6I4MeEYbH12PBg=="; + }; + }; "rechoir-0.6.2" = { name = "rechoir"; packageName = "rechoir"; @@ -37386,15 +37341,6 @@ let sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; }; }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; - }; - }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -37404,15 +37350,6 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.3" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; - sha512 = "naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="; - }; - }; "regenerator-runtime-0.13.5" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -38088,13 +38025,13 @@ let sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; }; }; - "resolve-1.16.0" = { + "resolve-1.17.0" = { name = "resolve"; packageName = "resolve"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.16.0.tgz"; - sha512 = "LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; "resolve-1.7.1" = { @@ -38583,13 +38520,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.6.1" = { + "rollup-2.7.2" = { name = "rollup"; packageName = "rollup"; - version = "2.6.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.6.1.tgz"; - sha512 = "1RhFDRJeg027YjBO6+JxmVWkEZY0ASztHhoEUEWxOwkh4mjO58TFD6Uo7T7Y3FbmDpRTfKhM5NVxJyimCn0Elg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.7.2.tgz"; + sha512 = "SdtTZVMMVSPe7SNv4exUyPXARe5v/p3TeeG3LRA5WabLPJt4Usi3wVrvVlyAUTG40JJmqS6zbIHt2vWTss2prw=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -39006,13 +38943,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-formatter-0.4.4" = { + "sass-formatter-0.4.5" = { name = "sass-formatter"; packageName = "sass-formatter"; - version = "0.4.4"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.4.tgz"; - sha512 = "pI/2olF5F3AMkAXbn71nJK7yAsWfRYLlyp7Suhiy4hzuNga05XaUzLO74lplCpvS8GVeUdFgef+8lU5+cHr60g=="; + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.5.tgz"; + sha512 = "hBDkbtTE020JwUaGKo5q+ELNXXji1kyajVMt3YLRYD1PAwUQYR5aAdfAUAcb88AmYgJpQRQrsqZj+YGmUCdgCw=="; }; }; "sass-lookup-3.0.0" = { @@ -39087,13 +39024,13 @@ let sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; }; }; - "schema-utils-2.6.5" = { + "schema-utils-2.6.6" = { name = "schema-utils"; packageName = "schema-utils"; - version = "2.6.5"; + version = "2.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz"; - sha512 = "5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ=="; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz"; + sha512 = "wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA=="; }; }; "scoped-regex-1.0.0" = { @@ -39330,15 +39267,6 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.1.1" = { - name = "semver"; - packageName = "semver"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.1.tgz"; - sha512 = "WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A=="; - }; - }; "semver-7.1.3" = { name = "semver"; packageName = "semver"; @@ -39987,13 +39915,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.6.2" = { + "simple-peer-9.7.0" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.6.2"; + version = "9.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.2.tgz"; - sha512 = "EOKoImCaqtNvXIntxT1CBBK/3pVi7tMAoJ3shdyd9qk3zLm3QPiRLb/sPC1G2xvKJkJc5fkQjCXqRZ0AknwTig=="; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.7.0.tgz"; + sha512 = "lZL/H/Znx7kai1kTrbxntVfbstGTnPF+w+hvnq2euBXoBg8m32mgEOpPmH9hS7ZOx0CMXcpgth/nNjZKp7aeow=="; }; }; "simple-sha1-2.1.2" = { @@ -40329,6 +40257,15 @@ let sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw=="; }; }; + "snyk-config-3.0.0" = { + name = "snyk-config"; + packageName = "snyk-config"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.0.0.tgz"; + sha512 = "sXjd7gUqPTmgkhtLowFkFU5J4xyS7tDIRUbHmpW/dvTjgmiH0ujobJzSdaim4W6pbiIf4snkGJsvHM3/wmdR5w=="; + }; + }; "snyk-docker-plugin-2.6.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; @@ -40374,22 +40311,22 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.9.0" = { + "snyk-mvn-plugin-2.10.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.9.0.tgz"; - sha512 = "FBl78wCHNm0P/QOlipvOxzN2LrXlS6NBN0zXWYZ09P0hG65rmA3gKTg0QsHUjIBh1Pg9bw5aG4r/AHle6a6g6w=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.10.0.tgz"; + sha512 = "npslocHJXUbdFxehMPQ8w4oX6bB6J6vHTWNRDF7u2+pIhVumQe1QOvZGjwh3up+vOCoKiEprO7gdt7vC8im1Vg=="; }; }; - "snyk-nodejs-lockfile-parser-1.17.0" = { + "snyk-nodejs-lockfile-parser-1.18.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.17.0.tgz"; - sha512 = "i4GAYFj9TJLOQ8F+FbIJuJWdGymi8w/XcrEX0FzXk7DpYUCY3mWibyKhw8RasfYBx5vLwUzEvRMaQuc2EwlyfA=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.18.0.tgz"; + sha512 = "QGb6HBtnqefbVtrDyUqA3vXGo2DZJAlDxrsgIpKxFalhxmxmWQE3Fxx44V3aRq9H8iZ1eXb7s/drTsa/s9qGJQ=="; }; }; "snyk-nuget-plugin-1.16.0" = { @@ -40743,13 +40680,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.7.7" = { + "sonic-boom-1.0.1" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.7.7"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.7.tgz"; - sha512 = "Ei5YOo5J64GKClHIL/5evJPgASXFVpfVYbJV9PILZQytTK6/LCwHvsZJW2Ig4p9FMC2OrBrMnXKgRN/OEoAWfg=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.0.1.tgz"; + sha512 = "o9tx+bonVEXSaPtptyXQXpP8l6UV9Bi3im2geZskvWw2a/o/hrbWI7EBbbv+rOx6Hubnzun9GgH4WfbgEA3MFQ=="; }; }; "sorcery-0.10.0" = { @@ -40914,6 +40851,15 @@ let sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; }; }; + "source-map-support-0.5.18" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.18"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz"; + sha512 = "9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ=="; + }; + }; "source-map-url-0.4.0" = { name = "source-map-url"; packageName = "source-map-url"; @@ -41022,13 +40968,13 @@ let sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; }; }; - "spdx-exceptions-2.2.0" = { + "spdx-exceptions-2.3.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; }; }; "spdx-expression-parse-3.0.0" = { @@ -42075,13 +42021,13 @@ let sha512 = "3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg=="; }; }; - "streamroller-2.2.3" = { + "streamroller-2.2.4" = { name = "streamroller"; packageName = "streamroller"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-2.2.3.tgz"; - sha512 = "AegmvQsscTRhHVO46PhCDerjIpxi7E+d2GxgUDu+nzw/HuLnUdxHWr6WQ+mVn/4iJgMKKFFdiUwFcFRDvcjCtw=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-2.2.4.tgz"; + sha512 = "OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ=="; }; }; "streamsearch-0.1.2" = { @@ -42822,13 +42768,13 @@ let sha512 = "XiyPqLdiHJ3CMphADCJg/JVQYcj3JfO8NomlLubSdGYgppfzE+g/7Fyusza/Kr7lC919BdwbfIqFxK8VO7+l4w=="; }; }; - "suf-regex-0.0.14" = { + "suf-regex-0.0.17" = { name = "suf-regex"; packageName = "suf-regex"; - version = "0.0.14"; + version = "0.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.14.tgz"; - sha512 = "+WE5PZTfD6lVNCNsyBInJIAbok8LpqgOhvCbSViZeQ/JTxdxq7Lw+tSJXGM+jrIp81jj9GCMYvkl00JAkn2CtA=="; + url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.17.tgz"; + sha512 = "/TIMx0G1iXCGHm5XbqHTV86tkdETO7OUOB8UAWHc04M2mMQnWAIZeO6M9GuSibRVM8ewRcHAV3fOFY2z1XtWaQ=="; }; }; "sugarss-1.0.1" = { @@ -43209,13 +43155,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.23.3" = { + "systeminformation-4.23.5" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.23.3"; + version = "4.23.5"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.23.3.tgz"; - sha512 = "TIGmv7O1vVw00ldkj8ckHJr667l/lbLxvYB5IrJZ7pxzKXt7RmCduvzHbFM6k2Owif/dGd7oEmRkaQJEH9ewng=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.23.5.tgz"; + sha512 = "Zxd1wxN8KigQsDhZupVNAyHnkl+ombejuLpNhJ+LNezMxTLn7nBx9HNAIWUJnhAnSS0ZElQLQ1muqgnwbhgOHg=="; }; }; "syswide-cas-5.3.0" = { @@ -43552,6 +43498,15 @@ let sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"; }; }; + "temp-dir-2.0.0" = { + name = "temp-dir"; + packageName = "temp-dir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz"; + sha512 = "aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="; + }; + }; "temp-write-3.4.0" = { name = "temp-write"; packageName = "temp-write"; @@ -44749,13 +44704,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-node-8.8.2" = { + "ts-node-8.9.0" = { name = "ts-node"; packageName = "ts-node"; - version = "8.8.2"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.8.2.tgz"; - sha512 = "duVj6BpSpUpD/oM4MfhO98ozgkp3Gt9qIp3jGxwU2DFvl/3IRaEAvbLa8G60uS7C77457e/m5TMowjedeRxI1Q=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.9.0.tgz"; + sha512 = "rwkXfOs9zmoHrV8xE++dmNd6ZIS+nmHHCxcV53ekGJrxFLMbp+pizpPS07ARvhwneCIECPppOwbZHvw9sQtU4w=="; }; }; "ts-process-promises-1.0.2" = { @@ -44767,6 +44722,15 @@ let sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg=="; }; }; + "tslib-1.11.0" = { + name = "tslib"; + packageName = "tslib"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz"; + sha512 = "BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg=="; + }; + }; "tslib-1.11.1" = { name = "tslib"; packageName = "tslib"; @@ -45379,13 +45343,13 @@ let sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; }; }; - "unbzip2-stream-1.4.1" = { + "unbzip2-stream-1.4.2" = { name = "unbzip2-stream"; packageName = "unbzip2-stream"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.1.tgz"; - sha512 = "sgDYfSDPMsA4Hr2/w7vOlrJBlwzmyakk1+hW8ObLvxSp0LA36LcL2XItGvOT3OSblohSdevMuT8FQjLsqyy4sA=="; + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz"; + sha512 = "pZMVAofMrrHX6Ik39hCk470kulCbmZ2SWfQLPmTWqfJV/oUm0gn1CblvHdUu4+54Je6Jq34x8kY6XjTy6dMkOg=="; }; }; "unc-path-regex-0.1.2" = { @@ -46486,15 +46450,6 @@ let sha1 = "3c2236476c4d32c5ff3c47002add7c13b9a82a53"; }; }; - "util.promisify-1.0.0" = { - name = "util.promisify"; - packageName = "util.promisify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; - sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; - }; - }; "util.promisify-1.0.1" = { name = "util.promisify"; packageName = "util.promisify"; @@ -47332,6 +47287,15 @@ let sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="; }; }; + "vscode-jsonrpc-5.1.0-next.1" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "5.1.0-next.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.1.0-next.1.tgz"; + sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA=="; + }; + }; "vscode-languageclient-4.0.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; @@ -47341,13 +47305,13 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-6.1.3" = { + "vscode-languageclient-7.0.0-next.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "6.1.3"; + version = "7.0.0-next.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.3.tgz"; - sha512 = "YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.1.tgz"; + sha512 = "JrjCUhLpQZxQ5VpWpilOHDMhVsn0fdN5jBh1uFNhSr5c2loJvRdr9Km2EuSQOFfOQsBKx0+xvY8PbsypNEcJ6w=="; }; }; "vscode-languageserver-4.0.0" = { @@ -47413,6 +47377,15 @@ let sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; + "vscode-languageserver-protocol-3.16.0-next.2" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.16.0-next.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.2.tgz"; + sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; + }; + }; "vscode-languageserver-protocol-3.6.0" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -47458,6 +47431,15 @@ let sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="; }; }; + "vscode-languageserver-types-3.16.0-next.1" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.16.0-next.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.1.tgz"; + sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="; + }; + }; "vscode-languageserver-types-3.6.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -47701,15 +47683,6 @@ let sha1 = "340a717bde765726fa0aa07d721e0147a551df0c"; }; }; - "watchpack-1.6.0" = { - name = "watchpack"; - packageName = "watchpack"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz"; - sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA=="; - }; - }; "watchpack-1.6.1" = { name = "watchpack"; packageName = "watchpack"; @@ -47809,13 +47782,13 @@ let sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; }; }; - "webpack-4.42.1" = { + "webpack-4.43.0" = { name = "webpack"; packageName = "webpack"; - version = "4.42.1"; + version = "4.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; - sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; + sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; "webpack-cli-3.3.11" = { @@ -48556,15 +48529,6 @@ let sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; - "ws-7.2.1" = { - name = "ws"; - packageName = "ws"; - version = "7.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz"; - sha512 = "sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A=="; - }; - }; "ws-7.2.3" = { name = "ws"; packageName = "ws"; @@ -48868,7 +48832,7 @@ let version = "1.5.0"; src = fetchurl { name = "xmlhttprequest-1.5.0.tar.gz"; - url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433"; + url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433; sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; }; }; @@ -49421,22 +49385,22 @@ let sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; }; }; - "yeoman-environment-2.9.1" = { + "yeoman-environment-2.9.5" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.9.1"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.9.1.tgz"; - sha512 = "m9sotsBPqOrV2aqaCM68pbY0HfLzeYuWnEAsJblfGSuMiIy+xie1S1j9qboOlHyGe9Wyvg8AQx3xSwrQvIvb0A=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.9.5.tgz"; + sha512 = "ntxV8VTZbP8QFuJZGT7vG8AsKeyGz8lXlfq2V2T5sl6SrU6UAEVgRreEGz9t+JbFGx1CSM/Ly2atG/avGuheyQ=="; }; }; - "yeoman-generator-4.8.2" = { + "yeoman-generator-4.8.3" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "4.8.2"; + version = "4.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.8.2.tgz"; - sha512 = "4kJAf2u5mee8yO7Ph6e64KLHeC7sCSYPCP7YcCUjussBFzoMEqJ2+Dn2Yj41rBLArSBBmZOQ/e2bMYlh6qQ9ag=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.8.3.tgz"; + sha512 = "yDPHBhfglqiyYlqBnaAmcE/wPznwSx11HCGVCpnnsqpnp45HmdsuBtiFSNDcygiFmz1HmkFWRLWHTai/b+9eiQ=="; }; }; "yn-3.1.1" = { @@ -49562,17 +49526,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.1.1"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.1.tgz"; - sha512 = "sjRAV4UF8M5v+2gw+EwCYSgciBZDc05AbNxQt+uUdxdfR1QU9hifWq8WDxfOR6jdDP5YqMtQsNaFNwrUyjJJoQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.3.tgz"; + sha512 = "/7yHOuiyMgpcoBuADPrF4Eo9VDysA57fsyrMlOH2WZmKdsjW032StS9EIOue5RNQ7y0DwrtgtnkjbpZ6nYo3Pw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.901.1" - sources."@angular-devkit/core-9.1.1" - sources."@angular-devkit/schematics-9.1.1" - sources."@schematics/angular-9.1.1" - sources."@schematics/update-0.901.1" + sources."@angular-devkit/architect-0.901.3" + sources."@angular-devkit/core-9.1.3" + sources."@angular-devkit/schematics-9.1.3" + sources."@schematics/angular-9.1.3" + sources."@schematics/update-0.901.3" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -49810,7 +49774,7 @@ in sources."uuid-3.4.0" ]; }) - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."restore-cursor-3.1.0" sources."retry-0.10.1" sources."rimraf-3.0.2" @@ -49836,7 +49800,7 @@ in sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" @@ -49891,7 +49855,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for Angular"; - homepage = "https://github.com/angular/angular-cli"; + homepage = https://github.com/angular/angular-cli; license = "MIT"; }; production = true; @@ -49901,18 +49865,18 @@ in "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/cli/-/cli-2.2.0.tgz"; - sha512 = "/fQDYEMypZbC8LxpZak/3nsP8Rr3voXXvxSan/718uDJUHFwq1rHl9Y/pOoE/tRs0Qv1jtDvk2eZgFDlsMMmlQ=="; + url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.0.tgz"; + sha512 = "YiAP7Ib4zhAE+owOKg1/cJ+1AQX4BGfvaMnGkHaSf6srutoLLCRIbD0InpSNobf+ouSMqqk6fiLmBVt/cu03og=="; }; dependencies = [ - sources."@antora/playbook-builder-2.2.0" - sources."@iarna/toml-2.2.3" + sources."@antora/playbook-builder-2.3.0" + sources."@iarna/toml-2.2.5" sources."argparse-1.0.10" sources."camelcase-5.3.1" - sources."camelcase-keys-6.1.2" - sources."commander-3.0.2" + sources."camelcase-keys-6.2.2" + sources."commander-5.0.0" (sources."convict-5.2.0" // { dependencies = [ sources."json5-2.1.0" @@ -49935,7 +49899,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The command line interface for Antora."; - homepage = "https://antora.org/"; + homepage = https://antora.org/; license = "MPL-2.0"; }; production = true; @@ -49945,25 +49909,25 @@ in "@antora/site-generator-default" = nodeEnv.buildNodePackage { name = "_at_antora_slash_site-generator-default"; packageName = "@antora/site-generator-default"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.2.0.tgz"; - sha512 = "fy2tG1I3/FK1s/y/GhGMkFICtXkkSOpxVy5OjBXXfkBNHQIHYSLDv460Gz8NvSiVe99LWWa+FOpr5G13Bb0bvw=="; + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.0.tgz"; + sha512 = "swDQeAEnC/ClmhHJ50UNJppUSAneOp2cHwZiRr3zUQ9+5+mvOrDEdHbyxH7mIwkoeiIcQ/UVw00bg4MwmQ0M0g=="; }; dependencies = [ - sources."@antora/asciidoc-loader-2.2.0" - sources."@antora/content-aggregator-2.2.0" - sources."@antora/content-classifier-2.2.0" - sources."@antora/document-converter-2.2.0" + sources."@antora/asciidoc-loader-2.3.0" + sources."@antora/content-aggregator-2.3.0" + sources."@antora/content-classifier-2.3.0" + sources."@antora/document-converter-2.3.0" sources."@antora/expand-path-helper-1.0.0" - sources."@antora/navigation-builder-2.2.0" - sources."@antora/page-composer-2.2.0" - sources."@antora/playbook-builder-2.2.0" - sources."@antora/redirect-producer-2.2.0" - sources."@antora/site-mapper-2.2.0" - sources."@antora/site-publisher-2.2.0" - sources."@antora/ui-loader-2.2.0" - sources."@iarna/toml-2.2.3" + sources."@antora/navigation-builder-2.3.0" + sources."@antora/page-composer-2.3.0" + sources."@antora/playbook-builder-2.3.0" + sources."@antora/redirect-producer-2.3.0" + sources."@antora/site-mapper-2.3.0" + sources."@antora/site-publisher-2.3.0" + sources."@antora/ui-loader-2.3.0" + sources."@iarna/toml-2.2.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."append-buffer-1.0.2" @@ -49975,6 +49939,7 @@ in sources."bl-4.0.2" sources."bops-0.0.7" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" (sources."buffer-5.6.0" // { dependencies = [ sources."base64-js-1.3.1" @@ -49991,7 +49956,7 @@ in ]; }) sources."camelcase-5.3.1" - sources."camelcase-keys-6.1.2" + sources."camelcase-keys-6.2.2" sources."clean-git-ref-2.0.1" sources."clone-2.1.2" sources."clone-buffer-1.0.0" @@ -50028,7 +49993,6 @@ in sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."diff3-0.0.3" - sources."duplexer-0.1.1" sources."duplexer3-0.1.4" (sources."duplexify-3.7.1" // { dependencies = [ @@ -50040,10 +50004,10 @@ in sources."end-of-stream-1.4.4" sources."escape-string-regexp-2.0.0" sources."esprima-4.0.1" - sources."event-stream-3.3.4" sources."exit-on-epipe-1.0.1" sources."extend-3.0.2" sources."fd-slicer-1.1.0" + sources."fill-range-7.0.1" (sources."flush-write-stream-1.1.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -50051,7 +50015,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."from-0.1.7" sources."fs-extra-8.1.0" (sources."fs-mkdirp-stream-1.0.0" // { dependencies = [ @@ -50088,7 +50051,7 @@ in ]; }) sources."graceful-fs-4.2.3" - (sources."gulp-vinyl-zip-2.1.3" // { + (sources."gulp-vinyl-zip-2.2.0" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -50096,7 +50059,7 @@ in sources."through2-2.0.5" ]; }) - sources."handlebars-4.5.3" + sources."handlebars-4.7.6" sources."has-symbols-1.0.1" sources."http-cache-semantics-4.1.0" sources."ieee754-1.1.13" @@ -50108,13 +50071,14 @@ in sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" + sources."is-number-7.0.0" sources."is-relative-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" - sources."isomorphic-git-0.70.4" + sources."isomorphic-git-0.78.5" sources."js-yaml-3.13.1" sources."json-buffer-3.0.0" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -50129,13 +50093,11 @@ in ]; }) sources."lead-1.0.0" - sources."lodash-4.17.15" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-1.0.1" sources."map-obj-4.1.0" - sources."map-stream-0.1.0" sources."marky-1.2.1" - sources."matcher-2.0.0" + sources."matcher-2.1.0" sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."mimic-response-2.1.0" @@ -50153,11 +50115,6 @@ in sources."object.assign-4.1.0" sources."once-1.4.0" sources."opal-runtime-1.0.11" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) (sources."ordered-read-streams-1.0.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -50169,8 +50126,8 @@ in sources."pako-1.0.11" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" - sources."pause-stream-0.0.11" sources."pend-1.2.0" + sources."picomatch-2.2.2" sources."pify-4.0.1" sources."prepend-http-2.0.0" sources."printj-1.1.2" @@ -50207,9 +50164,7 @@ in sources."simple-concat-1.0.0" sources."simple-get-3.1.0" sources."source-map-0.6.1" - sources."split-0.3.3" sources."sprintf-js-1.0.3" - sources."stream-combiner-0.0.4" sources."stream-shift-1.0.1" sources."string_decoder-1.3.0" sources."through-2.3.8" @@ -50224,6 +50179,7 @@ in }) sources."to-absolute-glob-2.0.2" sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" (sources."to-through-2.0.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -50252,7 +50208,7 @@ in ]; }) sources."vinyl-sourcemap-1.1.0" - sources."wordwrap-0.0.3" + sources."wordwrap-1.0.0" sources."wrappy-1.0.2" sources."xdg-basedir-3.0.0" sources."xmlhttprequest-1.8.0" @@ -50264,7 +50220,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The default site generator pipeline for producing and publishing static documentation sites with Antora."; - homepage = "https://antora.org/"; + homepage = https://antora.org/; license = "MPL-2.0"; }; production = true; @@ -50285,7 +50241,7 @@ in sources."acorn-globals-4.3.4" sources."acorn-walk-6.2.0" sources."agent-base-5.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -50427,7 +50383,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A secure and free password manager for all of your devices."; - homepage = "https://bitwarden.com/"; + homepage = https://bitwarden.com/; license = "GPL-3.0"; }; production = true; @@ -50444,13 +50400,13 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.14.0" + sources."@apollo/federation-0.14.1" (sources."@apollo/protobufjs-1.0.3" // { dependencies = [ - sources."@types/node-10.17.19" + sources."@types/node-10.17.21" ]; }) - sources."@apollographql/apollo-tools-0.4.5" + sources."@apollographql/apollo-tools-0.4.7" sources."@apollographql/graphql-language-service-interface-2.0.2" sources."@apollographql/graphql-language-service-parser-2.0.2" sources."@apollographql/graphql-language-service-types-2.0.2" @@ -50467,7 +50423,7 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.9.4" + sources."@babel/generator-7.9.5" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" (sources."@babel/helper-compilation-targets-7.8.7" // { @@ -50479,11 +50435,7 @@ in sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" sources."@babel/helper-explode-assignable-expression-7.8.3" - (sources."@babel/helper-function-name-7.9.5" // { - dependencies = [ - sources."@babel/types-7.9.5" - ]; - }) + sources."@babel/helper-function-name-7.9.5" sources."@babel/helper-get-function-arity-7.8.3" sources."@babel/helper-hoist-variables-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" @@ -50557,7 +50509,6 @@ in sources."@babel/plugin-transform-unicode-regex-7.8.3" (sources."@babel/preset-env-7.9.5" // { dependencies = [ - sources."@babel/types-7.9.5" sources."semver-5.7.1" ]; }) @@ -50571,19 +50522,10 @@ in sources."semver-5.7.1" ]; }) - (sources."@babel/runtime-7.9.2" // { - dependencies = [ - sources."regenerator-runtime-0.13.5" - ]; - }) + sources."@babel/runtime-7.9.2" sources."@babel/template-7.8.6" - (sources."@babel/traverse-7.9.5" // { - dependencies = [ - sources."@babel/generator-7.9.5" - sources."@babel/types-7.9.5" - ]; - }) - sources."@babel/types-7.9.0" + sources."@babel/traverse-7.9.5" + sources."@babel/types-7.9.5" sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" @@ -50598,7 +50540,7 @@ in sources."semver-5.7.1" ]; }) - sources."@oclif/config-1.14.0" + sources."@oclif/config-1.15.1" (sources."@oclif/errors-1.2.2" // { dependencies = [ sources."clean-stack-1.3.0" @@ -50682,8 +50624,8 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" - (sources."@types/node-fetch-2.5.5" // { + sources."@types/node-13.13.2" + (sources."@types/node-fetch-2.5.6" // { dependencies = [ sources."form-data-3.0.0" ]; @@ -50706,7 +50648,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."aggregate-error-3.0.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" @@ -50718,10 +50660,8 @@ in sources."normalize-path-2.1.1" ]; }) - (sources."apollo-2.27.0" // { + (sources."apollo-2.27.3" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" sources."strip-ansi-5.2.0" ]; }) @@ -50729,17 +50669,22 @@ in sources."apollo-cache-control-0.9.1" sources."apollo-cache-inmemory-1.6.5" sources."apollo-client-2.6.8" - sources."apollo-codegen-core-0.36.6" - sources."apollo-codegen-flow-0.34.6" - sources."apollo-codegen-scala-0.35.6" - sources."apollo-codegen-swift-0.36.6" - sources."apollo-codegen-typescript-0.36.6" + (sources."apollo-codegen-core-0.36.8" // { + dependencies = [ + sources."recast-0.19.0" + sources."source-map-0.6.1" + ]; + }) + sources."apollo-codegen-flow-0.34.8" + sources."apollo-codegen-scala-0.35.8" + sources."apollo-codegen-swift-0.36.8" + sources."apollo-codegen-typescript-0.36.8" sources."apollo-datasource-0.7.0" sources."apollo-engine-reporting-1.7.1" sources."apollo-engine-reporting-protobuf-0.4.4" - sources."apollo-env-0.6.2" - sources."apollo-graphql-0.4.1" - sources."apollo-language-server-1.21.1" + sources."apollo-env-0.6.4" + sources."apollo-graphql-0.4.3" + sources."apollo-language-server-1.21.3" sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -50788,18 +50733,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."babel-core-7.0.0-bridge.0" - sources."babel-plugin-dynamic-import-node-2.3.0" - (sources."babel-polyfill-6.26.0" // { - dependencies = [ - sources."core-js-2.6.11" - ]; - }) - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."core-js-2.6.11" - sources."regenerator-runtime-0.11.1" - ]; - }) + sources."babel-plugin-dynamic-import-node-2.3.3" sources."backo2-1.0.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -50852,7 +50786,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.11.1" + sources."browserslist-4.12.0" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -50876,7 +50810,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001042" + sources."caniuse-lite-1.0.30001046" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -50907,7 +50841,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - (sources."cli-progress-3.7.0" // { + (sources."cli-progress-3.8.0" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -51059,7 +50993,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.411" + sources."electron-to-chromium-1.3.415" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -51171,11 +51105,7 @@ in sources."getpass-0.1.7" sources."git-clone-0.1.0" sources."git-config-path-1.0.1" - (sources."git-parse-1.0.3" // { - dependencies = [ - sources."util.promisify-1.0.0" - ]; - }) + sources."git-parse-1.0.4" (sources."git-rev-sync-2.0.0" // { dependencies = [ sources."graceful-fs-4.1.15" @@ -51456,7 +51386,7 @@ in sources."moment-2.24.0" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanoid-2.1.11" (sources."nanomatch-1.2.13" // { dependencies = [ @@ -51644,7 +51574,7 @@ in sources."redeyed-2.1.1" sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.10.5" + sources."regenerator-runtime-0.13.5" sources."regenerator-transform-0.14.4" (sources."regex-not-1.0.2" // { dependencies = [ @@ -51667,7 +51597,7 @@ in sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -51752,14 +51682,14 @@ in sources."sort-keys-length-1.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.18" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" (sources."split-string-3.1.0" // { @@ -51900,7 +51830,7 @@ in sources."treeify-1.1.0" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" - sources."ts-node-8.8.2" + sources."ts-node-8.9.0" sources."tslib-1.11.1" sources."tty-1.0.1" sources."tunnel-agent-0.6.0" @@ -51908,7 +51838,7 @@ in sources."type-fest-0.6.0" sources."type-is-1.6.18" sources."typescript-3.8.3" - sources."unbzip2-stream-1.4.1" + sources."unbzip2-stream-1.4.2" (sources."undefsafe-2.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -52016,7 +51946,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for rapid Vue.js development"; - homepage = "https://cli.vuejs.org/"; + homepage = https://cli.vuejs.org/; license = "MIT"; }; production = true; @@ -52322,7 +52252,7 @@ in sources."parse-passwd-1.0.0" sources."path-parse-1.0.6" sources."pkginfo-0.4.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."semver-5.7.1" @@ -52360,7 +52290,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -52378,7 +52308,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Creating Electron app packages"; - homepage = "https://github.com/electron/asar"; + homepage = https://github.com/electron/asar; license = "MIT"; }; production = true; @@ -52388,10 +52318,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.13.0.tgz"; - sha512 = "A9+8217g+/5lNYm/ajk8klm8FkT3iJYNBooifk0V9ieLZ/dItt29xP/iQWIDAwQxqFzZpsTc+5Py3RcjFzSH6A=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.13.1.tgz"; + sha512 = "9JbJ5i+wD6stYi2U2QF9xPrd1c+g5V2puLRet1y5UXOsqYhvYQt4E/JohRCYuHltbMX48dz8lx5RUcurkffZ7g=="; }; dependencies = [ sources."abab-2.0.3" @@ -52402,7 +52332,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."array-equal-1.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -52536,7 +52466,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; - homepage = "http://bower.io/"; + homepage = http://bower.io/; license = "MIT"; }; production = true; @@ -52609,7 +52539,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.43.0" + sources."mime-db-1.44.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -52637,7 +52567,7 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.1.6" @@ -52648,7 +52578,7 @@ in sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" @@ -52666,7 +52596,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; - homepage = "https://github.com/rvl/bower2nix"; + homepage = https://github.com/rvl/bower2nix; license = "GPL-3.0"; }; production = true; @@ -52795,7 +52725,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.0" sources."sha.js-2.4.11" @@ -52867,10 +52797,10 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.19" + sources."@types/node-13.13.2" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -53108,7 +53038,7 @@ in sources."plist-3.0.1" sources."process-nextick-args-2.0.1" sources."promiscuous-0.6.0" - sources."protobufjs-6.8.9" + sources."protobufjs-6.9.0" sources."psl-1.8.0" (sources."pump-0.3.5" // { dependencies = [ @@ -53148,7 +53078,7 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.2" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."rimraf-2.7.1" sources."router-0.6.2" sources."run-parallel-1.1.9" @@ -53186,7 +53116,7 @@ in }) sources."single-line-log-0.4.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."speedometer-0.1.4" @@ -53275,7 +53205,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A well-tested CSS minifier"; - homepage = "https://github.com/jakubpawlowicz/clean-css"; + homepage = https://github.com/jakubpawlowicz/clean-css; license = "MIT"; }; production = true; @@ -53490,10 +53420,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.7.tgz"; - sha512 = "b+BTZviGOZc7S5cyp9FHn7C/RD65YayWbIA6Oxws/uNwIi6U+T2jrHM4iNS+0g473wmNBdInGyVu1Bz6B1zYbg=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.8.tgz"; + sha512 = "fQUlrvZ06EacKHDQDNEgO6wW/5u6oY/0dm3JsdqRVfBcK3+hyGf9rfsDom1qxpjBt4CgPiLTRwbDqmvpwaI0Zg=="; }; buildInputs = globalBuildInputs; meta = { @@ -53508,10 +53438,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.8.0.tgz"; - sha512 = "PqBFyBu2yyofWYuKbVfgwNSJKQFklvfWU3Kv7EcinacWHfScCJqFZJMS4/3wA5xyjAPPEp9IiJ6rfpFFf8sEQg=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.8.1.tgz"; + sha512 = "69jOo9oD2JJUo5bMeoV5lcgaAJzMWO7KzWllckc+ZOGB46dE2Qev4MogRnwE/94GI6qc8Cx4RiMoRRLXYIWhyg=="; }; dependencies = [ sources."@babel/runtime-7.9.2" @@ -53560,7 +53490,7 @@ in sources."debug-4.1.1" ]; }) - (sources."metals-languageclient-0.1.23" // { + (sources."metals-languageclient-0.2.1" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.2" @@ -53593,7 +53523,7 @@ in sources."safe-buffer-5.2.0" sources."semver-6.3.0" sources."shell-quote-1.7.2" - (sources."streamroller-2.2.3" // { + (sources."streamroller-2.2.4" // { dependencies = [ sources."debug-4.1.1" ]; @@ -53660,7 +53590,7 @@ in sources."@typescript-eslint/typescript-estree-1.13.0" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-keywords-3.4.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -53705,7 +53635,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001042" + sources."caniuse-lite-1.0.30001046" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -53791,7 +53721,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.411" + sources."electron-to-chromium-1.3.415" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -54196,7 +54126,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.0.4" + sources."prettier-2.0.5" (sources."prettier-eslint-9.0.1" // { dependencies = [ sources."prettier-1.19.1" @@ -54264,7 +54194,7 @@ in sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.16.0" + sources."resolve-1.17.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -54325,7 +54255,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."specificity-0.3.2" @@ -54646,11 +54576,11 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -54689,7 +54619,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.11.1" + sources."browserslist-4.12.0" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -54697,7 +54627,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001042" + sources."caniuse-lite-1.0.30001046" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -54756,7 +54686,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.411" + sources."electron-to-chromium-1.3.415" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -55013,7 +54943,7 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -55067,7 +54997,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."specificity-0.4.1" @@ -55245,7 +55175,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."semver-5.7.1" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" @@ -55301,10 +55231,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.4.15"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.4.15.tgz"; - sha512 = "E7GGyo/DGcLnm/KhpHUMoo4yKsvqWYi054k1qWok1l5HUyCz5JwlN3MDUOj7SePm8PXCGS7ldFmRWyKiyU1jyw=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.1.tgz"; + sha512 = "33mkWOHgvB7hS/mfhCt4PfHAepnLQaTMvvsCWN3daks7yYnOdeMFplD5UORRRvvcJoOEdQBtXXu960I/Xe4MCg=="; }; dependencies = [ sources."typescript-3.8.3" @@ -55359,7 +55289,7 @@ in sources."@types/glob-7.1.1" sources."@types/json-schema-7.0.4" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -55383,7 +55313,7 @@ in sources."indent-string-4.0.0" ]; }) - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -55888,7 +55818,7 @@ in sources."mout-0.5.0" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" @@ -56079,7 +56009,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -56094,7 +56024,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-formatter-0.4.4" + sources."sass-formatter-0.4.5" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -56148,7 +56078,7 @@ in sources."source-map-url-0.4.0" sources."space-separated-tokens-1.1.5" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -56221,7 +56151,7 @@ in sources."stylus-supremacy-2.14.0" sources."suf-cli-0.1.1" sources."suf-node-1.1.1" - sources."suf-regex-0.0.14" + sources."suf-regex-0.0.17" sources."supports-color-5.5.0" sources."symbol-0.2.3" (sources."table-5.4.6" // { @@ -56498,7 +56428,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; - homepage = "http://coffeescript.org/"; + homepage = http://coffeescript.org/; license = "MIT"; }; production = true; @@ -56636,10 +56566,10 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -57054,7 +56984,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -57115,7 +57045,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -57246,7 +57176,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."aggregate-error-3.0.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -57403,7 +57333,7 @@ in }) sources."locate-path-2.0.0" sources."loud-rejection-1.6.0" - sources."make-dir-3.0.2" + sources."make-dir-3.1.0" sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" @@ -57486,7 +57416,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-regex-1.1.0" @@ -57530,7 +57460,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -57607,7 +57537,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -57885,15 +57815,15 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.1.0.tgz"; - sha512 = "GqjMxZ/LNUXFxXKQP4u+uJlbsQhsgk7Mm0q2djYvI3sS/vPA+I1oqrEmsIrj5T3oCtWh3L+N9vd/8OQ5sLxOhw=="; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.1.1.tgz"; + sha512 = "l4f3E7chtJp4QxiPBxEAE6gFSSF/gm+RxTfyQzxsl3nTGe1wHUU9AYUQgXQ86zfyq7n8gGmRd3MS5wYLodKo8g=="; }; buildInputs = globalBuildInputs; meta = { description = "Create React Native apps with no build configuration."; - homepage = "https://github.com/expo/create-react-native-app"; + homepage = https://github.com/expo/create-react-native-app; license = "BSD-3-Clause"; }; production = true; @@ -57915,7 +57845,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CSSLint"; - homepage = "http://csslint.net/"; + homepage = http://csslint.net/; license = "MIT"; }; production = true; @@ -57932,7 +57862,7 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" @@ -58211,7 +58141,7 @@ in sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-function-1.0.1" + sources."is-function-1.0.2" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" (sources."is-number-3.0.0" // { @@ -58273,7 +58203,7 @@ in sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mirror-folder-3.0.0" + sources."mirror-folder-3.0.1" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -58287,7 +58217,7 @@ in sources."multistream-2.1.1" sources."mute-stream-0.0.8" sources."mutexify-1.2.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" sources."nanoguard-1.3.0" @@ -58296,7 +58226,7 @@ in sources."nanotiming-7.3.1" sources."napi-macros-2.0.0" sources."ncp-1.0.1" - sources."neat-input-1.11.0" + sources."neat-input-1.11.1" sources."neat-log-3.1.0" sources."neat-spinner-1.0.0" sources."neat-tasks-1.1.1" @@ -58570,7 +58500,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Dat is the package manager for data. Easily share and version control data."; - homepage = "https://datproject.org/"; + homepage = https://datproject.org/; license = "BSD-3-Clause"; }; production = true; @@ -58591,7 +58521,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A DHCP server written in JavaScript"; - homepage = "https://github.com/infusion/node-dhcp"; + homepage = https://github.com/infusion/node-dhcp; license = "MIT OR GPL-2.0"; }; production = true; @@ -58673,7 +58603,7 @@ in sources."mime-types-2.1.26" sources."minimist-0.0.10" sources."ms-0.7.0" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" @@ -58736,7 +58666,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; - homepage = "https://github.com/okTurtles/dnschain"; + homepage = https://github.com/okTurtles/dnschain; license = "MPL-2.0"; }; production = true; @@ -58793,12 +58723,12 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.657.0" + sources."aws-sdk-2.661.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -58973,18 +58903,18 @@ in sources."@babel/template-7.8.6" sources."@babel/traverse-7.9.5" sources."@babel/types-7.9.5" - sources."@sindresorhus/is-2.1.0" + sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/color-name-1.1.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -59122,7 +59052,7 @@ in }) sources."loose-envify-1.4.0" sources."lowercase-keys-2.0.0" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -59191,7 +59121,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" @@ -59211,7 +59141,7 @@ in }) sources."source-map-0.5.7" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" (sources."string-length-3.1.0" // { @@ -59269,7 +59199,7 @@ in buildInputs = globalBuildInputs; meta = { description = "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images."; - homepage = "https://www.emojione.com/"; + homepage = https://www.emojione.com/; }; production = true; bypassCache = true; @@ -59290,7 +59220,7 @@ in sources."@types/color-name-1.1.1" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -59445,7 +59375,7 @@ in buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; - homepage = "https://eslint.org/"; + homepage = https://eslint.org/; license = "MIT"; }; production = true; @@ -59467,7 +59397,7 @@ in sources."@types/color-name-1.1.1" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -59575,7 +59505,7 @@ in sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-2.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" @@ -59627,7 +59557,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Makes eslint the fastest linter on the planet"; - homepage = "https://github.com/mantoni/eslint_d.js"; + homepage = https://github.com/mantoni/eslint_d.js; license = "MIT"; }; production = true; @@ -59643,7 +59573,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -59774,14 +59704,14 @@ in sources."repeating-2.0.1" sources."request-2.88.2" sources."request-progress-2.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."signal-exit-3.0.3" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" @@ -59968,7 +59898,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.0" sources."rxjs-6.5.5" @@ -59979,7 +59909,7 @@ in sources."signal-exit-3.0.3" sources."slice-ansi-3.0.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."string-width-4.2.0" @@ -60243,7 +60173,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."nconf-0.10.0" sources."ncp-0.4.2" @@ -60531,7 +60461,7 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nearley-2.19.2" sources."node-gyp-build-4.2.1" sources."node-polyglot-1.0.0" @@ -60652,7 +60582,7 @@ in buildInputs = globalBuildInputs; meta = { description = "git hosting on secure-scuttlebutt (ssb)"; - homepage = "https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256"; + homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256; license = "Fair"; }; production = true; @@ -60703,7 +60633,7 @@ in sources."@types/color-name-1.1.1" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -60837,7 +60767,7 @@ in ]; }) sources."lowercase-keys-1.0.1" - sources."make-dir-3.0.2" + sources."make-dir-3.1.0" sources."map-obj-4.1.0" (sources."meow-6.1.0" // { dependencies = [ @@ -60861,7 +60791,7 @@ in sources."npm-run-path-4.0.1" sources."once-1.4.0" sources."onetime-5.1.0" - sources."ora-4.0.3" + sources."ora-4.0.4" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" @@ -60896,7 +60826,7 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.0" @@ -60908,7 +60838,7 @@ in sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."string-width-4.2.0" @@ -60974,7 +60904,7 @@ in sources."@types/color-name-1.1.1" sources."accepts-1.3.7" sources."agent-base-4.3.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -61101,7 +61031,7 @@ in ]; }) sources."is-fullwidth-code-point-3.0.0" - (sources."ora-4.0.3" // { + (sources."ora-4.0.4" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -61521,7 +61451,7 @@ in sources."request-promise-core-1.1.3" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-from-4.0.0" sources."responselike-1.0.2" @@ -61554,13 +61484,13 @@ in sources."simple-errors-1.0.1" sources."snake-case-2.1.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.18" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" @@ -61867,7 +61797,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -62033,7 +61963,7 @@ in sources."supports-color-7.1.0" ]; }) - sources."systeminformation-4.23.3" + sources."systeminformation-4.23.5" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -62311,7 +62241,7 @@ in }) sources."ms-2.0.0" sources."mute-stdout-1.0.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."next-tick-1.0.0" sources."normalize-package-data-2.5.0" @@ -62376,7 +62306,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -62424,7 +62354,7 @@ in sources."source-map-url-0.4.0" sources."sparkles-1.0.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -62504,7 +62434,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The streaming build system."; - homepage = "https://gulpjs.com/"; + homepage = https://gulpjs.com/; license = "MIT"; }; production = true; @@ -62754,7 +62684,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -62793,7 +62723,7 @@ in sources."source-map-url-0.4.0" sources."sparkles-1.0.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -62849,7 +62779,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for gulp"; - homepage = "http://gulpjs.com/"; + homepage = http://gulpjs.com/; license = "MIT"; }; production = true; @@ -62880,7 +62810,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = "https://kangax.github.io/html-minifier/"; + homepage = https://kangax.github.io/html-minifier/; license = "MIT"; }; production = true; @@ -62896,7 +62826,7 @@ in sha512 = "uXuRyVhQa0HlNmZg5LJ1BRJvRq5f7IJL/34tItHhZr9re15pwaqAuLUAIcqtwd1bLUCE++7HVPtR+NSReFW0iA=="; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" @@ -63147,7 +63077,7 @@ in }) sources."moment-2.24.0" sources."mv-2.1.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."ncp-2.0.0" sources."once-1.4.0" sources."optimist-0.6.1" @@ -63231,7 +63161,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."jquery-3.5.0" - sources."jquery.terminal-2.15.2" + sources."jquery.terminal-2.15.4" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -63250,7 +63180,7 @@ in buildInputs = globalBuildInputs; meta = { description = "High precision scientific calculator with support for physical units"; - homepage = "https://github.com/sharkdp/insect"; + homepage = https://github.com/sharkdp/insect; license = "MIT"; }; production = true; @@ -63571,7 +63501,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A tool for creating and developing Ionic Framework mobile apps."; - homepage = "https://ionicframework.com/"; + homepage = https://ionicframework.com/; license = "MIT"; }; production = true; @@ -63605,7 +63535,7 @@ in sources."@types/color-name-1.1.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" @@ -63762,7 +63692,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."node-gyp-3.8.0" // { dependencies = [ sources."semver-5.3.0" @@ -63848,7 +63778,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" sources."resumer-0.0.0" @@ -63867,7 +63797,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-1.0.1" @@ -63994,10 +63924,10 @@ in jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; - version = "10.4.6"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.4.6.tgz"; - sha512 = "bfxWbCowItajx7PV0xyoRfLC1DCND7z308JD5OvMhmsjO9232onI0jbbFZFWnvLSMzniRBhOee9EggsWBQ1+Ew=="; + url = "https://registry.npmjs.org/jake/-/jake-10.5.2.tgz"; + sha512 = "2twpudoNYV7izUgKoLoVCwLFV+x8W5PQHri4ZPSm3L2viTq+DxVPQi9WJoeDSTCKE/G3lB5e78KAbeFhYQpgKA=="; }; dependencies = [ sources."ansi-styles-3.2.1" @@ -64066,11 +63996,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."iterare-1.2.0" - (sources."jaeger-client-3.17.2" // { - dependencies = [ - sources."opentracing-0.13.0" - ]; - }) + sources."jaeger-client-3.18.0" sources."lodash-4.17.15" sources."long-2.4.0" sources."minimatch-3.0.4" @@ -64112,7 +64038,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Implementation of the Language Server Protocol for JavaScript and TypeScript"; - homepage = "https://github.com/sourcegraph/javascript-typescript-langserver"; + homepage = https://github.com/sourcegraph/javascript-typescript-langserver; license = "Apache-2.0"; }; production = true; @@ -64139,7 +64065,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" @@ -64568,7 +64494,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."is-windows-1.0.2" @@ -64581,7 +64507,7 @@ in sources."nextgen-events-1.3.0" sources."nice-try-1.0.5" sources."no-case-2.3.2" - sources."node-abi-2.15.0" + sources."node-abi-2.16.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.10.0" sources."node-fetch-1.7.3" @@ -64962,7 +64888,7 @@ in buildInputs = globalBuildInputs; meta = { description = "beautifier.io for node"; - homepage = "https://beautifier.io/"; + homepage = https://beautifier.io/; license = "MIT"; }; production = true; @@ -64985,7 +64911,7 @@ in buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; - homepage = "https://github.com/nodeca/js-yaml"; + homepage = https://github.com/nodeca/js-yaml; license = "MIT"; }; production = true; @@ -65081,7 +65007,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = "http://jshint.com/"; + homepage = http://jshint.com/; license = "(MIT AND JSON)"; }; production = true; @@ -65124,7 +65050,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JSON diff"; - homepage = "https://github.com/andreyvit/json-diff"; + homepage = https://github.com/andreyvit/json-diff; }; production = true; bypassCache = true; @@ -65179,7 +65105,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; - homepage = "https://github.com/whitlockjc/json-refs"; + homepage = https://github.com/whitlockjc/json-refs; license = "MIT"; }; production = true; @@ -65199,7 +65125,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."string-width-3.1.0" @@ -65335,7 +65261,7 @@ in sources."lodash-id-0.14.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" - sources."make-dir-3.0.2" + sources."make-dir-3.1.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" (sources."method-override-3.0.0" // { @@ -65460,7 +65386,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Get a full fake REST API with zero coding in less than 30 seconds"; - homepage = "https://github.com/typicode/json-server"; + homepage = https://github.com/typicode/json-server; license = "MIT"; }; production = true; @@ -65487,7 +65413,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Validate JSON"; - homepage = "http://zaach.github.com/jsonlint/"; + homepage = http://zaach.github.com/jsonlint/; }; production = true; bypassCache = true; @@ -65573,7 +65499,7 @@ in }) sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -65687,7 +65613,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; - homepage = "http://karma-runner.github.io/"; + homepage = http://karma-runner.github.io/; license = "MIT"; }; production = true; @@ -65781,7 +65707,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; - homepage = "https://github.com/mweibel/lcov-result-merger"; + homepage = https://github.com/mweibel/lcov-result-merger; license = "MIT"; }; production = true; @@ -65800,7 +65726,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -66149,7 +66075,7 @@ in sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@octokit/auth-token-2.4.0" - (sources."@octokit/endpoint-6.0.0" // { + (sources."@octokit/endpoint-6.0.1" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" @@ -66160,7 +66086,7 @@ in sources."@octokit/plugin-paginate-rest-1.1.2" sources."@octokit/plugin-request-log-1.0.0" sources."@octokit/plugin-rest-endpoint-methods-2.4.0" - (sources."@octokit/request-5.4.0" // { + (sources."@octokit/request-5.4.2" // { dependencies = [ sources."@octokit/request-error-2.0.0" sources."is-plain-object-3.0.0" @@ -66170,17 +66096,17 @@ in }) sources."@octokit/request-error-1.2.1" sources."@octokit/rest-16.43.1" - sources."@octokit/types-2.10.0" + sources."@octokit/types-2.12.1" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -66785,7 +66711,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -66858,7 +66784,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-1.0.1" @@ -67020,7 +66946,7 @@ in sha512 = "tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g=="; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -67083,7 +67009,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Leaner CSS"; - homepage = "http://lesscss.org/"; + homepage = http://lesscss.org/; license = "Apache-2.0"; }; production = true; @@ -67108,7 +67034,7 @@ in buildInputs = globalBuildInputs; meta = { description = "clean-css plugin for less.js"; - homepage = "http://lesscss.org/"; + homepage = http://lesscss.org/; }; production = true; bypassCache = true; @@ -67282,7 +67208,7 @@ in sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" @@ -67456,7 +67382,7 @@ in dependencies = [ sources."accepts-1.3.7" sources."after-0.8.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -67543,14 +67469,14 @@ in sources."ee-first-1.1.1" sources."emoji-regex-6.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."component-emitter-1.2.1" sources."debug-4.1.1" @@ -67689,7 +67615,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -67949,7 +67875,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Live Markdown previews for your favourite editor."; - homepage = "https://github.com/shime/livedown"; + homepage = https://github.com/shime/livedown; license = "MIT"; }; production = true; @@ -68070,12 +67996,12 @@ in ]; }) sources."@istanbuljs/schema-0.1.2" - (sources."@jest/transform-25.3.0" // { + (sources."@jest/transform-25.4.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@jest/types-25.3.0" + sources."@jest/types-25.4.0" sources."@types/babel__core-7.1.7" sources."@types/babel__generator-7.6.1" sources."@types/babel__template-7.0.2" @@ -68085,7 +68011,7 @@ in sources."@types/istanbul-lib-coverage-2.0.1" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.1" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.4" @@ -68115,7 +68041,7 @@ in sources."acorn-7.1.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."amdefine-1.0.1" @@ -68154,15 +68080,15 @@ in sources."babel-helper-mark-eval-scopes-0.4.3" sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" - sources."babel-jest-25.3.0" + sources."babel-jest-25.4.0" (sources."babel-loader-8.1.0" // { dependencies = [ sources."mkdirp-0.5.5" ]; }) - sources."babel-plugin-dynamic-import-node-2.3.0" + sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-25.2.6" + sources."babel-plugin-jest-hoist-25.4.0" sources."babel-plugin-minify-builtins-0.5.0" sources."babel-plugin-minify-constant-folding-0.5.0" sources."babel-plugin-minify-dead-code-elimination-0.5.1" @@ -68188,7 +68114,7 @@ in sources."babel-plugin-transform-simplify-comparison-operators-6.9.4" sources."babel-plugin-transform-undefined-to-void-6.9.4" sources."babel-preset-current-node-syntax-0.1.2" - sources."babel-preset-jest-25.3.0" + sources."babel-preset-jest-25.4.0" sources."babel-preset-minify-0.5.1" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -68238,7 +68164,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.11.1" + sources."browserslist-4.12.0" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -68253,7 +68179,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001042" + sources."caniuse-lite-1.0.30001046" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -68370,7 +68296,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.411" + sources."electron-to-chromium-1.3.415" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" @@ -68460,7 +68386,7 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.1" sources."get-assigned-identifiers-1.2.0" @@ -68488,7 +68414,7 @@ in sources."globals-11.12.0" sources."google-closure-compiler-js-20170910.0.1" sources."graceful-fs-4.2.3" - (sources."gunzip-maybe-1.4.1" // { + (sources."gunzip-maybe-1.4.2" // { dependencies = [ sources."browserify-zlib-0.1.4" sources."pako-0.2.9" @@ -68565,11 +68491,11 @@ in sources."semver-6.3.0" ]; }) - sources."jest-haste-map-25.3.0" + sources."jest-haste-map-25.4.0" sources."jest-regex-util-25.2.6" sources."jest-serializer-25.2.6" - sources."jest-util-25.3.0" - (sources."jest-worker-25.2.6" // { + sources."jest-util-25.4.0" + (sources."jest-worker-25.4.0" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.1.0" @@ -68607,7 +68533,7 @@ in sources."loose-envify-1.4.0" sources."lru-cache-5.1.1" sources."magic-string-0.25.7" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -68651,7 +68577,7 @@ in ]; }) sources."ms-2.1.2" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."ncp-2.0.0" sources."neo-async-2.6.1" @@ -68791,7 +68717,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -68827,7 +68753,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."schema-utils-2.6.5" + sources."schema-utils-2.6.6" sources."semver-5.7.1" sources."serialize-javascript-2.1.2" sources."set-blocking-2.0.0" @@ -68879,7 +68805,7 @@ in sources."source-list-map-0.1.8" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.18" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -68887,7 +68813,7 @@ in sources."source-map-url-0.4.0" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -69013,7 +68939,7 @@ in sources."vm-browserify-1.1.2" sources."walker-1.0.7" sources."watchpack-1.6.1" - (sources."webpack-4.42.1" // { + (sources."webpack-4.43.0" // { dependencies = [ sources."acorn-6.4.1" sources."micromatch-3.1.10" @@ -69107,7 +69033,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Madoko is a fast scholarly Markdown processor written in Koka"; - homepage = "http://madoko.codeplex.com/"; + homepage = http://madoko.codeplex.com/; }; production = true; bypassCache = true; @@ -69123,7 +69049,7 @@ in }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-styles-4.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -69247,7 +69173,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; - homepage = "https://bitbucket.org/aahmed/meat"; + homepage = https://bitbucket.org/aahmed/meat; }; production = true; bypassCache = true; @@ -69800,7 +69726,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."request-2.81.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -70021,7 +69947,7 @@ in sources."find-up-3.0.0" sources."flat-4.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."glob-7.1.3" @@ -70105,7 +70031,7 @@ in buildInputs = globalBuildInputs; meta = { description = "simple, flexible, fun test framework"; - homepage = "https://mochajs.org/"; + homepage = https://mochajs.org/; license = "MIT"; }; production = true; @@ -70229,7 +70155,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Neovim client API and neovim remote plugin provider"; - homepage = "https://github.com/neovim/node-client"; + homepage = https://github.com/neovim/node-client; license = "MIT"; }; production = true; @@ -70268,7 +70194,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -70388,7 +70314,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = "https://github.com/prebuild/node-gyp-build"; + homepage = https://github.com/prebuild/node-gyp-build; license = "MIT"; }; production = true; @@ -70538,7 +70464,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."negotiator-0.6.2" (sources."node-pre-gyp-0.6.39" // { dependencies = [ @@ -70589,7 +70515,7 @@ in sources."qs-6.4.0" ]; }) - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -70611,7 +70537,7 @@ in sources."signal-exit-3.0.3" sources."sntp-1.0.9" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" (sources."sshpk-1.16.1" // { @@ -70684,7 +70610,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = "http://github.com/node-inspector/node-inspector"; + homepage = http://github.com/node-inspector/node-inspector; }; production = true; bypassCache = true; @@ -71251,7 +71177,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Low-code programming for event-driven applications"; - homepage = "http://nodered.org/"; + homepage = http://nodered.org/; license = "Apache-2.0"; }; production = true; @@ -71268,7 +71194,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -71393,7 +71319,7 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" @@ -71404,7 +71330,7 @@ in sources."slasp-0.0.4" sources."slide-1.1.6" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" @@ -71441,7 +71367,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = "https://github.com/svanderburg/node2nix"; + homepage = https://github.com/svanderburg/node2nix; license = "MIT"; }; production = true; @@ -71506,7 +71432,7 @@ in sources."end-of-stream-1.4.4" sources."escape-goat-2.1.1" sources."fill-range-7.0.1" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-stream-4.1.0" sources."glob-parent-5.1.1" sources."global-dirs-2.0.1" @@ -71535,7 +71461,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -71605,7 +71531,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; - homepage = "http://nodemon.io/"; + homepage = http://nodemon.io/; license = "MIT"; }; production = true; @@ -71623,7 +71549,7 @@ in buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; - homepage = "https://docs.npmjs.com/"; + homepage = https://docs.npmjs.com/; license = "Artistic-2.0"; }; production = true; @@ -71645,7 +71571,7 @@ in sources."@npmcli/promise-spawn-1.2.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tootallnate/once-1.0.0" + sources."@tootallnate/once-1.1.2" sources."@types/color-name-1.1.1" sources."agent-base-6.0.0" sources."agentkeepalive-4.1.0" @@ -71779,7 +71705,7 @@ in sources."lodash-4.17.15" sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -71919,7 +71845,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; - homepage = "https://github.com/tjunnone/npm-check-updates"; + homepage = https://github.com/tjunnone/npm-check-updates; license = "Apache-2.0"; }; production = true; @@ -71937,7 +71863,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -72093,7 +72019,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; - homepage = "https://github.com/NixOS/npm2nix"; + homepage = https://github.com/NixOS/npm2nix; }; production = true; bypassCache = true; @@ -72134,7 +72060,7 @@ in buildInputs = globalBuildInputs; meta = { description = "OCaml language server"; - homepage = "https://github.com/freebroccolo/ocaml-language-server"; + homepage = https://github.com/freebroccolo/ocaml-language-server; license = "Apache-2.0"; }; production = true; @@ -72248,7 +72174,7 @@ in sources."@babel/template-7.8.6" sources."@babel/traverse-7.9.5" sources."@babel/types-7.9.5" - sources."@iarna/toml-2.2.3" + sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@parcel/fs-1.11.0" @@ -72265,7 +72191,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -72297,7 +72223,7 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" - sources."babel-plugin-dynamic-import-node-2.3.0" + sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" @@ -72336,7 +72262,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.11.1" + sources."browserslist-4.12.0" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -72353,7 +72279,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001042" + sources."caniuse-lite-1.0.30001046" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -72486,7 +72412,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.411" + sources."electron-to-chromium-1.3.415" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -72583,7 +72509,7 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.5" // { dependencies = [ - sources."posthtml-0.12.2" + sources."posthtml-0.12.3" sources."terser-4.6.11" ]; }) @@ -72715,7 +72641,7 @@ in }) sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -72892,7 +72818,7 @@ in sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -72948,7 +72874,7 @@ in sources."snapdragon-util-3.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.16" + sources."source-map-support-0.5.18" sources."source-map-url-0.4.0" (sources."split-string-3.1.0" // { dependencies = [ @@ -73119,7 +73045,7 @@ in sources."negotiator-0.6.2" ]; }) - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -73265,7 +73191,7 @@ in sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."ncp-2.0.0" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.1" @@ -73614,7 +73540,7 @@ in sources."redent-1.0.0" sources."regexp.prototype.flags-1.3.0" sources."repeating-2.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" @@ -73640,7 +73566,7 @@ in }) sources."single-line-log-1.1.2" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."speedometer-0.1.4" @@ -73695,7 +73621,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; - homepage = "https://github.com/mafintosh/peerflix"; + homepage = https://github.com/mafintosh/peerflix; license = "MIT"; }; production = true; @@ -73714,7 +73640,7 @@ in sources."accepts-1.3.7" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."archiver-3.1.1" (sources."archiver-utils-2.1.0" // { dependencies = [ @@ -73802,14 +73728,14 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -74076,15 +74002,15 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-4.13.0.tgz"; - sha512 = "0zJwt+IxBCQECptU40AaUJOBOo830FV4wnSoUvIqVJpOg5HBa0mv/DTXRf/pjuvNYZcuO7KDoD2zXWuJk86khQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-4.14.0.tgz"; + sha512 = "O6B5OD+wiO4srzegQTs0LiOrdExLvoKgG7UFL5+Lu1DhgqhW9NFP/pPg8+zKSrOQTontH3GGSWAkinxM3tCqnw=="; }; buildInputs = globalBuildInputs; meta = { description = "Fast, disk space efficient package manager"; - homepage = "https://pnpm.js.org/"; + homepage = https://pnpm.js.org/; license = "MIT"; }; production = true; @@ -74107,7 +74033,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" @@ -74141,7 +74067,7 @@ in sources."find-up-4.1.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" sources."get-stdin-7.0.0" sources."glob-7.1.6" @@ -74253,15 +74179,15 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.0.4.tgz"; - sha512 = "SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz"; + sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; buildInputs = globalBuildInputs; meta = { description = "Prettier is an opinionated code formatter"; - homepage = "https://prettier.io/"; + homepage = https://prettier.io/; license = "MIT"; }; production = true; @@ -74547,7 +74473,7 @@ in ]; }) sources."reject-unsatisfied-npm-version-1.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-npm-3.1.0" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" @@ -74568,7 +74494,7 @@ in sources."slice-ansi-2.1.0" sources."sorcery-0.10.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.18" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -74648,7 +74574,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A build system for PureScript projects"; - homepage = "https://github.com/purescript-contrib/pulp"; + homepage = https://github.com/purescript-contrib/pulp; license = "LGPL-3.0+"; }; production = true; @@ -74820,7 +74746,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; - homepage = "https://facebook.github.io/react"; + homepage = https://facebook.github.io/react; license = "BSD-3-Clause"; }; production = true; @@ -74838,7 +74764,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The HTML Presentation Framework"; - homepage = "http://revealjs.com/"; + homepage = http://revealjs.com/; license = "MIT"; }; production = true; @@ -74861,17 +74787,17 @@ in sources."@types/eslint-visitor-keys-1.0.0" sources."@types/estree-0.0.39" sources."@types/json-schema-7.0.4" - sources."@types/node-12.12.35" + sources."@types/node-12.12.37" sources."@types/node-fetch-2.5.6" sources."@types/resolve-0.0.8" - sources."@types/vscode-1.43.0" - sources."@typescript-eslint/eslint-plugin-2.28.0" - sources."@typescript-eslint/experimental-utils-2.28.0" - sources."@typescript-eslint/parser-2.28.0" - sources."@typescript-eslint/typescript-estree-2.28.0" + sources."@types/vscode-1.44.0" + sources."@typescript-eslint/eslint-plugin-2.29.0" + sources."@typescript-eslint/experimental-utils-2.29.0" + sources."@typescript-eslint/parser-2.29.0" + sources."@typescript-eslint/typescript-estree-2.29.0" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -74958,7 +74884,7 @@ in sources."flatted-2.0.2" sources."form-data-3.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -75047,11 +74973,11 @@ in sources."read-1.0.7" sources."readable-stream-3.6.0" sources."regexpp-3.1.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."rollup-2.6.1" + sources."rollup-2.7.2" sources."run-async-2.4.0" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" @@ -75112,10 +75038,10 @@ in sources."tmp-0.0.29" ]; }) - sources."vscode-jsonrpc-5.0.1" - sources."vscode-languageclient-6.1.3" - sources."vscode-languageserver-protocol-3.15.3" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-jsonrpc-5.1.0-next.1" + sources."vscode-languageclient-7.0.0-next.1" + sources."vscode-languageserver-protocol-3.16.0-next.2" + sources."vscode-languageserver-types-3.16.0-next.1" sources."which-1.3.1" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" @@ -75140,7 +75066,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -75390,10 +75316,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.67.3"; + version = "1.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.67.3.tgz"; - sha512 = "GELorbWZI0iLroPAwuHBDF7xlTAlSfhkcSjsb0CBdBgKz8EU8eqhalzl8dU+C+hOM5j/LJK/ATwaIxJXndqwCw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.68.0.tgz"; + sha512 = "CLA8K4B/oZm1LwgUDAfCHiVYGszveDSlAUr2mIdzdcVc3CLjzlRZn7IVipy3myXOc7/+kocxOqs3VXogm9A4Wg=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -75407,7 +75333,7 @@ in sources."node-fetch-2.6.0" ]; }) - (sources."@serverless/components-2.29.3" // { + (sources."@serverless/components-2.30.1" // { dependencies = [ sources."fs-extra-8.1.0" sources."globby-10.0.2" @@ -75444,7 +75370,7 @@ in sources."https-proxy-agent-5.0.0" ]; }) - (sources."@serverless/platform-client-china-1.0.5" // { + (sources."@serverless/platform-client-china-1.0.6" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; @@ -75457,7 +75383,7 @@ in ]; }) sources."@serverless/template-1.1.3" - (sources."@serverless/utils-china-0.1.3" // { + (sources."@serverless/utils-china-0.1.6" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; @@ -75468,10 +75394,10 @@ in sources."@types/color-name-1.1.1" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" - sources."@types/lodash-4.14.149" + sources."@types/lodash-4.14.150" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" - (sources."@typescript-eslint/typescript-estree-2.28.0" // { + sources."@types/node-13.13.2" + (sources."@typescript-eslint/typescript-estree-2.29.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -75479,7 +75405,7 @@ in sources."adm-zip-0.4.14" sources."after-0.8.2" sources."agent-base-6.0.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."emoji-regex-7.0.3" @@ -75530,7 +75456,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.657.0" // { + (sources."aws-sdk-2.661.0" // { dependencies = [ sources."buffer-4.9.1" sources."isarray-1.0.0" @@ -75705,7 +75631,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.24" + sources."dayjs-1.8.25" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -75782,7 +75708,7 @@ in sources."enabled-1.0.2" sources."encoding-0.1.12" sources."end-of-stream-1.4.4" - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."ws-6.1.4" ]; @@ -75880,7 +75806,7 @@ in sources."type-1.2.0" ]; }) - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-amd-module-type-3.0.0" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-proxy-2.1.0" @@ -76011,10 +75937,10 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.2" + sources."jsonata-1.8.3" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - (sources."jszip-3.3.0" // { + (sources."jszip-3.4.0" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -76215,7 +76141,7 @@ in sources."request-promise-native-1.0.8" sources."requirejs-2.3.6" sources."requirejs-config-file-3.1.2" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-dependency-path-2.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -76293,7 +76219,7 @@ in sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.16" + sources."source-map-support-0.5.18" sources."source-map-url-0.4.0" sources."split-string-3.1.0" sources."split2-3.1.1" @@ -76387,7 +76313,7 @@ in sources."type-check-0.3.2" sources."type-fest-0.11.0" sources."typescript-3.8.3" - sources."unbzip2-stream-1.4.1" + sources."unbzip2-stream-1.4.2" (sources."union-value-1.0.1" // { dependencies = [ sources."is-extendable-0.1.1" @@ -76486,7 +76412,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more"; - homepage = "https://serverless.com/framework/docs/"; + homepage = https://serverless.com/framework/docs/; license = "MIT"; }; production = true; @@ -76506,7 +76432,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.7" sources."after-0.8.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -77023,7 +76949,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mv-2.1.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -77120,18 +77046,25 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.305.1"; + version = "1.309.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.305.1.tgz"; - sha512 = "ThBDMwaVybu0aIXDjm5ecJUVxJePaf3qgv9g8Ocoldk7q9QJXBTvp+piAtyJlkGsWeWhCZAWATBxOcPRF30XcA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.309.0.tgz"; + sha512 = "NVizsLhGNhgjI+wCy1TajQoko+GVjop3r10BxX12KKxj3bUE9cDhqzkXmngHzuyFhTfdhED6yOzdg+jDvm1VpA=="; }; dependencies = [ - sources."@snyk/cli-interface-2.3.2" + sources."@snyk/cli-interface-2.4.0" sources."@snyk/cocoapods-lockfile-parser-3.1.0" sources."@snyk/composer-lockfile-parser-1.2.0" sources."@snyk/configstore-3.2.0-rc1" sources."@snyk/dep-graph-1.16.1" sources."@snyk/gemfile-1.2.0" + (sources."@snyk/java-call-graph-builder-1.3.4" // { + dependencies = [ + sources."ci-info-2.0.0" + sources."debug-4.1.1" + sources."snyk-config-3.0.0" + ]; + }) sources."@snyk/ruby-semver-2.1.0" (sources."@snyk/snyk-cocoapods-plugin-2.1.1" // { dependencies = [ @@ -77144,7 +77077,7 @@ in sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/js-yaml-3.12.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/restify-4.3.6" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.3" @@ -77296,7 +77229,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."js-yaml-3.13.1" - sources."jszip-3.3.0" + sources."jszip-3.4.0" sources."latest-version-3.1.0" sources."lcid-1.0.0" sources."levn-0.3.0" @@ -77356,6 +77289,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" sources."promise-7.3.1" sources."protocols-1.4.7" (sources."proxy-agent-3.1.1" // { @@ -77419,15 +77353,14 @@ in ]; }) sources."snyk-module-1.9.1" - (sources."snyk-mvn-plugin-2.9.0" // { + (sources."snyk-mvn-plugin-2.10.0" // { dependencies = [ - sources."@snyk/cli-interface-2.3.1" sources."debug-4.1.1" sources."tmp-0.1.0" - sources."tslib-1.9.3" + sources."tslib-1.11.0" ]; }) - sources."snyk-nodejs-lockfile-parser-1.17.0" + sources."snyk-nodejs-lockfile-parser-1.18.0" sources."snyk-nuget-plugin-1.16.0" sources."snyk-paket-parser-1.5.0" (sources."snyk-php-plugin-1.7.0" // { @@ -77460,7 +77393,7 @@ in ]; }) sources."source-map-0.6.1" - sources."source-map-support-0.5.16" + sources."source-map-support-0.5.18" sources."sprintf-js-1.0.3" sources."statuses-1.5.0" (sources."string-width-2.1.1" // { @@ -77483,8 +77416,12 @@ in sources."string_decoder-1.3.0" ]; }) - sources."temp-dir-1.0.0" - sources."tempfile-2.0.0" + sources."temp-dir-2.0.0" + (sources."tempfile-2.0.0" // { + dependencies = [ + sources."temp-dir-1.0.0" + ]; + }) sources."term-size-1.2.0" sources."then-fs-2.0.0" sources."through-2.3.8" @@ -77576,8 +77513,8 @@ in sources."component-inherit-0.0.3" sources."cookie-0.3.1" sources."debug-4.1.1" - sources."engine.io-3.4.0" - (sources."engine.io-client-3.4.0" // { + sources."engine.io-3.4.1" + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."ws-6.1.4" ]; @@ -77742,7 +77679,7 @@ in sources."redent-2.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."restore-cursor-2.0.0" sources."round-to-3.0.0" sources."safe-buffer-5.2.0" @@ -77753,7 +77690,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."speedtest-net-1.6.2" @@ -78169,7 +78106,7 @@ in sources."rimraf-2.4.5" ]; }) - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -78588,7 +78525,7 @@ in buildInputs = globalBuildInputs; meta = { description = "network protocol layer for secure-scuttlebutt"; - homepage = "https://github.com/ssbc/ssb-server"; + homepage = https://github.com/ssbc/ssb-server; license = "MIT"; }; production = true; @@ -78606,7 +78543,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Send metric data from statsd to Stackdriver"; - homepage = "https://www.stackdriver.com/"; + homepage = https://www.stackdriver.com/; license = "MIT"; }; production = true; @@ -78664,7 +78601,7 @@ in sources."semver-5.0.3" ]; }) - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."align-text-0.1.4" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -78681,7 +78618,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.657.0" // { + (sources."aws-sdk-2.661.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -78808,7 +78745,7 @@ in sources."drange-1.1.1" (sources."dtrace-provider-0.8.8" // { dependencies = [ - sources."nan-2.14.0" + sources."nan-2.14.1" ]; }) sources."ecc-jsbn-0.1.2" @@ -78817,14 +78754,14 @@ in sources."ejs-0.8.8" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ws-7.2.3" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ws-6.1.4" @@ -79175,7 +79112,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."ret-0.2.2" sources."rethinkdb-2.4.2" sources."retry-0.9.0" @@ -79237,7 +79174,7 @@ in }) sources."source-map-0.6.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-1.0.1" @@ -79525,7 +79462,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = "https://github.com/svg/svgo"; + homepage = https://github.com/svg/svgo; license = "MIT"; }; production = true; @@ -79881,7 +79818,7 @@ in sources."ms-2.0.0" sources."multer-1.4.2" sources."mute-stream-0.0.5" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."neo-async-2.6.1" @@ -80171,7 +80108,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -80491,13 +80428,13 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."require-from-string-2.0.2" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."slice-ansi-0.0.4" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" @@ -80560,7 +80497,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The pluggable linting tool for text and markdown."; - homepage = "https://github.com/textlint/textlint/"; + homepage = https://github.com/textlint/textlint/; license = "MIT"; }; production = true; @@ -80582,7 +80519,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Latex plugin for [textlint](https://github.com/textlint/textlint "textlint")."; - homepage = "https://github.com/elzup/textlint-plugin-latex"; + homepage = https://github.com/elzup/textlint-plugin-latex; license = "MIT"; }; production = true; @@ -80621,7 +80558,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule check that abbreviations within parentheses."; - homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses"; + homepage = https://github.com/azu/textlint-rule-abbr-within-parentheses; license = "MIT"; }; production = true; @@ -80820,7 +80757,7 @@ in sources."repeat-string-1.6.1" sources."repeating-2.0.1" sources."replace-ext-1.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."retext-english-3.0.4" sources."retext-equality-3.2.0" @@ -80841,7 +80778,7 @@ in ]; }) sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-0.2.10" @@ -80935,7 +80872,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule for alex"; - homepage = "https://github.com/textlint-rule/textlint-rule-alex"; + homepage = https://github.com/textlint-rule/textlint-rule-alex; license = "MIT"; }; production = true; @@ -80960,7 +80897,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check common misspellings"; - homepage = "https://github.com/io-monad/textlint-rule-common-misspellings"; + homepage = https://github.com/io-monad/textlint-rule-common-misspellings; license = "GPL-3.0"; }; production = true; @@ -80982,7 +80919,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to check correct usage of diacritics"; - homepage = "https://github.com/sapegin/textlint-rule-diacritics"; + homepage = https://github.com/sapegin/textlint-rule-diacritics; license = "MIT"; }; production = true; @@ -81019,7 +80956,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that specify the maximum word count of a sentence."; - homepage = "https://github.com/azu/textlint-rule-en-max-word-count"; + homepage = https://github.com/azu/textlint-rule-en-max-word-count; license = "MIT"; }; production = true; @@ -81112,7 +81049,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check no start with duplicated conjunction."; - homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction"; + homepage = https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction; license = "MIT"; }; production = true; @@ -81153,7 +81090,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check with or without period in list item."; - homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item"; + homepage = https://github.com/textlint-rule/textlint-rule-period-in-list-item; license = "MIT"; }; production = true; @@ -81183,7 +81120,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to find filler words, buzzwords and chiches"; - homepage = "https://github.com/sapegin/textlint-rule-stop-words"; + homepage = https://github.com/sapegin/textlint-rule-stop-words; license = "MIT"; }; production = true; @@ -81213,7 +81150,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TextLint rule to check correct terms spelling"; - homepage = "https://github.com/sapegin/textlint-rule-terminology"; + homepage = https://github.com/sapegin/textlint-rule-terminology; license = "MIT"; }; production = true; @@ -81253,7 +81190,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check unexpanded acronym word."; - homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym"; + homepage = https://github.com/textlint-rule/textlint-rule-unexpanded-acronym; license = "MIT"; }; production = true; @@ -81293,7 +81230,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check your English style with write good"; - homepage = "https://github.com/textlint-rule/textlint-rule-write-good"; + homepage = https://github.com/textlint-rule/textlint-rule-write-good; license = "MIT"; }; production = true; @@ -81309,7 +81246,7 @@ in sha512 = "ozjuU9/DaxT5r7ivckvdrzTLRoMCOiUlNbEAxldoHD3jzbbCEm561rHkEw0Caek31tOL4y0yqHiFuRBRoGbmiQ=="; }; dependencies = [ - sources."@sindresorhus/is-2.1.0" + sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.1" @@ -81317,14 +81254,14 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" sources."accepts-1.3.7" sources."after-0.8.2" sources."agent-base-4.3.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" sources."aproba-1.2.0" @@ -81416,14 +81353,14 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -81447,7 +81384,7 @@ in sources."extsprintf-1.4.0" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."fast-text-encoding-1.0.1" + sources."fast-text-encoding-1.0.2" sources."file-type-14.1.3" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.1.0" @@ -81537,7 +81474,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."needle-2.4.1" // { dependencies = [ sources."debug-3.2.6" @@ -81728,7 +81665,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The self-hosted Web IRC client"; - homepage = "https://thelounge.chat/"; + homepage = https://thelounge.chat/; license = "MIT"; }; production = true; @@ -81746,7 +81683,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JavaScript 3D library"; - homepage = "https://threejs.org/"; + homepage = https://threejs.org/; license = "MIT"; }; production = true; @@ -81781,7 +81718,7 @@ in }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" @@ -81975,7 +81912,7 @@ in sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."ncp-2.0.0" sources."once-1.3.2" sources."path-is-absolute-1.0.1" @@ -82087,7 +82024,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Joyent Triton CLI and client (https://www.joyent.com/triton)"; - homepage = "https://github.com/joyent/node-triton"; + homepage = https://github.com/joyent/node-triton; license = "MPL-2.0"; }; production = true; @@ -82136,7 +82073,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TSUN: a repl for TypeScript Upgraded Node"; - homepage = "https://github.com/HerringtonDarkholme/typescript-repl"; + homepage = https://github.com/HerringtonDarkholme/typescript-repl; license = "MIT"; }; production = true; @@ -82177,7 +82114,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; - homepage = "https://www.typescriptlang.org/"; + homepage = https://www.typescriptlang.org/; license = "Apache-2.0"; }; production = true; @@ -82254,7 +82191,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -82335,14 +82272,14 @@ in sources."enabled-1.0.2" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -82355,7 +82292,7 @@ in sources."etag-1.8.1" sources."eve-0.5.4" sources."express-4.17.1" - (sources."express-session-1.17.0" // { + (sources."express-session-1.17.1" // { dependencies = [ sources."depd-2.0.0" sources."safe-buffer-5.2.0" @@ -82663,7 +82600,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -82914,7 +82851,7 @@ in sources."tweetnacl-0.14.5" sources."uglify-js-3.9.1" sources."uid-0.0.2" - sources."unbzip2-stream-1.4.1" + sources."unbzip2-stream-1.4.2" sources."unyield-0.0.1" sources."unzip-response-2.0.1" sources."uri-js-4.2.2" @@ -82971,14 +82908,14 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-keywords-2.1.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -83462,7 +83399,7 @@ in sources."mout-0.5.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" @@ -83642,7 +83579,7 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -83709,7 +83646,7 @@ in sources."source-map-url-0.4.0" sources."space-separated-tokens-1.1.5" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -83941,7 +83878,7 @@ in buildInputs = globalBuildInputs; meta = { description = "vue-language-server"; - homepage = "https://github.com/vuejs/vetur/tree/master/server"; + homepage = https://github.com/vuejs/vetur/tree/master/server; license = "MIT"; }; production = true; @@ -83951,10 +83888,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-4.1.0.tgz"; - sha512 = "nhAeZ3BHI4rCT/J+s7JHg0U3G6qUMV8Bi44ohWm8X6GjlQV8tGcD6rkvN4Zk2zzMGaF9sHUOcRjyN79Ih8P/PQ=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-4.2.0.tgz"; + sha512 = "WM03BEeC7CVw4PV8lwXKO6ag00MYdwMMe1SAJJfxz0uNMbTu7cYoH6Ia+e2DnAzpeOJLKCeL1IXvgxZSwVp4/Q=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" @@ -83978,25 +83915,29 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."JSONSelect-0.2.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.20.0" // { + (sources."addons-linter-1.23.0" // { dependencies = [ - sources."regenerator-runtime-0.13.3" + sources."@babel/runtime-7.9.2" + sources."decamelize-1.2.0" + sources."yargs-15.3.1" ]; }) sources."adm-zip-0.4.14" - sources."ajv-6.10.2" + sources."ajv-6.12.0" sources."ajv-keywords-1.5.1" sources."ajv-merge-patch-4.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -84077,15 +84018,7 @@ in }) sources."bluebird-2.9.34" sources."boolbase-1.0.0" - (sources."boxen-4.2.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - ]; - }) + sources."boxen-4.2.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -84104,7 +84037,6 @@ in sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" sources."lowercase-keys-2.0.0" ]; }) @@ -84121,7 +84053,12 @@ in sources."normalize-path-3.0.0" ]; }) - sources."chrome-launcher-0.12.0" + (sources."chrome-launcher-0.13.1" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."rimraf-3.0.2" + ]; + }) sources."ci-info-2.0.0" sources."circular-json-0.3.3" (sources."class-utils-0.3.6" // { @@ -84147,9 +84084,6 @@ in (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" sources."strip-ansi-6.0.0" ]; }) @@ -84219,9 +84153,11 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - (sources."dispensary-0.49.0" // { + (sources."dispensary-0.51.2" // { dependencies = [ - sources."async-3.1.1" + sources."async-3.2.0" + sources."decamelize-1.2.0" + sources."yargs-15.3.1" ]; }) sources."doctrine-3.0.0" @@ -84234,7 +84170,7 @@ in sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -84245,7 +84181,7 @@ in sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-promise-2.3.0" - sources."es6-promisify-6.0.2" + sources."es6-promisify-6.1.0" (sources."es6-set-0.1.5" // { dependencies = [ sources."es6-symbol-3.1.1" @@ -84265,6 +84201,7 @@ in sources."debug-4.1.1" sources."espree-5.0.1" sources."has-flag-3.0.0" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."semver-5.7.1" sources."strip-ansi-4.0.0" @@ -84296,6 +84233,7 @@ in sources."ignore-3.3.10" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-1.0.0" + sources."mkdirp-0.5.5" sources."onetime-1.1.0" sources."progress-1.1.8" sources."restore-cursor-1.0.1" @@ -84318,7 +84256,7 @@ in sources."eslint-scope-4.0.3" sources."eslint-utils-1.4.3" sources."eslint-visitor-keys-1.1.0" - (sources."espree-6.1.2" // { + (sources."espree-6.2.1" // { dependencies = [ sources."acorn-7.1.1" ]; @@ -84334,7 +84272,17 @@ in sources."esutils-2.0.3" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - sources."execa-1.0.0" + (sources."execa-4.0.0" // { + dependencies = [ + sources."cross-spawn-7.0.2" + sources."mimic-fn-2.1.0" + sources."onetime-5.1.0" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -84375,8 +84323,12 @@ in ]; }) sources."extsprintf-1.3.0" - sources."fast-deep-equal-2.0.1" - sources."fast-json-patch-2.2.1" + sources."fast-deep-equal-3.1.1" + (sources."fast-json-patch-2.2.1" // { + dependencies = [ + sources."fast-deep-equal-2.0.1" + ]; + }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-redact-2.0.0" @@ -84392,7 +84344,7 @@ in ]; }) sources."find-up-4.1.0" - (sources."firefox-profile-1.3.0" // { + (sources."firefox-profile-1.3.1" // { dependencies = [ sources."async-2.5.0" ]; @@ -84422,7 +84374,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" - sources."get-stream-4.1.0" + sources."get-stream-5.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" (sources."git-rev-sync-2.0.0" // { @@ -84439,7 +84391,11 @@ in }) sources."global-dirs-2.0.1" sources."globals-11.12.0" - sources."got-9.6.0" + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) sources."graceful-fs-4.2.3" sources."graceful-readlink-1.0.1" sources."growly-1.3.0" @@ -84459,6 +84415,7 @@ in sources."htmlparser2-3.10.1" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" + sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."ignore-4.0.6" @@ -84474,13 +84431,23 @@ in sources."ini-1.3.5" (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."has-flag-3.0.0" - sources."strip-ansi-5.2.0" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) sources."supports-color-5.5.0" ]; }) @@ -84499,7 +84466,7 @@ in sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-mergeable-object-1.1.1" @@ -84519,7 +84486,7 @@ in sources."is-regex-1.0.5" sources."is-relative-0.1.3" sources."is-resolvable-1.1.0" - sources."is-stream-1.1.0" + sources."is-stream-2.0.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -84582,7 +84549,7 @@ in sources."lodash.once-4.1.1" sources."lodash.sortby-4.7.0" sources."lowercase-keys-1.0.1" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -84591,12 +84558,13 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.3" + sources."mdn-browser-compat-data-1.0.15" (sources."mem-5.1.1" // { dependencies = [ sources."mimic-fn-2.1.0" ]; }) + sources."merge-stream-2.0.0" sources."micromatch-3.1.10" sources."mime-db-1.43.0" sources."mime-types-2.1.26" @@ -84605,11 +84573,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mixin-deep-1.3.2" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-1.0.3" sources."moment-2.24.0" sources."ms-2.0.0" sources."multimatch-4.0.0" @@ -84617,11 +84581,12 @@ in (sources."mv-2.1.1" // { dependencies = [ sources."glob-6.0.4" + sources."mkdirp-0.5.5" sources."rimraf-2.4.5" ]; }) sources."mz-2.7.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" @@ -84637,7 +84602,11 @@ in }) sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" - sources."npm-run-path-2.0.2" + (sources."npm-run-path-4.0.1" // { + dependencies = [ + sources."path-key-3.1.1" + ]; + }) sources."nth-check-1.0.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -84666,12 +84635,11 @@ in sources."open-7.0.0" sources."optionator-0.8.3" sources."os-homedir-1.0.2" - sources."os-locale-4.0.0" + sources."os-locale-5.0.0" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-defer-1.0.0" - sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -84698,11 +84666,11 @@ in sources."path-parse-1.0.6" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pino-5.15.0" + sources."pino-6.0.0" sources."pino-std-serializers-2.4.2" sources."pluralize-1.2.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.26" // { + (sources."postcss-7.0.27" // { dependencies = [ sources."ansi-styles-3.2.1" (sources."chalk-2.4.2" // { @@ -84725,7 +84693,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."quick-format-unescaped-3.0.3" + sources."quick-format-unescaped-4.0.1" (sources."rc-1.2.8" // { dependencies = [ sources."strip-json-comments-2.0.1" @@ -84769,7 +84737,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."require-uncached-1.0.3" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-1.0.1" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -84784,7 +84752,7 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-7.1.1" + sources."semver-7.1.3" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -84806,6 +84774,7 @@ in (sources."sign-addon-2.0.5" // { dependencies = [ sources."core-js-3.6.4" + sources."es6-promisify-6.0.2" sources."punycode-1.4.1" sources."request-2.88.0" sources."tough-cookie-2.4.3" @@ -84817,6 +84786,7 @@ in sources."ansi-styles-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."is-fullwidth-code-point-2.0.0" ]; }) (sources."snapdragon-0.8.2" // { @@ -84849,7 +84819,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."sonic-boom-0.7.7" + sources."sonic-boom-1.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.16" @@ -84884,10 +84854,10 @@ in sources."once-1.3.3" ]; }) - (sources."string-width-2.1.1" // { + (sources."string-width-4.2.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" ]; }) sources."string.prototype.trimend-1.0.1" @@ -84899,12 +84869,14 @@ in sources."strip-bom-4.0.0" sources."strip-bom-buf-2.0.0" sources."strip-bom-stream-4.0.0" - sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.0.1" sources."supports-color-7.1.0" (sources."table-5.4.6" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -84971,37 +84943,30 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."watchpack-1.6.0" + sources."watchpack-1.6.1" sources."wcwidth-1.0.1" sources."webidl-conversions-5.0.0" sources."whatwg-url-8.0.0" sources."when-3.7.7" sources."which-1.3.1" sources."which-module-2.0.0" - (sources."widest-line-3.1.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - ]; - }) + sources."widest-line-3.1.0" sources."winreg-0.0.12" sources."word-wrap-1.2.3" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" sources."strip-ansi-6.0.0" ]; }) sources."wrappy-1.0.2" - sources."write-1.0.3" + (sources."write-1.0.3" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) sources."write-file-atomic-3.0.3" - sources."ws-7.2.1" + sources."ws-7.2.3" sources."xdg-basedir-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -85010,15 +84975,11 @@ in sources."y18n-4.0.0" (sources."yargs-15.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."decamelize-1.2.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" + sources."yargs-parser-16.1.0" ]; }) - (sources."yargs-parser-16.1.0" // { + (sources."yargs-parser-18.1.3" // { dependencies = [ sources."decamelize-1.2.0" ]; @@ -85040,7 +85001,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A command line tool to help build, run, and test web extensions"; - homepage = "https://github.com/mozilla/web-ext"; + homepage = https://github.com/mozilla/web-ext; license = "MPL-2.0"; }; production = true; @@ -85050,10 +85011,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.42.1"; + version = "4.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; - sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; + sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; dependencies = [ sources."@webassemblyjs/ast-1.9.0" @@ -85077,7 +85038,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-6.4.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" (sources."anymatch-2.0.0" // { @@ -85306,7 +85267,7 @@ in sources."mkdirp-0.5.5" sources."move-concurrently-1.0.1" sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."neo-async-2.6.1" (sources."node-libs-browser-2.2.1" // { @@ -85418,7 +85379,7 @@ in sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.18" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -85516,7 +85477,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; - homepage = "https://github.com/webpack/webpack"; + homepage = https://github.com/webpack/webpack; license = "MIT"; }; production = true; @@ -85864,9 +85825,9 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."ansi-colors-3.2.4" @@ -86164,7 +86125,7 @@ in sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."nice-try-1.0.5" @@ -86463,7 +86424,7 @@ in sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg=="; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."ansi-colors-3.2.4" @@ -86581,7 +86542,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Copy files && directories with webpack"; - homepage = "https://github.com/webpack-contrib/copy-webpack-plugin"; + homepage = https://github.com/webpack-contrib/copy-webpack-plugin; license = "MIT"; }; production = true; @@ -86608,7 +86569,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.19" + sources."@types/node-13.13.2" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -86781,7 +86742,7 @@ in }) sources."prettier-bytes-1.0.4" sources."process-nextick-args-2.0.1" - sources."protobufjs-6.8.9" + sources."protobufjs-6.9.0" sources."pump-3.0.0" sources."qap-3.3.1" sources."queue-microtask-1.1.2" @@ -86809,7 +86770,7 @@ in sources."semver-5.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - (sources."simple-peer-9.6.2" // { + (sources."simple-peer-9.7.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -86878,7 +86839,7 @@ in buildInputs = globalBuildInputs; meta = { description = "WebTorrent, the streaming torrent client. For the command line."; - homepage = "https://webtorrent.io/"; + homepage = https://webtorrent.io/; license = "MIT"; }; production = true; @@ -87019,10 +86980,10 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.0.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -87589,7 +87550,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -87659,7 +87620,7 @@ in sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -87832,7 +87793,7 @@ in ]; }) sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-2.9.1" // { + (sources."yeoman-environment-2.9.5" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" @@ -87878,13 +87839,13 @@ in sources."which-2.0.2" ]; }) - (sources."yeoman-generator-4.8.2" // { + (sources."yeoman-generator-4.8.3" // { dependencies = [ sources."debug-4.1.1" sources."diff-4.0.2" sources."find-up-3.0.0" sources."locate-path-3.0.0" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -87917,11 +87878,11 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for running Yeoman generators"; - homepage = "http://yeoman.io/"; + homepage = http://yeoman.io/; license = "BSD-2-Clause"; }; production = true; bypassCache = true; reconstructLock = true; }; -} +} \ No newline at end of file diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 51f1e20662a6..7b54d8cd5f1b 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.12.7"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "c63f76d1ce2261eb0cd147a24be25daff399e7df2c3d6ade3e813d2e9cb7d42f"; + sha256 = "00i8732qib86xqa3652vkr178ib3682cls4jcv5g52y0rlkd8bfg"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index ef1553e6d09a..fe401d9483e2 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -7,15 +7,16 @@ , markdown , pyct , testpath +, tqdm }: buildPythonPackage rec { pname = "panel"; - version = "0.7.0"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "71d446f469b424cb190bc896e78d0415b2bbebf17c6e5b024ed1a73b4448f8f4"; + sha256 = "0iz20k7mqn0560r4358yrzvrrfn00h8s6dim7p7y4icpgjw2mjnb"; }; propagatedBuildInputs = [ @@ -25,6 +26,7 @@ buildPythonPackage rec { markdown pyct testpath + tqdm ]; # infinite recursion in test dependencies (hvplot) diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 3467cb488f50..096bb2cfb910 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "param"; - version = "1.9.2"; + version = "1.9.3"; src = fetchPypi { inherit pname version; - sha256 = "a2dcb07c6a4ff48bade69bb5d30d84a96911a7e9dcb76b6de975453f933332f8"; + sha256 = "10crjlsn5vx03xwlnhga9faqq2rlw0qwabi45vnvhmz22qbd8w43"; }; checkInputs = [ flake8 nose ]; diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix new file mode 100644 index 000000000000..eaf20baf75c3 --- /dev/null +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, setuptools_scm +, cython +}: + +buildPythonPackage rec { + pname = "pyclipper"; + version = "1.1.0.post3"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "164yksvqwqvwzh8f8lq92asg87hd8rvcy2xb5vm4y4ccvd5xgb7i"; + }; + + nativeBuildInputs = [ + setuptools_scm + cython + ]; + + # Requires pytest_runner to perform tests, which requires deprecated + # features of setuptools. Seems better to not run tests. This should + # be fixed upstream. + doCheck = false; + pythonImportsCheck = [ "pyclipper" ]; + + meta = with stdenv.lib; { + description = "Cython wrapper for clipper library"; + homepage = "https://github.com/fonttools/pyclipper"; + license = licenses.mit; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index c62399db1178..4bb0bce52eb0 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.2"; + version = "0.7.4"; src = fetchPypi { inherit pname version; - sha256 = "c1722a496b08eb20ae3f2fedcc1ebcd207567b62e6453c7198a0b8f78ae96049"; + sha256 = "092nl8pq1jqdylj0xyqwgi5qxvhy6qj2nx2lwwfkbnixlg6g8bbi"; }; propagatedBuildInputs = [ param ]; diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 8274c50f582d..ebe23e19737f 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "1zpnhigsa0cyr3lj0h7z2xhi01zjrnakvvrgmqz4lyf5gabh9vcg"; + sha256 = "1xinaxxdsyhy8jl6albw8q9nl12iq11xny6a6a55niqzhvy1sdmp"; }; - cargoSha256 = "1rdh1b240gcjbk3wc384x459lbp8dy9a9mgrampqjk1n115zgbzp"; + cargoSha256 = "0i326vny4gygalsimsgkqsvlq09av8pv9a7a0yxcbk170a7zyxb0"; meta = with lib; { description = diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index ec500db47d98..7eccf4d0c378 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-04-06"; + rev = "2020-04-20"; version = "unstable-${rev}"; - sha256 = "0cm12707rq88w9yd4kkh26pnaqfvif6yyshk42pfi9vyv4ljfpcv"; - cargoSha256 = "0q1qwji407pmklwb27z2jwyrvwyn8zkmrwm4nbcgk53ci4p6a17k"; + sha256 = "00v8b6pbm5fry6bfkrfd7phn0ps8annqrw9k71m3pd26sxnn1q5f"; + cargoSha256 = "0nd86gwlfjwdkcphpk8zvs95xxdm8p74wl7vcrx8fnvvfxnkpwmc"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index feedfc2603e7..ea860af1fdf5 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 -, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib }: +, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsaLib }: stdenv.mkDerivation rec { pname = "mednafen"; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { libGLU libGL libcdio libjack2 + alsaLib libsamplerate libsndfile libX11 diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index 5769db505d8a..d42da3bbc5bd 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -4,16 +4,16 @@ "dependencies": { "jsonc-parser": "^2.2.1", "node-fetch": "^2.6.0", - "vscode-languageclient": "6.1.3", + "vscode-languageclient": "7.0.0-next.1", "@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-node-resolve": "^7.1.1", "@types/node": "^12.12.34", "@types/node-fetch": "^2.5.5", - "@types/vscode": "1.43.0", - "@typescript-eslint/eslint-plugin": "^2.26.0", - "@typescript-eslint/parser": "^2.26.0", + "@types/vscode": "1.44.0", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", "eslint": "^6.8.0", - "rollup": "^2.3.2", + "rollup": "^2.3.3", "tslib": "^1.11.1", "typescript": "^3.8.3", "typescript-formatter": "^7.2.2", diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 6eb83ee8bb1e..f916ad13488f 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -9,7 +9,7 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.117.a/linux-hardened-4.19.117.a.patch", "version_suffix": "a" }, - "5.4.34": { + "5.4.35": { "sha256": "1xwpqr9nzpjg837b3wnzb8fmrl2g9rz8gz5yb55vnnllbzbz36v6", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.34.a/linux-hardened-5.4.34.a.patch", "version_suffix": "a" @@ -19,7 +19,7 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch", "version_suffix": "a" }, - "5.6.6": { + "5.6.7": { "sha256": "0jiqh0frxirjbccgfdk007fca6r6n36n0pkqq4jszkckn59ayl7r", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.6.a/linux-hardened-5.6.6.a.patch", "version_suffix": "a" diff --git a/pkgs/os-specific/linux/zenstates/default.nix b/pkgs/os-specific/linux/zenstates/default.nix new file mode 100644 index 000000000000..4ac77c00aa3b --- /dev/null +++ b/pkgs/os-specific/linux/zenstates/default.nix @@ -0,0 +1,54 @@ +# Zenstates provides access to a variety of CPU tunables no Ryzen processors. +# +# In particular, I am adding Zenstates because I need it to disable the C6 +# sleep state to stabilize wake from sleep on my Lenovo x395 system. After +# installing Zenstates, I need a before-sleep script like so: +# +# before-sleep = pkgs.writeScript "before-sleep" '' +# #!${pkgs.bash}/bin/bash +# ${pkgs.zenstates}/bin/zenstates --c6-disable +# ''; +# +# ... +# +# systemd.services.before-sleep = { +# description = "Jobs to run before going to sleep"; +# serviceConfig = { +# Type = "oneshot"; +# ExecStart = "${before-sleep}"; +# }; +# wantedBy = [ "sleep.target" ]; +# before = [ "sleep.target" ]; +# }; + +{ stdenv, fetchFromGitHub, python3 }: +stdenv.mkDerivation rec { + pname = "zenstates"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "r4m0n"; + repo = "ZenStates-Linux"; + rev = "0bc27f4740e382f2a2896dc1dabfec1d0ac96818"; + sha256 = "1h1h2n50d2cwcyw3zp4lamfvrdjy1gjghffvl3qrp6arfsfa615y"; + }; + + buildInputs = [ python3 ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cp $src/zenstates.py $out/bin/zenstates + chmod +x $out/bin/zenstates + patchShebangs --build $out/bin/zenstates + ''; + + meta = with stdenv.lib; { + description = "Linux utility for Ryzen processors and motherboards"; + homepage = "https://github.com/r4m0n/ZenStates-Linux"; + license = licenses.mit; + maintainers = with maintainers; [ savannidgerinel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index b5fec49b910d..ce24cc7071fe 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "9.0.2"; + version = "9.0.3"; src = fetchzip { url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip"; - sha256 = "0yavkmwhjb8i4j3g57nda77simlf1dj1m751xzbgxxq6nd0q73lw"; + sha256 = "0nlfa6wwgj04xgg4ps5gpjp4iq2lmas97y5qz61lhns1p42xr4ls"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index ac50717208aa..66e534a0f9ab 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.7.2"; + version = "6.7.3"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "03f6f9caxphrfbps0ljwwiq246vfjlznd8xs7a7va7kb823ff5li"; + sha256 = "14yrfrn59r3mxbkhs7mg7nlhnvvrmq959r8w4aj6m7wgr32jj8wl"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0sgpc34jfldi0hkbqx9idkzm1n1jy82yhg29kdsvndxvi44z49lv"; + sha256 = "17h70h6cz1bdhczjqa68kxzfm4vi95zdnqzah8hcjr7rwnx874kr"; }; postPatch = '' diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index ec325fc3e42e..8ba7e9c96cfc 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -125,7 +125,7 @@ let disallowedReferences = [ stdenv.cc ]; passthru = { - inherit readline psqlSchema version; + inherit readline psqlSchema; pkgs = let scope = { postgresql = this; }; diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 47336e54d67e..077116767c3b 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "powerline-go"; - version = "1.15.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; rev = "v${version}"; - sha256 = "06i07m68l24v29j01qp2y91rwsfqh4x1nc8sxkjzrc7q1c7fsc1r"; + sha256 = "135j18d53nhg6adjd2hax067c5f1py9fyprzfcr3plsxnaki2hrx"; }; modSha256 = "0mz1qrwar9cgrhrgw4z3gwhjj62bnfnn59ji31zkyvwlc1mqh9an"; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index ae70a82de4fe..fd17de60f202 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, utillinux}: +{ stdenv, fetchurl, utillinux, coreutils}: stdenv.mkDerivation rec { version = "6.36"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { # $HOME detection fails (and is unnecessary) sed -i '/^HOME/d' $out/bin/profile-sync-daemon substituteInPlace $out/bin/psd-overlay-helper \ - --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin" + --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin:${coreutils}/bin" \ + --replace "sudo " "/run/wrappers/bin/sudo " ''; preferLocalBuild = true; diff --git a/pkgs/tools/networking/mosh/bash_completion_datadir.patch b/pkgs/tools/networking/mosh/bash_completion_datadir.patch new file mode 100644 index 000000000000..4b71f125d287 --- /dev/null +++ b/pkgs/tools/networking/mosh/bash_completion_datadir.patch @@ -0,0 +1,19 @@ +diff --git a/configure.ac b/configure.ac +index 3ad983d..ff8ff96 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -476,13 +476,7 @@ AS_IF([echo "$protobuf_LIBS" | grep -q -- -pthread], + + # Bash completion needs to ask where it goes if >= 2.0 is installed. + AS_IF([test "$install_completion" != no], +- [PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], +- [if test "$prefix" = "NONE"; then +- completions="`pkg-config --variable=completionsdir bash-completion`" +- else +- completions="`pkg-config --define-variable=prefix=$prefix --variable=completionsdir bash-completion`" +- fi], +- [completions="${sysconfdir}/bash_completion.d"]) ++ [completions="`pkg-config --define-variable=datadir=$datadir --variable=completionsdir bash-completion`"] + AC_SUBST([completions])]) + + AC_CONFIG_FILES([ diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 648fdb9d20e8..26c9035cd79b 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch"; sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm"; }) + # Fix build with bash-completion 2.10 + ./bash_completion_datadir.patch ]; postPatch = '' substituteInPlace scripts/mosh.pl \ diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 88ed0599c2ce..09ad8db46ea8 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "openvpn"; - version = "2.4.7"; + version = "2.4.9"; src = fetchurl { url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz"; - sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4"; + sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4"; }; nativeBuildInputs = [ pkgconfig ]; @@ -33,13 +33,6 @@ in stdenv.mkDerivation rec { ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper; - patches = [ - ( fetchpatch { - url = "https://sources.debian.org/data/main/o/openvpn/2.4.7-1/debian/patches/fix-pkcs11-helper-hang.patch"; - sha256 = "0c8jzbfsmb0mm9f7kkjxac1hk8q6igm267s687vx3mdqs1wys6bm"; - }) - ]; - configureFlags = optionals stdenv.isLinux [ "--enable-iproute2" "IPROUTE=${iproute}/sbin/ip" ] @@ -68,7 +61,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A robust and highly flexible tunneling application"; - downloadPage = "https://openvpn.net/index.php/open-source/downloads.html"; + downloadPage = "https://openvpn.net/community-downloads/"; homepage = "https://openvpn.net/"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index f3bd0a23d587..6b9279a8190f 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "152wmccz47anvx5w88qcz8higw80l17jl7i24xfj5574adviqnv2"; + sha256 = "1p5cvq0jsjkl136b8cz3j552x01g96j38ygh6m8ss62bmyzb8ayc"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix new file mode 100644 index 000000000000..a52ea88950c0 --- /dev/null +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -0,0 +1,138 @@ +{ stdenv, fetchFromGitHub, callPackage, makeWrapper +, clang, llvm, gcc, which, libcgroup, python, perl, gmp +, wine ? null +}: + +# wine fuzzing is only known to work for win32 binaries, and using a mixture of +# 32 and 64-bit libraries ... complicates things, so it's recommended to build +# a full 32bit version of this package if you want to do wine fuzzing +assert (wine != null) -> (stdenv.targetPlatform.system == "i686-linux"); + +let + aflplusplus-qemu = callPackage ./qemu.nix { inherit aflplusplus; }; + qemu-exe-name = if stdenv.targetPlatform.system == "x86_64-linux" then "qemu-x86_64" + else if stdenv.targetPlatform.system == "i686-linux" then "qemu-i386" + else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; + libdislocator = callPackage ./libdislocator.nix { inherit aflplusplus; }; + libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; + aflplusplus = stdenv.mkDerivation rec { + pname = "aflplusplus"; + version = "2.59c"; + + src = fetchFromGitHub { + owner = "vanhauser-thc"; + repo = "AFLplusplus"; + rev = version; + sha256 = "1ik33ifk4n96762iv1h4kl4jf9yvsq2hgs097wkiy589siw44g5r"; + }; + enableParallelBuilding = true; + + # Note: libcgroup isn't needed for building, just for the afl-cgroup + # script. + nativeBuildInputs = [ makeWrapper which ]; + buildInputs = [ llvm python gmp ] + ++ stdenv.lib.optional (wine != null) python.pkgs.wrapPython; + + makeFlags = [ "PREFIX=$(out)" ]; + buildPhase = '' + common="$makeFlags -j$NIX_BUILD_CORES" + make all $common + make radamsa $common + make -C gcc_plugin CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ $common + make -C llvm_mode $common + make -C qemu_mode/libcompcov $common + make -C qemu_mode/unsigaction $common + ''; + + postInstall = '' + # the makefile neglects to install unsigaction + cp qemu_mode/unsigaction/unsigaction*.so $out/lib/afl/ + + # Install the custom QEMU emulator for binary blob fuzzing. + cp ${aflplusplus-qemu}/bin/${qemu-exe-name} $out/bin/afl-qemu-trace + + # give user a convenient way of accessing libcompconv.so, libdislocator.so, libtokencap.so + cat > $out/bin/get-afl-qemu-libcompcov-so <<END + #!${stdenv.shell} + echo $out/lib/afl/libcompcov.so + END + chmod +x $out/bin/get-afl-qemu-libcompcov-so + cp ${libdislocator}/bin/get-libdislocator-so $out/bin/ + cp ${libtokencap}/bin/get-libtokencap-so $out/bin/ + + # Install the cgroups wrapper for asan-based fuzzing. + cp experimental/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup + chmod +x $out/bin/afl-cgroup + substituteInPlace $out/bin/afl-cgroup \ + --replace "cgcreate" "${libcgroup}/bin/cgcreate" \ + --replace "cgexec" "${libcgroup}/bin/cgexec" \ + --replace "cgdelete" "${libcgroup}/bin/cgdelete" + + # Patch shebangs before wrapping + patchShebangs $out/bin + + # Wrap afl-clang-fast(++) with a *different* AFL_PATH, because it + # has totally different semantics in that case(?) - and also set a + # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out + # of $PATH. + # first though we need to replace the afl-clang-fast++ symlink with + # a real copy to prevent wrapProgram skipping the symlink and confusing + # nix's cc wrapper + rm $out/bin/afl-clang-fast++ + cp $out/bin/afl-clang-fast $out/bin/afl-clang-fast++ + for x in $out/bin/afl-clang-fast $out/bin/afl-clang-fast++; do + wrapProgram $x \ + --set-default AFL_PATH "$out/lib/afl" \ + --run 'export AFL_CC=''${AFL_CC:-${clang}/bin/clang} AFL_CXX=''${AFL_CXX:-${clang}/bin/clang++}' + done + # do similar for afl-gcc and afl-gcc-fast + for x in $out/bin/afl-gcc $out/bin/afl-gcc-fast; do + wrapProgram $x \ + --set-default AFL_PATH "$out/lib/afl" \ + --run 'export AFL_CC=''${AFL_CC:-${gcc}/bin/gcc} AFL_CXX=''${AFL_CXX:-${gcc}/bin/g++}' + done + '' + stdenv.lib.optionalString (wine != null) '' + substitute afl-wine-trace $out/bin/afl-wine-trace \ + --replace "qemu_mode/unsigaction" "$out/lib/afl" + chmod +x $out/bin/afl-wine-trace + + # qemu needs to be fed ELFs, not wrapper scripts, so we have to cheat a bit if we + # detect a wrapped wine + for winePath in ${wine}/bin/.wine ${wine}/bin/wine; do + if [ -x $winePath ]; then break; fi + done + makeWrapperArgs="--set-default 'AFL_WINE_PATH' '$winePath'" \ + wrapPythonProgramsIn $out/bin ${python.pkgs.pefile} + ''; + + installCheckInputs = [ perl ]; + doInstallCheck = true; + installCheckPhase = '' + # replace references to tools in build directory with references to installed locations + substituteInPlace test/test.sh \ + --replace '`which gcc`' "" \ + --replace '../libcompcov.so' '`$out/bin/get-afl-qemu-libcompcov-so`' \ + --replace '../libdislocator.so' '`$out/bin/get-libdislocator-so`' \ + --replace '../libtokencap.so' '`$out/bin/get-libtokencap-so`' + perl -pi -e 's|(?<=\s)gcc(?=\s)|${gcc}/bin/gcc|g' test/test.sh + perl -pi -e 's|(\.\./)(\S+?)(?<!\.c)(?<!\.s?o)(?=\s)|\$out/bin/\2|g' test/test.sh + cd test && ./test.sh + ''; + + passthru = { + inherit libdislocator libtokencap; + qemu = aflplusplus-qemu; + }; + + meta = { + description = '' + AFL++ is a heavily enhanced version of AFL, incorporating many features and + improvements from the community. + ''; + homepage = "https://github.com/vanhauser-thc/AFLplusplus"; + license = stdenv.lib.licenses.asl20; + platforms = ["x86_64-linux" "i686-linux"]; + maintainers = with stdenv.lib.maintainers; [ ris ]; + }; + }; +in aflplusplus diff --git a/pkgs/tools/security/aflplusplus/libdislocator.nix b/pkgs/tools/security/aflplusplus/libdislocator.nix new file mode 100644 index 000000000000..d1d9dad6c5bc --- /dev/null +++ b/pkgs/tools/security/aflplusplus/libdislocator.nix @@ -0,0 +1,35 @@ +{ stdenv, aflplusplus}: + +stdenv.mkDerivation { + version = stdenv.lib.getVersion aflplusplus; + pname = "libdislocator"; + + src = aflplusplus.src; + postUnpack = "chmod -R +w ${aflplusplus.src.name}"; + sourceRoot = "${aflplusplus.src.name}/libdislocator"; + + makeFlags = [ "PREFIX=$(out)" ]; + + preInstall = '' + mkdir -p $out/lib/afl + ''; + postInstall = '' + mkdir $out/bin + cat > $out/bin/get-libdislocator-so <<END + #!${stdenv.shell} + echo $out/lib/afl/libdislocator.so + END + chmod +x $out/bin/get-libdislocator-so + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/vanhauser-thc/AFLplusplus"; + description = '' + Drop-in replacement for the libc allocator which improves + the odds of bumping into heap-related security bugs in + several ways. + ''; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/tools/security/aflplusplus/libtokencap.nix b/pkgs/tools/security/aflplusplus/libtokencap.nix new file mode 100644 index 000000000000..830708227e31 --- /dev/null +++ b/pkgs/tools/security/aflplusplus/libtokencap.nix @@ -0,0 +1,31 @@ +{ stdenv, aflplusplus}: + +stdenv.mkDerivation { + version = stdenv.lib.getVersion aflplusplus; + pname = "libtokencap"; + + src = aflplusplus.src; + postUnpack = "chmod -R +w ${aflplusplus.src.name}"; + sourceRoot = "${aflplusplus.src.name}/libtokencap"; + + makeFlags = [ "PREFIX=$(out)" ]; + + preInstall = '' + mkdir -p $out/lib/afl + ''; + postInstall = '' + mkdir $out/bin + cat > $out/bin/get-libtokencap-so <<END + #!${stdenv.shell} + echo $out/lib/afl/libtokencap.so + END + chmod +x $out/bin/get-libtokencap-so + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/vanhauser-thc/AFLplusplus"; + description = "strcmp & memcmp token capture library"; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch b/pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch new file mode 100644 index 000000000000..5dfbfd780f1c --- /dev/null +++ b/pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index d6b9dc1..ce7c493 100644 +--- a/Makefile ++++ b/Makefile +@@ -601,7 +601,7 @@ install-localstatedir: + endif + + +-install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir ++install: all $(if $(BUILD_DOCS),install-doc) install-datadir + ifneq ($(TOOLS),) + $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) + endif diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix new file mode 100644 index 000000000000..202657dac9ae --- /dev/null +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -0,0 +1,77 @@ +{ stdenv, fetchurl, aflplusplus, python2, zlib, pkgconfig, glib, perl +, texinfo, libuuid, flex, bison, pixman, autoconf +}: + +with stdenv.lib; + +let + qemuName = "qemu-3.1.0"; + cpuTarget = if stdenv.targetPlatform.system == "x86_64-linux" then "x86_64-linux-user" + else if stdenv.targetPlatform.system == "i686-linux" then "i386-linux-user" + else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; +in +stdenv.mkDerivation { + name = "aflplusplus-${qemuName}"; + + srcs = [ + (fetchurl { + url = "http://wiki.qemu.org/download/${qemuName}.tar.bz2"; + sha256 = "08frr1fdjx8qcfh3fafn10kibdwbvkqqvfl7hpqbm7i9dg4f1zlq"; + }) + aflplusplus.src + ]; + + sourceRoot = qemuName; + + postUnpack = '' + chmod -R +w ${aflplusplus.src.name} + for f in ${aflplusplus.src.name}/qemu_mode/patches/* ; do + sed -E -i 's|(\.\./)+patches/([a-z-]+\.h)|\2|g' $f + sed -E -i 's|\.\./\.\./config\.h|afl-config.h|g' $f + done + cp ${aflplusplus.src.name}/qemu_mode/patches/*.h $sourceRoot/ + cp ${aflplusplus.src.name}/types.h $sourceRoot/afl-types.h + substitute ${aflplusplus.src.name}/config.h $sourceRoot/afl-config.h \ + --replace "types.h" "afl-types.h" + + cat ${aflplusplus.src.name}/qemu_mode/patches/*.diff > all.patch + ''; + + nativeBuildInputs = [ + python2 perl pkgconfig flex bison autoconf texinfo + ]; + + buildInputs = [ + zlib glib pixman libuuid + ]; + + enableParallelBuilding = true; + + patches = [ + # patches extracted from aflplusplus source + "../all.patch" + # nix-specific patches to make installation more well-behaved + ./qemu-no-etc-install.patch + ]; + + configureFlags = + [ "--disable-system" + "--enable-linux-user" + "--disable-gtk" + "--disable-sdl" + "--disable-vnc" + "--disable-kvm" + "--target-list=${cpuTarget}" + "--enable-pie" + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + meta = with stdenv.lib; { + homepage = http://www.qemu.org/; + description = "Fork of QEMU with AFL++ instrumentation support"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ris ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index a12f07d6da61..0e905be01f22 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "15siv3p22v7lj37b74pjsy360qx97d40q2xdzdg2srbi8svjgg27"; + sha256 = "0y1mabnp0sbvayn695x1yfw04d2bky0r69wyidld6hllq3kqn9y2"; }; - cargoSha256 = "1sa7ki7kyg98l2gcrdzk7182ghm1clyqljjb596mhzh48g8kddn5"; + cargoSha256 = "1ra6argxs5dmpxhrr3az21myp27fl3nkdjfqn8cam2xhld1y270l"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 8c57fdeed005..dced8672ee62 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -21,6 +21,6 @@ buildGoPackage rec { description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; homepage = "https://github.com/kubernetes-sigs/cri-tools"; license = lib.licenses.asl20; - maintainers = with maintainers; [ saschagrunert ]; + maintainers = with maintainers; [ ] ++ teams.podman.members; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02352346e47d..edc98cfb2754 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -585,6 +585,12 @@ in stdenv = clangStdenv; }; + aflplusplus = callPackage ../tools/security/aflplusplus { + stdenv = clangStdenv; + python = python37; + wine = null; + }; + libdislocator = callPackage ../tools/security/afl/libdislocator.nix { }; afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; @@ -22270,6 +22276,8 @@ in uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); uefitool = uefitoolPackages.new-engine; + ungoogled-chromium = callPackage ../applications/networking/browsers/ungoogled-chromium (config.chromium or {}); + unigine-valley = callPackage ../applications/graphics/unigine-valley { }; unison = callPackage ../applications/networking/sync/unison { @@ -26497,4 +26505,5 @@ in jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; + zenstates = callPackage ../os-specific/linux/zenstates {}; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 27b7f852707d..b3597404edd5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12251,6 +12251,22 @@ let }; }; + MojoliciousPluginTextExceptions = buildPerlPackage { + pname = "Mojolicious-Plugin-TextExceptions"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Mojolicious-Plugin-TextExceptions-0.01.tar.gz"; + sha256 = "070daf284c5d3832b7fde42120eaf747aea4cc75de8ff807f77accc84fe4f22e"; + }; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + homepage = "https://github.com/marcusramberg/mojolicious-plugin-textexceptions"; + description = "Render exceptions as text in command line user agents"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + MojoRedis = buildPerlPackage { pname = "Mojo-Redis"; version = "3.24"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea246c3f86a5..3276a9bfcd47 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1071,6 +1071,8 @@ in { purl = callPackage ../development/python-modules/purl { }; + pyclipper = callPackage ../development/python-modules/pyclipper { }; + pymystem3 = callPackage ../development/python-modules/pymystem3 { }; pymysql = callPackage ../development/python-modules/pymysql { }; |