diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index bfe1d17a6067..7ff4b2aeb369 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -151,6 +151,12 @@ Create a Docker image with many of the store paths being on their own layer to i : Shell commands to run while creating the archive for the final layer in a fakeroot environment. Unlike `extraCommands`, you can run `chown` to change the owners of the files in the archive, changing fakeroot's state instead of the real filesystem. The latter would require privileges that the build user does not have. Static binaries do not interact with the fakeroot environment. By default all files in the archive will be owned by root. +`enableFakechroot` _optional_ + +: Whether to run in `fakeRootCommands` in `fakechroot`, making programs behave as though `/` is the root of the image being created, while files in the Nix store are available as usual. This allows scripts that perform installation in `/` to work as expected. Considering that `fakechroot` is implemented via the same mechanism as `fakeroot`, the same caveats apply. + + *Default:* `false` + ### Behavior of `contents` in the final image {#dockerTools-buildLayeredImage-arg-contents} Each path directly listed in `contents` will have a symlink in the root of the image. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1d51fca02fbf..f36e7dd67eae 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -898,6 +898,7 @@ ./services/networking/unbound.nix ./services/networking/unifi.nix ./services/video/unifi-video.nix + ./services/video/rtsp-simple-server.nix ./services/networking/v2ray.nix ./services/networking/vsftpd.nix ./services/networking/wasabibackend.nix diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index fd9c216b0602..8a2c0fc7080c 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -31,8 +31,8 @@ let preStart = '' install ${configFile} /run/${RuntimeDirectory}/ddclient.conf ${lib.optionalString (cfg.configFile == null) (if (cfg.passwordFile != null) then '' - password=$(head -n 1 ${cfg.passwordFile}) - sed -i "s/^password=$/password=$password/" /run/${RuntimeDirectory}/ddclient.conf + password=$(printf "%q" "$(head -n 1 "${cfg.passwordFile}")") + sed -i "s|^password=$|password=$password|" /run/${RuntimeDirectory}/ddclient.conf '' else '' sed -i '/^password=$/d' /run/${RuntimeDirectory}/ddclient.conf '')} diff --git a/nixos/modules/services/video/rtsp-simple-server.nix b/nixos/modules/services/video/rtsp-simple-server.nix new file mode 100644 index 000000000000..644b1945a1ec --- /dev/null +++ b/nixos/modules/services/video/rtsp-simple-server.nix @@ -0,0 +1,80 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.rtsp-simple-server; + package = pkgs.rtsp-simple-server; + format = pkgs.formats.yaml {}; +in +{ + options = { + services.rtsp-simple-server = { + enable = mkEnableOption "RTSP Simple Server"; + + settings = mkOption { + description = '' + Settings for rtsp-simple-server. + Read more at + ''; + type = format.type; + + default = { + logLevel = "info"; + logDestinations = [ + "stdout" + ]; + # we set this so when the user uses it, it just works (see LogsDirectory below). but it's not used by default. + logFile = "/var/log/rtsp-simple-server/rtsp-simple-server.log"; + }; + + example = { + paths = { + cam = { + runOnInit = "ffmpeg -f v4l2 -i /dev/video0 -f rtsp rtsp://localhost:$RTSP_PORT/$RTSP_PATH"; + runOnInitRestart = true; + }; + }; + }; + }; + + env = mkOption { + type = with types; attrsOf anything; + description = "Extra environment variables for RTSP Simple Server"; + default = {}; + example = { + RTSP_CONFKEY = "mykey"; + }; + }; + }; + }; + + config = mkIf (cfg.enable) { + # NOTE: rtsp-simple-server watches this file and automatically reloads if it changes + environment.etc."rtsp-simple-server.yaml".source = format.generate "rtsp-simple-server.yaml" cfg.settings; + + systemd.services.rtsp-simple-server = { + environment = cfg.env; + + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + path = with pkgs; [ + ffmpeg + ]; + + serviceConfig = { + DynamicUser = true; + User = "rtsp-simple-server"; + Group = "rtsp-simple-server"; + + LogsDirectory = "rtsp-simple-server"; + + # user likely may want to stream cameras, can't hurt to add video group + SupplementaryGroups = "video"; + + ExecStart = "${package}/bin/rtsp-simple-server /etc/rtsp-simple-server.yaml"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 04ec7888950d..b1a536e519db 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -153,7 +153,7 @@ in { package = mkOption { type = types.package; description = "Which package to use for the Nextcloud instance."; - relatedPackages = [ "nextcloud21" "nextcloud22" ]; + relatedPackages = [ "nextcloud21" "nextcloud22" "nextcloud23" ]; }; phpPackage = mkOption { type = types.package; @@ -508,7 +508,7 @@ in { config = mkIf cfg.enable (mkMerge [ { warnings = let - latest = 22; + latest = 23; upgradeWarning = major: nixos: '' A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. @@ -543,6 +543,7 @@ in { '') ++ (optional (versionOlder cfg.package.version "21") (upgradeWarning 20 "21.05")) ++ (optional (versionOlder cfg.package.version "22") (upgradeWarning 21 "21.11")) + ++ (optional (versionOlder cfg.package.version "23") (upgradeWarning 22 "22.05")) ++ (optional isUnsupportedMariadb '' You seem to be using MariaDB at an unsupported version (i.e. at least 10.6)! Please note that this isn't supported officially by Nextcloud. You can either @@ -573,7 +574,8 @@ in { # nextcloud20 throws an eval-error because it's dropped). else if versionOlder stateVersion "21.03" then nextcloud20 else if versionOlder stateVersion "21.11" then nextcloud21 - else nextcloud22 + else if versionOlder stateVersion "22.05" then nextcloud22 + else nextcloud23 ); services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home; diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 9d9cb8dfb3f2..8f55086a2bd1 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -11,7 +11,7 @@ desktop client is packaged at pkgs.nextcloud-client. - The current default by NixOS is nextcloud22 which is also the latest + The current default by NixOS is nextcloud23 which is also the latest major version available.
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index f3858b8bd81e..19ebed3ebd0b 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -396,6 +396,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { "tar -tf ${examples.exportBash} | grep '\./bin/bash' > /dev/null" ) + with subtest("layered image fakeRootCommands with fakechroot works"): + docker.succeed("${examples.imageViaFakeChroot} | docker load") + docker.succeed("docker run --rm image-via-fake-chroot | grep -i hello") + docker.succeed("docker image rm image-via-fake-chroot:latest") + with subtest("Ensure bare paths in contents are loaded correctly"): docker.succeed( "docker load --input='${examples.build-image-with-path}'", diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index bd7a7aacdc91..34d3c345354c 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -1,6 +1,6 @@ -{ system ? builtins.currentSystem, - config ? {}, - pkgs ? import ../../.. { inherit system config; } +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../../.. { inherit system config; } }: with pkgs.lib; @@ -17,5 +17,5 @@ foldl nextcloudVersion = ver; }; }) - {} - [ 21 22 ] +{ } + [ 21 22 23 ] diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index db5f8275386a..fae273be6674 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -281,12 +281,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.2.3"; /* updated by script */ + version = "2021.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "166rhssyizn40rlar7ym7gkwz2aawp58qqvrs60w3cwwvjvb0bjq"; /* updated by script */ + sha256 = "0xrhgqbsyd2plzkkmy00bwsa8dk4ijszmhmbyn6c9ygl01zhji6y"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -294,12 +294,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.2.3"; /* updated by script */ + version = "2021.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1d0kk2yydrbzvdy6dy9jqr182panidmbf2hy80gvi5ph2r5rv1qd"; /* updated by script */ + sha256 = "0riwww75aizprb01c1sccprbr00ky5wgy5cxxjxqgm8v72rfnihb"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -373,12 +373,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2021.2.3"; /* updated by script */ + version = "2021.3"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0bbq5ya1dxrgaqqqsc4in4rgv7v292hww3bb0vpzwz6dmc2jly1i"; /* updated by script */ + sha256 = "1vmybxnwyv7wiv3clm857yvzlws0bcza01wx8jm0dbnrzq38dz4d"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -386,12 +386,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2021.2.3"; /* updated by script */ + version = "2021.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0d79x1jz4ymd6cc1n4s3y3n8lb6gw4g0yj6d4qzjlr5c9snx3zdf"; /* updated by script */ + sha256 = "1llz97r95xrf7yixgbfipg153qikkxziwwhv9dvvi29v7pi1k4ys"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index 6c9cee851486..b82c3ff96288 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -5,19 +5,19 @@ stdenv.mkDerivation rec { pname = "tev"; - version = "1.17"; + version = "1.19"; src = fetchFromGitHub { owner = "Tom94"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "12wsy2zdfhg0ygkpvz58rk86qiy259fi9grb0jxiz8zcyd6x1ngk"; + sha256 = "sha256-laP47xOND6PMA6dwTcCupcTIW+9zCaxO6rHzvDSL9JU="; }; nativeBuildInputs = [ cmake wrapGAppsHook ]; buildInputs = [ libX11 libzip glfw libpng ] - ++ (with xorg; [ libXrandr libXinerama libXcursor libXi libXxf86vm ]); + ++ (with xorg; [ libXrandr libXinerama libXcursor libXi libXxf86vm libXext ]); dontWrapGApps = true; # We also need zenity (see below) @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Tom94/tev/releases/tag/v${version}"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 09ce39027b5a..5ab0bfd8030d 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "aerc"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromSourcehut { - owner = "~sircmpwn"; + owner = "~rjarry"; repo = pname; rev = version; - sha256 = "1ja639qry8h2d6y7qshf62ypkzs2rzady59p81scqh8nx0g9bils"; + sha256 = "sha256-RaHigTp1YGkjQ46gFLhKcJuajekcCgfozu0ndCNq5Ac="; }; runVend = true; - vendorSha256 = "9PXdUH0gu8PGaKlRJCUF15W1/LxA+sv3Pwl2UnjYxWY="; + vendorSha256 = "sha256-A2MZzTYzGuZLFENn9OBIBBreJan+b3RKOEu5bQcDwS8="; doCheck = false; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 980f0e519416..86abd894f39c 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "sha256-rQsicAUKlQYxA/DH8691jp6Pk97rer2X2CXUfXKHLDE="; + sha256 = "sha256-LABadIux5YId62+t8qXJvBTvB5Beu4u4D0HebNJibxY="; }; - cargoSha256 = "sha256-NjyiGr7mwsHlggMQEKcCvOCfGabRJDBdrYW8ohU02mk="; + cargoSha256 = "sha256-W2OBvVFCaykT/GRIUASsyNlkOk2Bp8yufoMXPX4oryA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 7958db917122..9a20df57777c 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -5,6 +5,7 @@ , closureInfo , coreutils , e2fsprogs +, fakechroot , fakeroot , findutils , go @@ -34,6 +35,10 @@ }: let + inherit (lib) + optionals + optionalString + ; inherit (lib) escapeShellArgs @@ -811,6 +816,10 @@ rec { , # Optional bash script to run inside fakeroot environment. # Could be used for changing ownership of files in customisation layer. fakeRootCommands ? "" + , # Whether to run fakeRootCommands in fakechroot as well, so that they + # appear to run inside the image, but have access to the normal Nix store. + # Perhaps this could be enabled on by default on pkgs.stdenv.buildPlatform.isLinux + enableFakechroot ? false , # We pick 100 to ensure there is plenty of room for extension. I # believe the actual maximum is 128. maxLayers ? 100 @@ -842,16 +851,26 @@ rec { name = "${baseName}-customisation-layer"; paths = contentsList; inherit extraCommands fakeRootCommands; - nativeBuildInputs = [ fakeroot ]; + nativeBuildInputs = [ + fakeroot + ] ++ optionals enableFakechroot [ + fakechroot + # for chroot + coreutils + # fakechroot needs getopt, which is provided by util-linux + util-linux + ]; postBuild = '' mv $out old_out (cd old_out; eval "$extraCommands" ) mkdir $out - - fakeroot bash -c ' + ${optionalString enableFakechroot '' + export FAKECHROOT_EXCLUDE_PATH=/dev:/proc:/sys:${builtins.storeDir}:$out/layer.tar + ''} + ${optionalString enableFakechroot ''fakechroot chroot $PWD/old_out ''}fakeroot bash -c ' source $stdenv/setup - cd old_out + ${optionalString (!enableFakechroot) ''cd old_out''} eval "$fakeRootCommands" tar \ --sort name \ diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index bef0c5848693..f2d4f809ae4e 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -562,6 +562,20 @@ rec { # Example export of the bash image exportBash = pkgs.dockerTools.exportImage { fromImage = bash; }; + imageViaFakeChroot = pkgs.dockerTools.streamLayeredImage { + name = "image-via-fake-chroot"; + tag = "latest"; + config.Cmd = [ "hello" ]; + enableFakechroot = true; + # Crucially, instead of a relative path, this creates /bin, which is + # intercepted by fakechroot. + # This functionality is not available on darwin as of 2021. + fakeRootCommands = '' + mkdir /bin + ln -s ${pkgs.hello}/bin/hello /bin/hello + ''; + }; + build-image-with-path = buildImage { name = "build-image-with-path"; tag = "latest"; diff --git a/pkgs/desktops/gnome/extensions/extensionOverrides.nix b/pkgs/desktops/gnome/extensions/extensionOverrides.nix index f20c63d08016..357c3a73a513 100644 --- a/pkgs/desktops/gnome/extensions/extensionOverrides.nix +++ b/pkgs/desktops/gnome/extensions/extensionOverrides.nix @@ -2,6 +2,7 @@ , ddcutil , gjs , xprop +, touchegg }: let # Helper method to reduce redundancy @@ -47,4 +48,13 @@ super: lib.trivial.pipe super [ meta.maintainers = with lib.maintainers; [ rhoriguchi ]; })) + + (patchExtension "x11gestures@joseexposito.github.io" (old: { + # Extension can't find Touchegg + # https://github.com/NixOS/nixpkgs/issues/137621 + postPatch = '' + substituteInPlace "src/touchegg/ToucheggConfig.js" \ + --replace "GLib.build_filenamev([GLib.DIR_SEPARATOR_S, 'usr', 'share', 'touchegg', 'touchegg.conf'])" "'${touchegg}/share/touchegg/touchegg.conf'" + ''; + })) ] diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index b964da3cd3fe..1ab4705bae1e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -228,6 +228,7 @@ , "prettier" , "prettier-plugin-toml" , "prisma" +, "@prisma/language-server" , "pscid" , "pulp" , "purescript-language-server" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index bd18e97f1a6d..e2ff662b12e4 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2767,13 +2767,13 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/react-7.179.4" = { + "@fluentui/react-7.179.5" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.179.4"; + version = "7.179.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.179.4.tgz"; - sha512 = "XFoEgyE8z8zsnZShuri3E0n/9CZ695VW6UlOxVjxuwR8rOJ4w33eC/mhB5t3ey/UJpnADFrSzHN11XvBUvi3wg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.179.5.tgz"; + sha512 = "41Je7h5d12xrOjtUcdLnocalTallh8Z0QkPV8lhHBKJ8TpFvMzO2KVDzGMc8chv0V4Oa1K7w5EJr7891TpYZHw=="; }; }; "@fluentui/react-focus-7.18.1" = { @@ -4558,13 +4558,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.230" = { + "@microsoft/load-themed-styles-1.10.231" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.230"; + version = "1.10.231"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.230.tgz"; - sha512 = "EMc7AqUZxRnZTpnPasItHN5DXV/EdJ19wHyOls69PF089Ny9pUxZEbAPROOuR6I1m8WvNRJrlagLJgG9Yq0Y2w=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.231.tgz"; + sha512 = "F0XkQKGTRrAQJnexI8EARXyuxrNb9YFJbd/2TuTZO8tVKtbr2JhW4WxLoWX6u5VhZetUG5dcsO1LHiRbDWQ/pQ=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4873,13 +4873,13 @@ let sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; }; }; - "@oclif/command-1.8.4" = { + "@oclif/command-1.8.6" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.4"; + version = "1.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.4.tgz"; - sha512 = "fZVzaIzC0CSj5KCgAp84Z+LHqSwElA6G2lCRiQW4UfDaOx1CrHXbUCqGDBpV6lG1sobuJzKlsS6mh5fmJWeEyw=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.6.tgz"; + sha512 = "tIcGPpf7ndGe0Sp22RbPhZbwKjfrebHzCfe1SHRlqlJNy2xS3FT50i9p+dZmF+7Zpn4CEcBHag1TCdfFCTc1vQ=="; }; }; "@oclif/config-1.17.0" = { @@ -4891,13 +4891,13 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; - "@oclif/config-1.17.1" = { + "@oclif/config-1.18.1" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.17.1"; + version = "1.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.17.1.tgz"; - sha512 = "UqV5qsN2np96TNlJspSNlRl7CpFmxYSrB0iLe3XV9NDkbFEE5prGP++h6w6xOR/FL3QV7BoqrbwGuJdJdFbidw=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.1.tgz"; + sha512 = "twRJO5RRl3CCDaAASb6LiynfFQl/SbkWWOQy1l0kJZSMPysEhz+fk3BKfmlCCm451Btkp4UezHUwI1JtH+/zYg=="; }; }; "@oclif/core-0.5.41" = { @@ -5575,13 +5575,40 @@ let sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA=="; }; }; - "@prisma/engines-3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e" = { + "@prisma/debug-3.5.0" = { + name = "_at_prisma_slash_debug"; + packageName = "@prisma/debug"; + version = "3.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@prisma/debug/-/debug-3.5.0.tgz"; + sha512 = "JWBmzqxtbq6rJfMyIIQVL/QSAIsiCOp20ArTl5zUHtSYH/MrNmuQ69YAn9RuUQBOTIAQaVTIMII2xpN5kB5RRg=="; + }; + }; + "@prisma/engines-3.6.0-24.dc520b92b1ebb2d28dc3161f9f82e875bd35d727" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e"; + version = "3.6.0-24.dc520b92b1ebb2d28dc3161f9f82e875bd35d727"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e.tgz"; - sha512 = "MqZUrxuLlIbjB3wu8LrRJOKcvR4k3dunKoI4Q2bPfAwLQY0XlpsLZ3TRVW1c32ooVk939p6iGNkaCUo63Et36g=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.6.0-24.dc520b92b1ebb2d28dc3161f9f82e875bd35d727.tgz"; + sha512 = "dRClHS7DsTVchDKzeG72OaEyeDskCv91pnZ72Fftn0mp4BkUvX2LvWup65hCNzwwQm5IDd6A88APldKDnMiEMA=="; + }; + }; + "@prisma/get-platform-3.6.0-24.dc520b92b1ebb2d28dc3161f9f82e875bd35d727" = { + name = "_at_prisma_slash_get-platform"; + packageName = "@prisma/get-platform"; + version = "3.6.0-24.dc520b92b1ebb2d28dc3161f9f82e875bd35d727"; + src = fetchurl { + url = "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-3.6.0-24.dc520b92b1ebb2d28dc3161f9f82e875bd35d727.tgz"; + sha512 = "zvlddqvNU5rXnjTeT+0DOyMwH9E8NwV1a1F3tYN6lNWAjpWx26nGDGkIOO5Nid5mIjz+SDz5VM2NEZ+HXgDuMQ=="; + }; + }; + "@prisma/prisma-fmt-wasm-3.6.0-24.dc520b92b1ebb2d28dc3161f9f82e875bd35d727" = { + name = "_at_prisma_slash_prisma-fmt-wasm"; + packageName = "@prisma/prisma-fmt-wasm"; + version = "3.6.0-24.dc520b92b1ebb2d28dc3161f9f82e875bd35d727"; + src = fetchurl { + url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.6.0-24.dc520b92b1ebb2d28dc3161f9f82e875bd35d727.tgz"; + sha512 = "Nt4A2SZ4MASAliZ9OaXCYG1xr80lEcJABliUAi/tvzCU8r5W3V4Tp5XDqchxuN/w71XY/s+OaWce7PHnoMGpkA=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -6880,13 +6907,13 @@ let sha512 = "3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA=="; }; }; - "@types/express-serve-static-core-4.17.25" = { + "@types/express-serve-static-core-4.17.26" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.25"; + version = "4.17.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.25.tgz"; - sha512 = "OUJIVfRMFijZukGGwTpKNFprqCCXk5WjNGvUgB/CxxBR40QWSjsNK86+yvGKlCOGc7sbwfHLaXhkG+NsytwBaQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.26.tgz"; + sha512 = "zeu3tpouA043RHxW0gzRxwCHchMgftE8GArRsvYT0ByDMbn19olQHx5jLue0LxWY6iYtXb7rXmuVtSkhy9YZvQ=="; }; }; "@types/fancy-log-1.3.0" = { @@ -7078,6 +7105,15 @@ let sha512 = "B8pDk+sH/tSv/HKdx6EQER6BfUOb2GtKs0LOmozziS4h7cbe8u/eYySfUAeTwD+J09SqV3man7AMWIA5mgzCBA=="; }; }; + "@types/js-levenshtein-1.1.0" = { + name = "_at_types_slash_js-levenshtein"; + packageName = "@types/js-levenshtein"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/js-levenshtein/-/js-levenshtein-1.1.0.tgz"; + sha512 = "14t0v1ICYRtRVcHASzes0v/O+TIeASb8aD55cWF1PidtInhFWSXcmhzhHqGjUWf9SUq1w70cvd1cWKUULubAfQ=="; + }; + }; "@types/js-yaml-3.12.5" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; @@ -7420,6 +7456,15 @@ let sha512 = "3aRnHa1KlOEEhJ6+CvyHKK5vE9BcLGjtUpwvqYLRvYNQKMfabu3BwfJaA/SLW8dxe28LsNDjtHwePTuzn3gmOA=="; }; }; + "@types/node-16.11.11" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.11.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.11.11.tgz"; + sha512 = "KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw=="; + }; + }; "@types/node-16.11.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7492,13 +7537,13 @@ let sha512 = "kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="; }; }; - "@types/parse5-6.0.2" = { + "@types/parse5-6.0.3" = { name = "_at_types_slash_parse5"; packageName = "@types/parse5"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.2.tgz"; - sha512 = "+hQX+WyJAOne7Fh3zF5CxPemILIbuhNcqHHodzK9caYOLnC8pD5efmPleRnw0z++LfKUC/sVNMwk0Gap+B0baA=="; + url = "https://registry.npmjs.org/@types/parse5/-/parse5-6.0.3.tgz"; + sha512 = "SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g=="; }; }; "@types/pbkdf2-3.1.0" = { @@ -7951,6 +7996,15 @@ let sha512 = "cyeefcUCgJlEk+hk2h3N+MqKKsPViQgF5boi9TTHSK+PoR9KWBb/C5ccPcDyAqgsbAYHTwulch725DV84+pSpg=="; }; }; + "@types/ws-8.2.1" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "8.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-8.2.1.tgz"; + sha512 = "SqQ+LhVZaJi7c7sYVkjWALDigi/Wy7h7Iu72gkQp8Y8OWw/DddEVBrTSKu86pQftV2+Gm8lYM61hadPKqyaIeg=="; + }; + }; "@types/yargs-15.0.14" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -12010,13 +12064,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.1037.0" = { + "aws-sdk-2.1039.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1037.0"; + version = "2.1039.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1037.0.tgz"; - sha512 = "z1IfFFvKg1ZKikyExhLeiax0jIe/YwFrBjIUhcPjBfh+c4otvuqp9RBp2iyXt3GamhEkKoPyvd6a5K7IGsTBMw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1039.0.tgz"; + sha512 = "vrWWUNkRp+psMj56tKhTSKAXtROz2ccQ0NamMt/OS8jEt54ZIhjMeJDkbRucMEPQCeWR8Ma2g6ITmZPVDwUYaw=="; }; }; "aws-sdk-2.920.0" = { @@ -15827,22 +15881,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-1.1.47" = { + "cdk8s-1.1.48" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.1.47"; + version = "1.1.48"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.47.tgz"; - sha512 = "gKIjIJ/VUuR3IAwgAWd14h+HDKt1kgrwjQAKutxHfVcAo/3GCKoOaTpaR7IBvV82Y5DWsqePAdZr1vXOYMiAng=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.1.48.tgz"; + sha512 = "62+8+/jikWROpKZxRCG8vL3NrCMoAA0eqY+SyvIi8+7RGHUv7ELnGJ9kbVqAZJHljhwCablBMTEnOb2UFB91QA=="; }; }; - "cdk8s-plus-22-1.0.0-beta.53" = { + "cdk8s-plus-22-1.0.0-beta.54" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "1.0.0-beta.53"; + version = "1.0.0-beta.54"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.53.tgz"; - sha512 = "ljeSvdbzr+vcfZOPUXvxhwZ8ZvvlO6Y25XFGzmraPYeZNcDb+LkCpCj2tV1l6ziIuMs/rAtakGYlkx2FJVekUw=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.54.tgz"; + sha512 = "I7UmjEaPd59dXtwAkmYtVXrbyXWEq2li4NeCmL8fmtJsM3ZYxMhTPxbBlHbjCP/Pm2MYr7kRNnu7LVHGlgC48w=="; }; }; "cdktf-0.7.0" = { @@ -17591,13 +17645,13 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.7.4" = { + "color-string-1.8.1" = { name = "color-string"; packageName = "color-string"; - version = "1.7.4"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.7.4.tgz"; - sha512 = "nVdUvPVgZMpRQad5dcsCMOSB5BXLljklTiaxS6ehhKxDsAI5sD7k5VmFuBt1y3Rlym8uulc/ANUN/bMWtBu6Sg=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.8.1.tgz"; + sha512 = "AGfGNQbnXlYqPStIx3QB2XA3Wy8vjbreqklmCiGVwcoHSLN5KIpDZDflYnXlBliKHI8CTBX3PsCgG+xfZgqK8A=="; }; }; "color-support-1.1.3" = { @@ -18257,13 +18311,13 @@ let sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; }; }; - "conf-10.1.0" = { + "conf-10.1.1" = { name = "conf"; packageName = "conf"; - version = "10.1.0"; + version = "10.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-10.1.0.tgz"; - sha512 = "qZ+642TRK8uQq7IFL/c0iw9UsgowK0jkNpDeQMY2znki6Rvlm6ks+YljmaIayIRaTrLk0eJvyFgY0hOByxvmmw=="; + url = "https://registry.npmjs.org/conf/-/conf-10.1.1.tgz"; + sha512 = "z2civwq/k8TMYtcn3SVP0Peso4otIWnHtcTuHhQ0zDZDdP4NTxqEc8owfkz4zBsdMYdn/LFcE+ZhbCeqkhtq3Q=="; }; }; "conf-6.2.4" = { @@ -19104,31 +19158,31 @@ let sha512 = "WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w=="; }; }; - "core-js-3.19.1" = { + "core-js-3.19.2" = { name = "core-js"; packageName = "core-js"; - version = "3.19.1"; + version = "3.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.19.1.tgz"; - sha512 = "Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.19.2.tgz"; + sha512 = "ciYCResnLIATSsXuXnIOH4CbdfgV+H1Ltg16hJFN7/v6OxqnFr/IFGeLacaZ+fHLAm0TBbXwNK9/DNBzBUrO/g=="; }; }; - "core-js-compat-3.19.1" = { + "core-js-compat-3.19.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.19.1"; + version = "3.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.1.tgz"; - sha512 = "Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.2.tgz"; + sha512 = "ObBY1W5vx/LFFMaL1P5Udo4Npib6fu+cMokeziWkA8Tns4FcDemKF5j9JvaI5JhdkW8EQJQGJN1EcrzmEwuAqQ=="; }; }; - "core-js-pure-3.19.1" = { + "core-js-pure-3.19.2" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.19.1"; + version = "3.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.1.tgz"; - sha512 = "Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.2.tgz"; + sha512 = "5LkcgQEy8pFeVnd/zomkUBSwnmIxuF1C8E9KrMAbOc8f34IBT9RGvTYeNDdp1PnvMJrrVhvk1hg/yVV5h/znlg=="; }; }; "core-util-is-1.0.2" = { @@ -21300,13 +21354,13 @@ let sha512 = "hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="; }; }; - "date-fns-2.26.0" = { + "date-fns-2.27.0" = { name = "date-fns"; packageName = "date-fns"; - version = "2.26.0"; + version = "2.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/date-fns/-/date-fns-2.26.0.tgz"; - sha512 = "VQI812dRi3cusdY/fhoBKvc6l2W8BPWU1FNVnFH9Nttjx4AFBRzfSVb/Eyc7jBT6e9sg1XtAGsYpBQ6c/jygbg=="; + url = "https://registry.npmjs.org/date-fns/-/date-fns-2.27.0.tgz"; + sha512 = "sj+J0Mo2p2X1e306MHq282WS4/A8Pz/95GIFcsPNMPMZVI3EUrAdSv90al1k+p74WGLCruMXk23bfEDZa71X9Q=="; }; }; "date-format-1.2.0" = { @@ -23226,13 +23280,13 @@ let sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; }; }; - "domhandler-4.2.2" = { + "domhandler-4.3.0" = { name = "domhandler"; packageName = "domhandler"; - version = "4.2.2"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz"; - sha512 = "PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz"; + sha512 = "fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g=="; }; }; "domino-2.1.6" = { @@ -23802,13 +23856,13 @@ let sha512 = "U9dKi10V9w/BdIVB8a8dTKYLK3Q1d2WZ+Yo5qfM3XX/O4jI7KpnwgvWgGoVv0jTWPC2NlebF00ffWS/8NfUAtA=="; }; }; - "electron-to-chromium-1.4.4" = { + "electron-to-chromium-1.4.5" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.4.tgz"; - sha512 = "teHtgwcmVcL46jlFvAaqjyiTLWuMrUQO1JqV303JKB4ysXG6m8fXSFhbjal9st0r9mNskI22AraJZorb1VcLVg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.5.tgz"; + sha512 = "YKaB+t8ul5crdh6OeqT2qXdxJGI0fAYb6/X8pDIyye+c3a7ndOCk5gVeKX+ABwivCGNS56vOAif3TN0qJMpEHw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -32455,6 +32509,15 @@ let sha1 = "c2439951455bb39913daf281376f1530e104adf3"; }; }; + "immutable-4.0.0" = { + name = "immutable"; + packageName = "immutable"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz"; + sha512 = "zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw=="; + }; + }; "import-cwd-2.1.0" = { name = "import-cwd"; packageName = "import-cwd"; @@ -34867,13 +34930,13 @@ let sha512 = "Yd9oD7sgCycVvH8CHy5U4fLXibPwxVw2+diudYbT8ZfAiQDtW1H9WvPRR4+rtN9qOll+r+KAfO4SjO28OPpitA=="; }; }; - "is-valid-domain-0.1.4" = { + "is-valid-domain-0.1.5" = { name = "is-valid-domain"; packageName = "is-valid-domain"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.1.4.tgz"; - sha512 = "Caa6rwGze6pihA29wy3T1yNXzd53caGHvL0OfJ8RLtv0tVVzVZGlxFcQ0W8kls/uG0QUrv2B3J9xi/YB5/cfUQ=="; + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.1.5.tgz"; + sha512 = "ilzfGo1kXzoVpSLplJWOexoiuAc6mRK+vPlNAeEPVJ29RagETpCz0izg6CZfY72DCuA+PCrEAEJeaecRLMNq5Q=="; }; }; "is-valid-glob-1.0.0" = { @@ -35407,13 +35470,13 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-27.3.1" = { + "jest-worker-27.4.2" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.3.1"; + version = "27.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.3.1.tgz"; - sha512 = "ks3WCzsiZaOPJl/oMsDjaf0TRiSv7ctNgs0FqRr2nARsovz6AWWy4oLElwcquGSz692DzgZQrCLScPNs5YlC4g=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.2.tgz"; + sha512 = "0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag=="; }; }; "jimp-compact-0.16.1" = { @@ -36227,13 +36290,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.65" = { + "json2jsii-0.2.66" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.65"; + version = "0.2.66"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.65.tgz"; - sha512 = "3GPN4V+los5IjHx1q70rZIg+qU6q9/ffoEAhX8RLF37KYPuEG4pOpixQN+XwyOXlgAHScsP4LFc/535xziTD6g=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.66.tgz"; + sha512 = "jgSlVm3jObEE/xNWZEzA/rhLAJfl+feqxrMeo9AtYbMjIEOm84nSBCgOjA3o+fJFNQQ2CDC2g2FzaYcqftJclQ=="; }; }; "json3-3.2.6" = { @@ -36506,13 +36569,13 @@ let sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; }; }; - "jsprim-1.4.1" = { + "jsprim-1.4.2" = { name = "jsprim"; packageName = "jsprim"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz"; + sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="; }; }; "jsprim-2.0.2" = { @@ -37046,6 +37109,15 @@ let sha512 = "8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA=="; }; }; + "klona-2.0.5" = { + name = "klona"; + packageName = "klona"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz"; + sha512 = "pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="; + }; + }; "knockout-3.5.1" = { name = "knockout"; packageName = "knockout"; @@ -43284,13 +43356,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "mutexify-1.3.1" = { + "mutexify-1.4.0" = { name = "mutexify"; packageName = "mutexify"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mutexify/-/mutexify-1.3.1.tgz"; - sha512 = "nU7mOEuaXiQIB/EgTIjYZJ7g8KqMm2D8l4qp+DqA4jxWOb/tnb1KEoqp+tlbdQIDIAiC1i7j7X/3yHDFXLxr9g=="; + url = "https://registry.npmjs.org/mutexify/-/mutexify-1.4.0.tgz"; + sha512 = "pbYSsOrSB/AKN5h/WzzLRMFgZhClWccf2XIB4RSMC8JbquiB0e0/SH5AIfdQMdyHmYtv4seU7yV/TvAwPLJ1Yg=="; }; }; "muxrpc-6.5.3" = { @@ -45906,13 +45978,13 @@ let sha512 = "rH3U4eLHsV+OgkOS29ULiC9JLspwMCyCIH/+BglLPXDxQs13IK8AGD+nVmkGXqGN5JefZu85YhfIi05CsOKWPw=="; }; }; - "office-ui-fabric-react-7.179.4" = { + "office-ui-fabric-react-7.179.5" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.179.4"; + version = "7.179.5"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.179.4.tgz"; - sha512 = "e2UFt/OjFgh7Vvz+JjpyD5emWUHPt0ZiLHpIr96ZMr+nXBBkIUvG024IGm9LAppDvceCuR/ZBsZ3D31tStkDxA=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.179.5.tgz"; + sha512 = "Mwm6asYClXbguWoOOLsMTvbA+4dKP/tn7yds2n/KqDxeH6aCTXsdwSmhFClkJLoB9oeCIvEnjIvuuBm/5X2KNA=="; }; }; "omggif-1.0.10" = { @@ -49894,13 +49966,13 @@ let sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; - "postcss-value-parser-4.1.0" = { + "postcss-value-parser-4.2.0" = { name = "postcss-value-parser"; packageName = "postcss-value-parser"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; - sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; + sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; }; }; "postgres-array-2.0.0" = { @@ -52216,13 +52288,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.190" = { + "pyright-1.1.191" = { name = "pyright"; packageName = "pyright"; - version = "1.1.190"; + version = "1.1.191"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.190.tgz"; - sha512 = "rZXmg/xapDxuiqyzs15nj3cxj6IGroX2UNXdEKwTT7RNdwohahfdolqoLIBCtIrbLLmgNUXWtL0cCEqljBKNRg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.191.tgz"; + sha512 = "1WyWpfLudnT+wBNYoaqQV2yOmpzI8otmDIGrEdLG0pikHWktuVSq8rvcqLF2QzzZVgb67TWCXp9u+wBt214lzA=="; }; }; "q-0.9.7" = { @@ -53872,13 +53944,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.57" = { + "redoc-2.0.0-rc.58" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.57"; + version = "2.0.0-rc.58"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.57.tgz"; - sha512 = "f8XIqvZF1agphq6xmOU9jTDVNDFHJt3MzDq1lUgZojb/7YY4eqLyDi6er/yCWYkY9DuB+v2jHCOn5UUbMuKAfg=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.58.tgz"; + sha512 = "TWd+a2jv8UDaFOK4zST/lCBuJ7kpVLILW/3eoASZunjqRdcFyL/9aJC1zlFzKmEOUfaN6YWnZX/OM/YbE2BZlg=="; }; }; "reduce-component-1.0.1" = { @@ -56932,13 +57004,13 @@ let sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182"; }; }; - "sass-1.43.5" = { + "sass-1.44.0" = { name = "sass"; packageName = "sass"; - version = "1.43.5"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.43.5.tgz"; - sha512 = "WuNm+eAryMgQluL7Mbq9M4EruyGGMyal7Lu58FfnRMVWxgUzIvI7aSn60iNt3kn5yZBMR7G84fAGDcwqOF5JOg=="; + url = "https://registry.npmjs.org/sass/-/sass-1.44.0.tgz"; + sha512 = "0hLREbHFXGQqls/K8X+koeP+ogFRPF4ZqetVB19b7Cst9Er8cOR0rc6RU7MaI4W1JmUShd1BPgPoeqmmgMMYFw=="; }; }; "sax-0.5.8" = { @@ -58138,13 +58210,13 @@ let sha512 = "rohCHmEjD/ESXFLxF4bVeqgdb4Awc65ZyyuCKl3f7BvgMbZOBa/Ye3HN/GFnvruiUOAWWNupxhz3Rz5/3vJLTg=="; }; }; - "simple-git-2.47.0" = { + "simple-git-2.47.1" = { name = "simple-git"; packageName = "simple-git"; - version = "2.47.0"; + version = "2.47.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-2.47.0.tgz"; - sha512 = "+HfCpqPBEZTPWiW9fPdbiPJDslM22MLqrktfzNKyI2pWaJa6DhfNVx4Mds04KZzVv5vjC9/ksw3y5gVf8ECWDg=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.47.1.tgz"; + sha512 = "DF4rnBr4uzMQsreqxHg8t1wN4Pi3kj/shBVT1OO+aBkBnscCZ02tynKHc9cx3StNPnItHWAaoN31qkRNDhh5Ow=="; }; }; "simple-handshake-3.0.0" = { @@ -58993,13 +59065,13 @@ let sha512 = "WnBQ0GDo/82shKQHZBZT9h4q4miCtxkbzcwVLsCBPWNq4qbq8BXhKICt9nPwQAsJ43ct/rF61FKu4t0druUBug=="; }; }; - "sonic-boom-2.3.1" = { + "sonic-boom-2.4.0" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.3.1.tgz"; - sha512 = "o0vJPsRiCW5Q0EmRKjNiiYGy2DqSXcxk4mY9vIBSPwmkH/e/vJ2Tq8EECd5NTiO77x8vlVN+ykDjRQJTqf7eKg=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-2.4.0.tgz"; + sha512 = "2jSXeHjrovvsrnQ0tvG6eUjDdtMBxtYDAHr18mGDM/Pno/Wdw+pQ1AXUWKCZgriZ9MvCVdUEXXOUfVEwPcrieg=="; }; }; "sorcery-0.10.0" = { @@ -67959,13 +68031,13 @@ let sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; - "vscode-css-languageservice-5.1.8" = { + "vscode-css-languageservice-5.1.9" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "5.1.8"; + version = "5.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.8.tgz"; - sha512 = "Si1sMykS8U/p8LYgLGPCfZD1YFT0AtvUJQp9XJGw64DZWhtwYo28G2l64USLS9ge4ZPMZpwdpOK7PfbVKfgiiA=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.1.9.tgz"; + sha512 = "/tFOWeZBL3Oc9Zc+2MAi3rEwiXJTSZsvjB+M7nSjWLbGPUIjukUA7YzLgsBoUfR35sPJYnXWUkL56PdfIYM8GA=="; }; }; "vscode-debugadapter-testsupport-1.50.0" = { @@ -68040,6 +68112,15 @@ let sha512 = "rrDyCiOgMwOPgchpPGAeLzjYVVEW/Ror2/a1BWUEI3S9+NQhA9vj4SQkzmH6g2Bq9S9SV0OQeadD+xphOf1N3w=="; }; }; + "vscode-html-languageservice-4.2.0" = { + name = "vscode-html-languageservice"; + packageName = "vscode-html-languageservice"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.2.0.tgz"; + sha512 = "5ebk/5kMa7PrCPL3JuP27vo8h+coDgSkMP14pSlKz3ISXZxHm+nnCenhVrpy9Ayamtwb28YXeQuN8AqNQH8kVQ=="; + }; + }; "vscode-json-languageserver-1.3.4" = { name = "vscode-json-languageserver"; packageName = "vscode-json-languageserver"; @@ -68076,13 +68157,13 @@ let sha512 = "IHliMEEYSY0tJjJt0ECb8ESx/nRXpoy9kN42WVQXgaqGyizFAf3jibSiezDQTrrY7f3kywXggCU+kkJEM+OLZQ=="; }; }; - "vscode-json-languageservice-4.2.0-next.1" = { + "vscode-json-languageservice-4.2.0-next.2" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "4.2.0-next.1"; + version = "4.2.0-next.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.2.0-next.1.tgz"; - sha512 = "aQvkkuZpeSPv86QLzyMdKTCgvXR+qSO39nSgj/XGaOcuHmTt7vMZB7ymYGGkQ4cAaQdHs/2G6a479LQybIGSbg=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.2.0-next.2.tgz"; + sha512 = "P0sdiZS7bM8+bxrkpL7XPwwhmZj94pcJIAZUh/QeessvYtXFnRmOEybe20rC+CS7b7DfwFcVt0p4p93hGZQ5gg=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -72431,7 +72512,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -72701,7 +72782,7 @@ in sources."mountable-hypertrie-2.8.0" sources."ms-2.0.0" sources."multicast-dns-7.2.4" - sources."mutexify-1.3.1" + sources."mutexify-1.4.0" sources."nanoassert-2.0.0" sources."nanoguard-1.3.0" sources."nanoiterator-1.2.1" @@ -72932,7 +73013,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/glob-7.2.0" sources."@types/minimatch-3.0.5" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -73299,7 +73380,7 @@ in sources."strip-json-comments-3.1.1" ]; }) - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" (sources."jsonpath-1.1.1" // { @@ -73309,7 +73390,7 @@ in ]; }) sources."jsonwebtoken-8.5.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" (sources."jstransform-11.0.3" // { dependencies = [ sources."object-assign-2.1.1" @@ -73892,7 +73973,7 @@ in sources."restore-cursor-3.1.0" sources."safe-buffer-5.2.1" sources."signal-exit-3.0.6" - sources."simple-git-2.47.0" + sources."simple-git-2.47.1" sources."sprintf-js-1.0.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -73961,7 +74042,7 @@ in sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" sources."@types/json5-0.0.29" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -74020,7 +74101,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.3" // { @@ -74087,7 +74168,7 @@ in sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - (sources."jest-worker-27.3.1" // { + (sources."jest-worker-27.4.2" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -74478,7 +74559,7 @@ in sources."@types/cors-2.8.10" sources."@types/ejs-2.7.0" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.25" + sources."@types/express-serve-static-core-4.17.26" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.2.0" sources."@types/http-assert-1.5.3" @@ -74497,7 +74578,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -74692,12 +74773,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.19.1" // { + (sources."core-js-compat-3.19.2" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.19.1" + sources."core-js-pure-3.19.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -74763,7 +74844,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -75016,12 +75097,12 @@ in sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json5-2.2.0" sources."jsonfile-4.0.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."keyv-3.0.0" sources."kind-of-6.0.3" sources."launch-editor-2.2.1" @@ -75759,9 +75840,9 @@ in sources."@types/minimist-1.2.2" sources."@types/ms-0.7.31" sources."@types/nlcst-1.0.0" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/normalize-package-data-2.4.1" - sources."@types/parse5-6.0.2" + sources."@types/parse5-6.0.3" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."acorn-8.6.0" @@ -76273,7 +76354,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.3" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -76368,7 +76449,7 @@ in dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-3.0.5" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -76454,13 +76535,13 @@ in dependencies = [ sources."browserslist-4.18.1" sources."caniuse-lite-1.0.30001283" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."escalade-3.1.1" sources."fraction.js-4.1.2" sources."node-releases-2.0.1" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" - sources."postcss-value-parser-4.1.0" + sources."postcss-value-parser-4.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -76482,14 +76563,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1037.0" // { + (sources."aws-sdk-2.1039.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -76532,7 +76613,7 @@ in sources."devtools-protocol-0.0.901419" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" sources."domutils-2.8.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -77141,10 +77222,10 @@ in sources."@types/caseless-0.12.2" sources."@types/connect-3.4.35" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.25" + sources."@types/express-serve-static-core-4.17.26" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.7" @@ -77462,6 +77543,7 @@ in (sources."ln-service-53.1.1" // { dependencies = [ sources."@grpc/proto-loader-0.6.7" + sources."@types/node-16.11.10" sources."lightning-5.1.0" sources."type-fest-2.6.0" sources."ws-8.3.0" @@ -77853,10 +77935,10 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."jsdom-11.12.0" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."left-pad-1.3.0" sources."levn-0.3.0" sources."lodash-4.17.21" @@ -77963,14 +78045,14 @@ in sources."doctoc-2.1.0" (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" ]; }) sources."domelementtype-2.2.0" sources."domhandler-3.3.0" (sources."domutils-2.8.0" // { dependencies = [ - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" ]; }) sources."emoji-regex-6.1.3" @@ -78944,10 +79026,10 @@ in sources."jsbn-0.1.1" sources."json-bigint-1.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."jstransformer-1.0.0" (sources."jstransformer-markdown-it-2.1.0" // { dependencies = [ @@ -79099,7 +79181,7 @@ in sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."simple-git-2.47.0" + sources."simple-git-2.47.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -79191,7 +79273,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -79340,10 +79422,10 @@ in sources."isarray-0.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { dependencies = [ @@ -80213,8 +80295,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.1" sources."case-1.6.3" - sources."cdk8s-1.1.47" - sources."cdk8s-plus-22-1.0.0-beta.53" + sources."cdk8s-1.1.48" + sources."cdk8s-plus-22-1.0.0-beta.54" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -80314,7 +80396,7 @@ in }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.2.65" + sources."json2jsii-0.2.66" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -80652,7 +80734,7 @@ in sources."convert-to-spaces-1.0.2" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-pure-3.19.1" + sources."core-js-pure-3.19.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."crc-32-1.2.0" @@ -80664,7 +80746,7 @@ in }) sources."cross-spawn-7.0.3" sources."cssfilter-0.0.10" - sources."date-fns-2.26.0" + sources."date-fns-2.27.0" sources."date-format-3.0.0" sources."debug-2.6.9" sources."decamelize-5.0.1" @@ -80807,7 +80889,7 @@ in sources."is-symbol-1.0.4" sources."is-typed-array-1.1.8" sources."is-unicode-supported-0.1.0" - sources."is-valid-domain-0.1.4" + sources."is-valid-domain-0.1.5" sources."is-weakmap-2.0.1" sources."is-weakref-1.0.1" sources."is-weakset-2.0.1" @@ -82081,7 +82163,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.19.1" + sources."core-js-3.19.2" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -82117,7 +82199,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -82915,13 +82997,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.190"; + version = "1.1.191"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.190.tgz"; - sha512 = "RR/Z3qmwhagMFUs7ryReY1s/xP2VkTYaQF4EORx9R+wtEZbw+zLWOpnoa0UQRGv8PR6F+HGu2gBLYOoqZM/Daw=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.191.tgz"; + sha512 = "/cqW+D5QU/nDzhkh9veNO6JQRFkQ5fxGNsvIAtbhhfkNYgBTwMjUoAdaSUcZRcBvYNUjCQ4OpEqWqFmDGx6Sqg=="; }; dependencies = [ - sources."pyright-1.1.190" + sources."pyright-1.1.191" ]; buildInputs = globalBuildInputs; meta = { @@ -83168,7 +83250,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -83302,7 +83384,7 @@ in sources."postcss-scss-2.1.1" sources."postcss-selector-parser-6.0.6" sources."postcss-syntax-0.36.2" - sources."postcss-value-parser-4.1.0" + sources."postcss-value-parser-4.2.0" sources."punycode-2.1.1" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" @@ -84159,7 +84241,7 @@ in sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."date-fns-2.26.0" + sources."date-fns-2.27.0" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."get-caller-file-2.0.5" @@ -84204,7 +84286,7 @@ in sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.7.4" + sources."color-string-1.8.1" sources."colors-1.4.0" sources."colorspace-1.1.4" sources."commander-8.0.0" @@ -84798,12 +84880,12 @@ in sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" sources."jsonparse-1.3.1" - (sources."jsprim-1.4.1" // { + (sources."jsprim-1.4.2" // { dependencies = [ sources."extsprintf-1.3.0" ]; @@ -85098,7 +85180,7 @@ in sources."@types/glob-7.2.0" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -85469,7 +85551,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -86245,10 +86327,10 @@ in sources."isstream-0.1.2" sources."iterators-0.1.0" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."k-bucket-3.3.1" (sources."k-rpc-4.3.1" // { dependencies = [ @@ -86299,7 +86381,7 @@ in }) sources."multistream-2.1.1" sources."mute-stream-0.0.8" - sources."mutexify-1.3.1" + sources."mutexify-1.4.0" sources."nan-2.15.0" sources."nanoassert-1.1.0" sources."nanobus-4.5.0" @@ -86856,7 +86938,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.19.1" // { + (sources."core-js-compat-3.19.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -86882,7 +86964,7 @@ in sources."duplexer3-0.1.4" sources."earcut-2.2.3" sources."electron-13.6.2" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -86988,6 +87070,7 @@ in }) sources."http-cache-semantics-4.1.0" sources."ieee754-1.2.1" + sources."immutable-4.0.0" sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-accessor-descriptor-1.0.0" @@ -87161,7 +87244,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - (sources."sass-1.43.5" // { + (sources."sass-1.44.0" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -87516,11 +87599,11 @@ in sources."isstream-0.1.2" sources."jmespath-0.15.0" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."lodash-4.17.21" sources."lodash.escaperegexp-4.1.2" sources."lodash.groupby-4.6.0" @@ -87668,7 +87751,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -87929,11 +88012,11 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-buffer-3.0.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."junk-3.1.0" sources."keyv-4.0.4" sources."load-json-file-2.0.0" @@ -88330,7 +88413,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -88574,7 +88657,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.179.4" + sources."@fluentui/react-7.179.5" sources."@fluentui/react-focus-7.18.1" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -88589,7 +88672,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.230" + sources."@microsoft/load-themed-styles-1.10.231" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -88608,7 +88691,7 @@ in sources."@types/connect-3.4.35" sources."@types/engine.io-3.1.7" sources."@types/express-4.17.8" - sources."@types/express-serve-static-core-4.17.25" + sources."@types/express-serve-static-core-4.17.26" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.2.0" sources."@types/hls.js-0.13.1" @@ -89303,6 +89386,7 @@ in sources."iferr-0.1.5" sources."ignore-5.1.9" sources."ignore-walk-3.0.4" + sources."immutable-4.0.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."indexof-0.0.1" @@ -89357,7 +89441,7 @@ in sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" @@ -89367,7 +89451,7 @@ in sources."universalify-2.0.0" ]; }) - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."just-debounce-1.1.0" sources."keyv-3.1.0" sources."kind-of-6.0.3" @@ -89617,7 +89701,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.179.4" + sources."office-ui-fabric-react-7.179.5" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -89844,7 +89928,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.43.5" // { + (sources."sass-1.44.0" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -90722,7 +90806,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/q-1.5.5" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.1" @@ -91000,7 +91084,7 @@ in sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.7.4" + sources."color-string-1.8.1" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" @@ -91083,7 +91167,7 @@ in }) (sources."css-select-4.1.3" // { dependencies = [ - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" ]; }) sources."css-select-base-adapter-0.1.1" @@ -91159,7 +91243,7 @@ in sources."dom-converter-0.2.0" (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" ]; }) sources."domain-browser-1.2.0" @@ -91168,7 +91252,7 @@ in sources."domino-2.1.6" (sources."domutils-2.8.0" // { dependencies = [ - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" ]; }) (sources."dot-case-3.0.4" // { @@ -91182,7 +91266,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -91595,7 +91679,7 @@ in sources."json-buffer-3.0.1" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" (sources."json-schema-deref-sync-0.13.0" // { dependencies = [ sources."clone-2.1.2" @@ -91613,7 +91697,7 @@ in }) sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."keychain-1.3.0" sources."keyv-4.0.4" sources."killable-1.0.1" @@ -92100,7 +92184,7 @@ in ]; }) sources."postcss-unique-selectors-4.0.1" - sources."postcss-value-parser-4.1.0" + sources."postcss-value-parser-4.2.0" sources."prepend-http-3.0.1" sources."pretty-bytes-5.6.0" sources."pretty-error-2.1.2" @@ -92201,7 +92285,7 @@ in (sources."renderkid-2.0.7" // { dependencies = [ sources."ansi-regex-2.1.1" - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" sources."htmlparser2-6.1.0" sources."strip-ansi-3.0.1" ]; @@ -92817,7 +92901,7 @@ in sources."@babel/traverse-7.16.3" sources."@babel/types-7.16.0" sources."@types/minimist-1.2.2" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -92868,7 +92952,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -93080,12 +93164,12 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@oclif/command-1.8.4" // { + (sources."@oclif/command-1.8.6" // { dependencies = [ sources."@oclif/plugin-help-3.3.0" ]; }) - sources."@oclif/config-1.17.1" + sources."@oclif/config-1.18.1" (sources."@oclif/core-0.5.41" // { dependencies = [ (sources."cli-ux-5.6.4" // { @@ -93334,11 +93418,11 @@ in sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."keyv-3.0.0" sources."levn-0.3.0" sources."lodash-4.17.21" @@ -93548,7 +93632,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -93672,7 +93756,7 @@ in }) sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-string-1.7.4" + sources."color-string-1.8.1" sources."color-support-1.1.3" sources."colors-1.0.3" sources."colorspace-1.1.4" @@ -93969,7 +94053,7 @@ in sources."json-buffer-3.0.0" sources."json-parse-helpfulerror-1.0.3" sources."json-ptr-2.2.0" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" @@ -93980,7 +94064,7 @@ in sources."jws-3.2.2" ]; }) - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."jwa-2.0.0" sources."jws-4.0.0" sources."keyv-3.1.0" @@ -94675,7 +94759,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.0" sources."@types/inquirer-6.5.0" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -94775,11 +94859,11 @@ in sources."js-sha3-0.8.0" sources."js-yaml-3.14.1" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."jwt-decode-2.2.0" sources."keccak-3.0.2" sources."lie-3.1.1" @@ -95486,7 +95570,7 @@ in sources."@types/keyv-3.1.3" sources."@types/mdast-3.0.10" sources."@types/ms-0.7.31" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/node-fetch-2.5.12" sources."@types/responselike-1.0.0" sources."@types/unist-2.0.6" @@ -95639,13 +95723,13 @@ in sources."dom-converter-0.2.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -96706,7 +96790,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -96864,7 +96948,7 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."conf-10.1.0" + sources."conf-10.1.1" (sources."configstore-5.0.1" // { dependencies = [ sources."dot-prop-5.3.0" @@ -97456,7 +97540,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -97683,7 +97767,7 @@ in sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.3.1" sources."json-ptr-1.3.2" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" (sources."jsonfile-6.1.0" // { @@ -97692,7 +97776,7 @@ in ]; }) sources."jsonpath-plus-4.0.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."lines-and-columns-1.2.4" @@ -97991,10 +98075,10 @@ in ]; }) sources."@oclif/screen-1.0.4" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.4" - sources."@types/ws-8.2.0" + sources."@types/ws-8.2.1" sources."abort-controller-3.0.0" sources."accepts-1.3.7" sources."ansi-escapes-3.2.0" @@ -99786,7 +99870,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.1037.0" + sources."aws-sdk-2.1039.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -99853,7 +99937,7 @@ in sources."jmespath-0.15.0" sources."js-yaml-3.14.1" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" (sources."jsonpath-1.1.1" // { @@ -99861,7 +99945,7 @@ in sources."esprima-1.2.2" ]; }) - (sources."jsprim-1.4.1" // { + (sources."jsprim-1.4.2" // { dependencies = [ sources."verror-1.10.0" ]; @@ -100110,10 +100194,10 @@ in sources."js-yaml-3.6.1" sources."jsbn-0.1.1" sources."jschardet-1.6.0" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."kind-of-3.2.2" sources."latest-version-1.0.1" sources."lazy-cache-1.0.4" @@ -100470,14 +100554,14 @@ in sources."diagnostic-channel-publishers-0.4.4" (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" ]; }) sources."domelementtype-2.2.0" sources."domhandler-3.3.0" (sources."domutils-2.8.0" // { dependencies = [ - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" ]; }) sources."ecc-jsbn-0.1.2" @@ -100519,11 +100603,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."lodash-4.17.21" sources."long-4.0.0" (sources."lru-cache-6.0.0" // { @@ -100571,12 +100655,12 @@ in sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" - (sources."vscode-css-languageservice-5.1.8" // { + (sources."vscode-css-languageservice-5.1.9" // { dependencies = [ sources."vscode-languageserver-types-3.16.0" ]; }) - (sources."vscode-html-languageservice-4.1.1" // { + (sources."vscode-html-languageservice-4.2.0" // { dependencies = [ sources."vscode-languageserver-types-3.16.0" ]; @@ -101316,7 +101400,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1037.0" // { + (sources."aws-sdk-2.1039.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -101358,7 +101442,7 @@ in sources."color-3.1.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.7.4" + sources."color-string-1.8.1" sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" sources."commander-2.17.1" @@ -101471,7 +101555,7 @@ in sources."diff-match-patch-1.0.5" (sources."dom-serializer-1.3.2" // { dependencies = [ - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" ]; }) sources."domelementtype-2.2.0" @@ -101480,7 +101564,7 @@ in sources."dompurify-2.3.3" (sources."domutils-2.8.0" // { dependencies = [ - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" ]; }) sources."ecc-jsbn-0.1.2" @@ -101633,11 +101717,11 @@ in sources."js-yaml-4.1.0" sources."jsbn-0.1.1" sources."jsdom-15.2.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" (sources."katex-0.13.24" // { dependencies = [ sources."commander-8.3.0" @@ -102751,11 +102835,11 @@ in sources."jju-1.4.0" sources."jsbn-0.1.1" sources."json-parse-helpfulerror-1.0.3" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-server-0.8.23" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."kind-of-3.2.2" sources."latest-version-2.0.0" sources."lazy-req-1.1.0" @@ -103097,8 +103181,8 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.4" - sources."@oclif/config-1.17.1" + sources."@oclif/command-1.8.6" + sources."@oclif/config-1.18.1" (sources."@oclif/core-0.5.41" // { dependencies = [ sources."fs-extra-9.1.0" @@ -103350,7 +103434,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."accepts-1.3.7" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -103631,7 +103715,7 @@ in sources."convert-source-map-1.8.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.19.1" + sources."core-js-3.19.2" sources."cors-2.8.5" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" @@ -103664,7 +103748,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -104126,10 +104210,10 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."jsdom-7.2.2" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."lcid-1.0.0" sources."levn-0.3.0" sources."locate-path-3.0.0" @@ -104382,10 +104466,10 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."jsdom-7.2.2" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."lcid-1.0.0" sources."levn-0.3.0" sources."locate-path-5.0.0" @@ -104953,12 +105037,12 @@ in sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" sources."jsonparse-1.3.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."kind-of-6.0.3" sources."libnpmaccess-4.0.3" (sources."libnpmpublish-4.0.2" // { @@ -105899,10 +105983,10 @@ in sources."isobject-2.1.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."kind-of-3.2.2" sources."linkify-it-2.2.0" sources."map-cache-0.2.2" @@ -106342,7 +106426,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -106586,7 +106670,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.19.1" // { + (sources."core-js-compat-3.19.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -106638,7 +106722,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106856,14 +106940,14 @@ in sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-0.0.1" sources."json-stringify-safe-5.0.1" sources."json5-2.2.0" sources."jsonify-0.0.0" sources."jsonparse-1.3.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."jszip-2.6.1" sources."kind-of-6.0.3" sources."labeled-stream-splicer-2.0.2" @@ -107376,7 +107460,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.4" sources."@types/get-stdin-5.0.1" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -107466,7 +107550,6 @@ in (sources."http-signature-1.3.6" // { dependencies = [ sources."extsprintf-1.3.0" - sources."json-schema-0.4.0" sources."jsprim-2.0.2" sources."verror-1.10.0" ]; @@ -107477,8 +107560,8 @@ in sources."is-fullwidth-code-point-1.0.0" sources."isarray-0.0.1" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - (sources."jsprim-1.4.1" // { + sources."json-schema-0.4.0" + (sources."jsprim-1.4.2" // { dependencies = [ sources."extsprintf-1.3.0" sources."verror-1.10.0" @@ -108041,13 +108124,13 @@ in sources."js-tokens-3.0.2" sources."js-yaml-3.14.1" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonify-0.0.0" sources."jsonpointer-5.0.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."levn-0.3.0" sources."lodash-4.17.21" sources."lodash._basecopy-3.0.1" @@ -108244,7 +108327,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -108671,7 +108754,7 @@ in sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.7.4" + sources."color-string-1.8.1" sources."colornames-1.1.1" sources."colors-1.4.0" sources."colorspace-1.1.4" @@ -108987,11 +109070,11 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonify-0.0.0" - (sources."jsprim-1.4.1" // { + (sources."jsprim-1.4.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -109288,7 +109371,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -109396,7 +109479,7 @@ in sources."dicer-0.2.5" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" sources."domutils-2.8.0" (sources."duplexify-4.1.2" // { dependencies = [ @@ -109726,11 +109809,11 @@ in sources."isarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."lru-cache-6.0.0" sources."mime-db-1.51.0" sources."mime-types-2.1.34" @@ -110044,7 +110127,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimist-1.2.2" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -110936,11 +111019,11 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."minimatch-3.0.4" @@ -111060,10 +111143,10 @@ in sources."is-wsl-2.2.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."mime-db-1.51.0" sources."mime-types-2.1.34" sources."npm-7.24.2" @@ -111406,7 +111489,7 @@ in sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.7.4" + sources."color-string-1.8.1" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.20.3" @@ -111418,7 +111501,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.19.1" // { + (sources."core-js-compat-3.19.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -111517,7 +111600,7 @@ in sources."domain-browser-1.2.0" sources."domelementtype-1.3.1" sources."domexception-1.0.1" - (sources."domhandler-4.2.2" // { + (sources."domhandler-4.3.0" // { dependencies = [ sources."domelementtype-2.2.0" ]; @@ -111529,7 +111612,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -111726,11 +111809,11 @@ in }) sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json5-1.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."kind-of-3.2.2" sources."levn-0.3.0" sources."lodash-4.17.21" @@ -111842,7 +111925,7 @@ in }) (sources."postcss-calc-7.0.5" // { dependencies = [ - sources."postcss-value-parser-4.1.0" + sources."postcss-value-parser-4.2.0" ]; }) sources."postcss-colormin-4.0.3" @@ -112298,10 +112381,10 @@ in sources."isstream-0.1.2" sources."js-yaml-3.14.1" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."kad-fs-0.0.4" sources."kad-localstorage-0.0.7" sources."kad-memstore-0.0.1" @@ -112995,10 +113078,10 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { dependencies = [ @@ -113826,13 +113909,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.5.0.tgz"; - sha512 = "WEYQ+H98O0yigG+lI0gfh4iyBChvnM6QTXPDtY9eFraLXAmyb6tf/T2mUdrUAU1AEvHLVzQA5A+RpONZlQozBg=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.6.0.tgz"; + sha512 = "6SqgHS/5Rq6HtHjsWsTxlj+ySamGyCLBUQfotc2lStOjPv52IQuDVpp58GieNqc9VnfuFyHUvTZw7aQB+G2fvQ=="; }; dependencies = [ - sources."@prisma/engines-3.5.0-38.78a5df6def6943431f4c022e1428dbc3e833cf8e" + sources."@prisma/engines-3.6.0-24.dc520b92b1ebb2d28dc3161f9f82e875bd35d727" ]; buildInputs = globalBuildInputs; meta = { @@ -113844,6 +113927,40 @@ in bypassCache = true; reconstructLock = true; }; + "@prisma/language-server" = nodeEnv.buildNodePackage { + name = "_at_prisma_slash_language-server"; + packageName = "@prisma/language-server"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.6.0.tgz"; + sha512 = "3WUlWYGEcavLaueLpl6vsGsgfHn2TMB4885tIsQ/qPulwdY9ZgL+qzrve+wnSoBwgFi3gSWnGZB6VYOhLaOTdQ=="; + }; + dependencies = [ + sources."@prisma/debug-3.5.0" + sources."@prisma/get-platform-3.6.0-24.dc520b92b1ebb2d28dc3161f9f82e875bd35d727" + sources."@prisma/prisma-fmt-wasm-3.6.0-24.dc520b92b1ebb2d28dc3161f9f82e875bd35d727" + sources."@types/debug-4.1.7" + sources."@types/js-levenshtein-1.1.0" + sources."@types/ms-0.7.31" + sources."js-levenshtein-1.1.6" + sources."klona-2.0.5" + sources."ms-2.1.3" + sources."vscode-jsonrpc-6.0.0" + sources."vscode-languageserver-7.0.0" + sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-languageserver-textdocument-1.0.3" + sources."vscode-languageserver-types-3.16.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Implementation of a language server in Node."; + homepage = "https://github.com/prisma/language-tools#readme"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; pscid = nodeEnv.buildNodePackage { name = "pscid"; packageName = "pscid"; @@ -114236,10 +114353,10 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."log-symbols-3.0.0" sources."log-update-3.4.0" sources."lru-cache-5.1.1" @@ -114490,10 +114607,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.190"; + version = "1.1.191"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.190.tgz"; - sha512 = "rZXmg/xapDxuiqyzs15nj3cxj6IGroX2UNXdEKwTT7RNdwohahfdolqoLIBCtIrbLLmgNUXWtL0cCEqljBKNRg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.191.tgz"; + sha512 = "1WyWpfLudnT+wBNYoaqQV2yOmpzI8otmDIGrEdLG0pikHWktuVSq8rvcqLF2QzzZVgb67TWCXp9u+wBt214lzA=="; }; buildInputs = globalBuildInputs; meta = { @@ -114985,7 +115102,7 @@ in sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -115230,7 +115347,7 @@ in sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.7.4" + sources."color-string-1.8.1" sources."commander-4.1.1" sources."commondir-1.0.1" sources."component-bind-1.0.0" @@ -115257,7 +115374,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.19.1" // { + (sources."core-js-compat-3.19.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -115382,7 +115499,7 @@ in }) sources."domain-browser-1.2.0" sources."domelementtype-1.3.1" - (sources."domhandler-4.2.2" // { + (sources."domhandler-4.3.0" // { dependencies = [ sources."domelementtype-2.2.0" ]; @@ -115401,7 +115518,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116074,7 +116191,7 @@ in ]; }) sources."postcss-unique-selectors-4.0.1" - sources."postcss-value-parser-4.1.0" + sources."postcss-value-parser-4.2.0" sources."prepend-http-2.0.0" sources."pretty-error-2.1.2" sources."process-0.11.10" @@ -116760,10 +116877,10 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.13.0"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.0.tgz"; - sha512 = "SLGjajbYf2QKByYKBWCDTW1mnX6BWfojV3Y6SFkCXtehNFgy4OGGKmi3Dy4/PqSx5liWeGggxMQ9N/oiSsFhbA=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.1.tgz"; + sha512 = "Ak2LZWRQ1PjsAOPkzirpwRJbYFLKLBpQqMGgmYIOoYje2lLoJQvcE6tknPPQGQV51PUJlmY94hWTNW6rpZi99w=="; }; dependencies = [ sources."@babel/code-frame-7.16.0" @@ -116967,7 +117084,7 @@ in sources."picomatch-2.3.0" sources."pluralize-8.0.0" sources."polished-4.1.3" - sources."postcss-value-parser-4.1.0" + sources."postcss-value-parser-4.2.0" sources."prismjs-1.25.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -116995,7 +117112,7 @@ in ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.57" // { + (sources."redoc-2.0.0-rc.58" // { dependencies = [ sources."path-browserify-1.0.1" ]; @@ -117556,10 +117673,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.60.1"; + version = "2.60.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.60.1.tgz"; - sha512 = "akwfnpjY0rXEDSn1UTVfKXJhPsEBu+imi1gqBA1ZkHGydUnkV/fWCC90P7rDaLEW8KTwBcS1G3N4893Ndz+jwg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.60.2.tgz"; + sha512 = "1Bgjpq61sPjgoZzuiDSGvbI1tD91giZABgjCQBKM5aYLnzjq52GoDuWVwT/cm/MCxCMPU8gqQvkj8doQ5C8Oqw=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -117724,7 +117841,7 @@ in sources."doctrine-3.0.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" sources."domutils-2.8.0" sources."duplexer2-0.1.4" (sources."editorconfig-0.15.3" // { @@ -118149,10 +118266,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.43.5"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.43.5.tgz"; - sha512 = "WuNm+eAryMgQluL7Mbq9M4EruyGGMyal7Lu58FfnRMVWxgUzIvI7aSn60iNt3kn5yZBMR7G84fAGDcwqOF5JOg=="; + url = "https://registry.npmjs.org/sass/-/sass-1.44.0.tgz"; + sha512 = "0hLREbHFXGQqls/K8X+koeP+ogFRPF4ZqetVB19b7Cst9Er8cOR0rc6RU7MaI4W1JmUShd1BPgPoeqmmgMMYFw=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -118162,6 +118279,7 @@ in sources."fill-range-7.0.1" sources."fsevents-2.3.2" sources."glob-parent-5.1.2" + sources."immutable-4.0.0" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -118422,7 +118540,7 @@ in sources."@types/keyv-3.1.3" sources."@types/lodash-4.14.177" sources."@types/long-4.0.1" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -118482,7 +118600,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1037.0" // { + (sources."aws-sdk-2.1039.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -118578,7 +118696,7 @@ in sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.7.4" + sources."color-string-1.8.1" sources."colornames-1.1.1" sources."colors-1.3.3" sources."colorspace-1.1.4" @@ -118824,11 +118942,11 @@ in sources."js-yaml-3.14.1" ]; }) - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" (sources."jszip-3.7.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -119020,7 +119138,7 @@ in sources."signal-exit-3.0.6" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-git-2.47.0" // { + (sources."simple-git-2.47.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -119327,11 +119445,11 @@ in sources."isarray-0.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json3-3.2.6" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."linewise-0.0.3" sources."lodash-2.4.2" sources."map-stream-0.0.7" @@ -119848,10 +119966,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.775.0"; + version = "1.779.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.775.0.tgz"; - sha512 = "+LVwS0RePl+mKTnF6J+HWZNY0SkvwbytDs76n0be1TxiY3vhe/H+N+pbhvmv0smAK3ZnsRTOKiVrqkzLqhAWsg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.779.0.tgz"; + sha512 = "rlDIT5MCZE8u/pLhf1PhZML56qwU7s9nVWYMneAjXhLcyYIL51V4qW+UETeX0psfmpijDhq16nOdmVy6dwLLrA=="; }; buildInputs = globalBuildInputs; meta = { @@ -119875,7 +119993,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."accepts-1.3.7" sources."base64-arraybuffer-1.0.1" sources."base64id-2.0.0" @@ -120490,7 +120608,7 @@ in sources."multiserver-3.7.2" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" - sources."mutexify-1.3.1" + sources."mutexify-1.4.0" sources."muxrpc-6.5.3" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" @@ -121102,7 +121220,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1037.0" // { + (sources."aws-sdk-2.1039.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -121388,14 +121506,14 @@ in sources."uri-js-3.0.2" ]; }) - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-faker-0.2.16" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json5-1.0.1" sources."jsonpointer-5.0.0" sources."jspath-0.3.4" - (sources."jsprim-1.4.1" // { + (sources."jsprim-1.4.2" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -122014,7 +122132,7 @@ in sources."postcss-resolve-nested-selector-0.1.1" sources."postcss-safe-parser-6.0.0" sources."postcss-selector-parser-6.0.6" - sources."postcss-value-parser-4.1.0" + sources."postcss-value-parser-4.2.0" sources."punycode-2.1.1" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" @@ -122098,7 +122216,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/pug-2.0.5" sources."@types/sass-1.43.1" sources."ansi-styles-4.3.0" @@ -122188,7 +122306,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/pug-2.0.5" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -122232,7 +122350,7 @@ in sources."to-regex-range-5.0.1" sources."tslib-2.3.1" sources."typescript-4.5.2" - sources."vscode-css-languageservice-5.1.8" + sources."vscode-css-languageservice-5.1.9" (sources."vscode-emmet-helper-2.6.4" // { dependencies = [ sources."vscode-uri-2.1.2" @@ -122279,7 +122397,7 @@ in sources."csso-4.2.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" sources."domutils-2.8.0" sources."entities-2.2.0" sources."mdn-data-2.0.14" @@ -122996,10 +123114,10 @@ in sources."isstream-0.1.2" sources."js-yaml-3.14.1" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."locate-path-3.0.0" sources."long-4.0.0" sources."mime-2.6.0" @@ -124270,7 +124388,7 @@ in sources."@types/cors-2.8.12" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -124336,7 +124454,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.19.1" + sources."core-js-3.19.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.1.3" @@ -124359,7 +124477,7 @@ in sources."dicer-0.3.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" sources."domutils-2.8.0" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" @@ -124467,10 +124585,10 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-buffer-3.0.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - (sources."jsprim-1.4.1" // { + (sources."jsprim-1.4.2" // { dependencies = [ sources."extsprintf-1.3.0" sources."verror-1.10.0" @@ -124825,7 +124943,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" (sources."jsonfile-6.1.0" // { @@ -124833,7 +124951,7 @@ in sources."universalify-2.0.0" ]; }) - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."keypress-0.2.1" sources."lru-cache-6.0.0" sources."mime-db-1.51.0" @@ -125362,7 +125480,7 @@ in sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.7.4" + sources."color-string-1.8.1" sources."colors-1.4.0" sources."colorspace-1.1.4" sources."component-emitter-1.3.0" @@ -125613,7 +125731,7 @@ in sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w=="; }; dependencies = [ - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -125969,7 +126087,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@vercel/build-utils-2.12.2" sources."@vercel/go-1.2.3" sources."@vercel/node-1.12.1" @@ -126468,9 +126586,9 @@ in sources."jsonc-parser-3.0.0" sources."request-light-0.5.5" sources."typescript-4.5.2" - sources."vscode-css-languageservice-5.1.8" - sources."vscode-html-languageservice-4.1.1" - sources."vscode-json-languageservice-4.2.0-next.1" + sources."vscode-css-languageservice-5.1.9" + sources."vscode-html-languageservice-4.2.0" + sources."vscode-json-languageservice-4.2.0-next.2" sources."vscode-jsonrpc-8.0.0-next.4" sources."vscode-languageserver-8.0.0-next.5" (sources."vscode-languageserver-protocol-3.17.0-next.11" // { @@ -126590,9 +126708,9 @@ in sources."diff-5.0.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" sources."domutils-2.8.0" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.3" @@ -126651,7 +126769,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jest-worker-27.3.1" + sources."jest-worker-27.4.2" sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" @@ -126990,11 +127108,11 @@ in sources."isurl-1.0.0" sources."js-yaml-3.14.1" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-2.4.0" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."klaw-1.3.1" sources."lodash-4.17.21" sources."log-symbols-2.2.0" @@ -127162,7 +127280,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -128122,7 +128240,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.19.1" + sources."core-js-pure-3.19.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ @@ -128319,7 +128437,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/yauzl-2.9.2" sources."acorn-8.6.0" sources."acorn-jsx-5.3.2" @@ -128426,7 +128544,7 @@ in sources."doctrine-3.0.0" sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" - sources."domhandler-4.2.2" + sources."domhandler-4.3.0" sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."dtrace-provider-0.8.8" @@ -128577,7 +128695,7 @@ in sources."json-buffer-3.0.0" sources."json-merge-patch-0.2.3" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" @@ -128592,7 +128710,7 @@ in sources."semver-5.7.1" ]; }) - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" (sources."jszip-3.7.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -128755,7 +128873,7 @@ in ]; }) sources."signal-exit-3.0.6" - sources."sonic-boom-2.3.1" + sources."sonic-boom-2.4.0" sources."source-map-0.6.1" sources."source-map-js-0.6.2" sources."source-map-support-0.5.20" @@ -128864,7 +128982,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -128891,7 +129009,7 @@ in sources."caniuse-lite-1.0.30001283" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.4" + sources."electron-to-chromium-1.4.5" sources."enhanced-resolve-5.8.3" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -128908,7 +129026,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" - sources."jest-worker-27.3.1" + sources."jest-worker-27.4.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" @@ -129029,7 +129147,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/http-proxy-1.17.7" sources."@types/json-schema-7.0.9" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/retry-0.12.1" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -129395,7 +129513,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.1" @@ -129767,10 +129885,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.2.1.tgz"; - sha512 = "YAfvorH/uv7HZ/eHOr4inwr6D9WhNg7Z/kUvdxsxM9nRPyTPd960Z7noL4YWO9elPh1ZOnOwYNoInISXAz3eqg=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.2.2.tgz"; + sha512 = "wjMlqjhg6hNMT8EgYYkfUaM0aXwjWSQDmPO18doWLxIXG7LGBuzb+Vm/MjLrP9LPblSEhE2WWHQFfGW+Odb7vw=="; }; dependencies = [ sources."jsonc-parser-3.0.0" @@ -130048,7 +130166,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.19.1" + sources."core-js-3.19.2" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -130235,12 +130353,12 @@ in sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-0.2.3" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-nice-1.1.4" sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."just-diff-3.1.1" sources."just-diff-apply-3.1.2" sources."keyv-3.0.0" @@ -130834,7 +130952,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-16.11.10" + sources."@types/node-16.11.11" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."array-union-3.0.1" diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index f389ebb4578e..193db8bacb76 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -676,11 +676,5 @@ in zookeeper = attrs: { buildInputs = lib.optionals stdenv.isDarwin [ cctools ]; - dontBuild = false; - postPatch = '' - sed -i ext/extconf.rb -e "4a \ - FileUtils.cp '${./zookeeper-ftbfs-with-gcc-8.patch}', 'patches/zkc-3.4.5-gcc-8.patch' - " - ''; }; } diff --git a/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch b/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch deleted file mode 100644 index badb76ccfd20..000000000000 --- a/pkgs/development/ruby-modules/gem-config/zookeeper-ftbfs-with-gcc-8.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zkc-3.4.5/c/src/zookeeper.c 2019-09-13 12:05:20.647034862 +0200 -+++ zkc-3.4.5/c/src/zookeeper.c 2019-09-13 12:05:49.125360269 +0200 -@@ -3418,7 +3418,7 @@ - - static const char* format_endpoint_info(const struct sockaddr_storage* ep) - { -- static char buf[128]; -+ static char buf[128 + 6]; // include space for the port :xxxxxx - char addrstr[128]; - void *inaddr; - #ifdef WIN32 diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix new file mode 100644 index 000000000000..6090bc1d75b7 --- /dev/null +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -0,0 +1,27 @@ +{ buildGoModule, lib, fetchFromGitHub }: + +buildGoModule rec { + pname = "clickhouse-backup"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "AlexAkulov"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ThN1uvofIvV5Dt6dqxLpekTRy9pV4xb0bkVNRcfNJ2c="; + }; + + vendorSha256 = "sha256-OQGpWWerUv2asjpjMLAkgeb0Q+lMAsDXjFCh0I4ze20="; + + postConfigure = '' + export CGO_ENABLED=0 + ''; + + meta = with lib; { + homepage = "https://github.com/AlexAkulov/clickhouse-backup"; + description = "Tool for easy ClickHouse backup and restore with cloud storages support"; + license = licenses.mit; + maintainers = with maintainers; [ ma27 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 6c0465c1cf35..16ef0a99390e 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -2,13 +2,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.1"; + version = "5.2"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "1a6rmph96s7c8lpmpkizcvdf0x4jlsr5iqi7qjprxqsf6zak2rfg"; + sha256 = "sha256-NNdg3H+tB5ovKWGneOs496c0b2dv/zFYF4CZhuH07Fs="; }; outputs = [ "out" ]; diff --git a/pkgs/os-specific/linux/sgx-sdk/default.nix b/pkgs/os-specific/linux/sgx-sdk/default.nix index 130fd12cbb91..cb9d140e4edd 100644 --- a/pkgs/os-specific/linux/sgx-sdk/default.nix +++ b/pkgs/os-specific/linux/sgx-sdk/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchpatch -, fetchurl +, fetchzip , fetchFromGitHub , callPackage , autoconf @@ -9,69 +8,86 @@ , binutils , cmake , file +, gdb , git , libtool , nasm -, ncurses , ocaml , ocamlPackages , openssl , perl , python3 , texinfo -, which +, validatePkgConfig , writeShellScript +, writeText }: - +with lib; stdenv.mkDerivation rec { pname = "sgx-sdk"; - version = "2.14"; + version = "2.14.100.2"; + + versionTag = concatStringsSep "." (take 2 (splitVersion version)); src = fetchFromGitHub { owner = "intel"; repo = "linux-sgx"; - rev = "0cea078f17a24fb807e706409972d77f7a958db9"; - sha256 = "1cr2mkk459s270ng0yddgcryi0zc3dfmg9rmdrdh9mhy2mc1kx0g"; + rev = "sgx_${versionTag}"; + hash = "sha256-D/QZWBUe1gRbbjWnV10b7IPoM3utefAsOEKnQuasIrM="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - name = "replace-bin-cp-with-cp.patch"; - url = "https://github.com/intel/linux-sgx/commit/e0db5291d46d1c124980719d63829d65f89cf2c7.patch"; - sha256 = "0xwlpm1r4rl4anfhjkr6fgz0gcyhr0ng46fv8iw9hfsh891yqb7z"; - }) - (fetchpatch { - name = "sgx_ippcp.h.patch"; - url = "https://github.com/intel/linux-sgx/commit/e5929083f8161a8e7404afc0577936003fbb9d0b.patch"; - sha256 = "12bgs9rxlq82hn5prl9qz2r4mwypink8hzdz4cki4k4cmkw961f5"; - }) - ]; + postUnpack = + let + optlibName = "optimized_libs_${versionTag}.tar.gz"; + optimizedLibs = fetchzip { + url = "https://download.01.org/intel-sgx/sgx-linux/${versionTag}/${optlibName}"; + hash = "sha256-FjNhNV9+KDMvBYdWXZbua6qYOc3Z1/jtcF4j52TSxQY="; + stripRoot = false; + }; + sgxIPPCryptoHeader = "${optimizedLibs}/external/ippcp_internal/inc/sgx_ippcp.h"; + in + '' + # Make sure this is the right version of linux-sgx + grep -q '"${version}"' "$src/common/inc/internal/se_version.h" \ + || (echo "Could not find expected version ${version} in linux-sgx source" >&2 && exit 1) + + # Make sure we use the correct version to build IPP Crypto + grep -q 'optlib_name=${optlibName}' "$src/download_prebuilt.sh" \ + || (echo "Could not find expected optimized libs ${optlibName} in linux-sgx source" >&2 && exit 1) + + # Add missing sgx_ippcp.h: https://github.com/intel/linux-sgx/pull/752 + ln -s ${sgxIPPCryptoHeader} "$sourceRoot/external/ippcp_internal/inc/sgx_ippcp.h" + ''; + postPatch = '' - patchShebangs ./linux/installer/bin/build-installpkg.sh \ - ./linux/installer/common/sdk/createTarball.sh \ - ./linux/installer/common/sdk/install.sh + # https://github.com/intel/linux-sgx/pull/730 + substituteInPlace buildenv.mk --replace '/bin/cp' 'cp' + + patchShebangs linux/installer/bin/build-installpkg.sh \ + linux/installer/common/sdk/createTarball.sh \ + linux/installer/common/sdk/install.sh ''; - dontConfigure = true; + # We need `cmake` as a build input but don't use it to kick off the build phase + dontUseCmakeConfigure = true; # SDK built with stackprotector produces broken enclaves which crash at runtime. # Disable all to be safe, SDK build configures compiler mitigations manually. hardeningDisable = [ "all" ]; nativeBuildInputs = [ + autoconf + automake cmake + file git ocaml ocamlPackages.ocamlbuild perl python3 texinfo - nasm - file - ncurses - autoconf - automake + validatePkgConfig ]; buildInputs = [ @@ -84,75 +100,174 @@ stdenv.mkDerivation rec { # Build external/ippcp_internal first. The Makefile is rewritten to make the # build faster by splitting different versions of ipp-crypto builds and to # avoid patching the Makefile for reproducibility issues. - buildPhase = let - ipp-crypto-no_mitigation = callPackage (import ./ipp-crypto.nix) {}; + preBuild = + let + ipp-crypto-no_mitigation = callPackage ./ipp-crypto.nix { }; - sgx-asm-pp = "python ${src}/build-scripts/sgx-asm-pp.py --assembler=nasm"; + sgx-asm-pp = "python ${src}/build-scripts/sgx-asm-pp.py --assembler=nasm"; - nasm-load = writeShellScript "nasm-load" "${sgx-asm-pp} --MITIGATION-CVE-2020-0551=LOAD $@"; - ipp-crypto-cve_2020_0551_load = callPackage (import ./ipp-crypto.nix) { - extraCmakeFlags = [ "-DCMAKE_ASM_NASM_COMPILER=${nasm-load}" ]; - }; + nasm-load = writeShellScript "nasm-load" "${sgx-asm-pp} --MITIGATION-CVE-2020-0551=LOAD $@"; + ipp-crypto-cve_2020_0551_load = callPackage ./ipp-crypto.nix { + extraCmakeFlags = [ "-DCMAKE_ASM_NASM_COMPILER=${nasm-load}" ]; + }; - nasm-cf = writeShellScript "nasm-cf" "${sgx-asm-pp} --MITIGATION-CVE-2020-0551=CF $@"; - ipp-crypto-cve_2020_0551_cf = callPackage (import ./ipp-crypto.nix) { - extraCmakeFlags = [ "-DCMAKE_ASM_NASM_COMPILER=${nasm-cf}" ]; - }; - in '' - cd external/ippcp_internal + nasm-cf = writeShellScript "nasm-cf" "${sgx-asm-pp} --MITIGATION-CVE-2020-0551=CF $@"; + ipp-crypto-cve_2020_0551_cf = callPackage ./ipp-crypto.nix { + extraCmakeFlags = [ "-DCMAKE_ASM_NASM_COMPILER=${nasm-cf}" ]; + }; + in + '' + header "Setting up IPP crypto build artifacts" - mkdir -p lib/linux/intel64/no_mitigation - cp ${ipp-crypto-no_mitigation}/lib/intel64/libippcp.a lib/linux/intel64/no_mitigation - chmod a+w lib/linux/intel64/no_mitigation/libippcp.a - cp ${ipp-crypto-no_mitigation}/include/* ./inc + pushd 'external/ippcp_internal' - mkdir -p lib/linux/intel64/cve_2020_0551_load - cp ${ipp-crypto-cve_2020_0551_load}/lib/intel64/libippcp.a lib/linux/intel64/cve_2020_0551_load - chmod a+w lib/linux/intel64/cve_2020_0551_load/libippcp.a + install ${ipp-crypto-no_mitigation}/include/* inc/ - mkdir -p lib/linux/intel64/cve_2020_0551_cf - cp ${ipp-crypto-cve_2020_0551_cf}/lib/intel64/libippcp.a lib/linux/intel64/cve_2020_0551_cf - chmod a+w lib/linux/intel64/cve_2020_0551_cf/libippcp.a + install -D -m a+rw ${ipp-crypto-no_mitigation}/lib/intel64/libippcp.a \ + lib/linux/intel64/no_mitigation/libippcp.a + install -D -m a+rw ${ipp-crypto-cve_2020_0551_load}/lib/intel64/libippcp.a \ + lib/linux/intel64/cve_2020_0551_load/libippcp.a + install -D -m a+rw ${ipp-crypto-cve_2020_0551_cf}/lib/intel64/libippcp.a \ + lib/linux/intel64/cve_2020_0551_cf/libippcp.a - rm -f ./inc/ippcp.h - patch ${ipp-crypto-no_mitigation}/include/ippcp.h -i ./inc/ippcp20u3.patch -o ./inc/ippcp.h + rm inc/ippcp.h + patch ${ipp-crypto-no_mitigation}/include/ippcp.h -i inc/ippcp20u3.patch -o inc/ippcp.h - mkdir -p license - cp ${ipp-crypto-no_mitigation.src}/LICENSE ./license + install -D ${ipp-crypto-no_mitigation.src}/LICENSE license/LICENSE - # Build the SDK installation package. - cd ../.. + popd + ''; - # Nix patches make so that $(SHELL) defaults to "sh" instead of "/bin/sh". - # The build uses $(SHELL) as an argument to file -L which requires a path. - make SHELL=$SHELL sdk_install_pkg + buildFlags = [ + "sdk_install_pkg" + ]; - runHook postBuild - ''; + enableParallelBuilding = true; postBuild = '' - patchShebangs ./linux/installer/bin/sgx_linux_x64_sdk_*.bin + patchShebangs linux/installer/bin/sgx_linux_x64_sdk_${version}.bin ''; installPhase = '' - echo -e 'no\n'$out | ./linux/installer/bin/sgx_linux_x64_sdk_*.bin + runHook preInstall + + installDir=$TMPDIR + ./linux/installer/bin/sgx_linux_x64_sdk_${version}.bin -prefix $installDir + installDir=$installDir/sgxsdk + + header "Move files created by installer" + + mkdir -p $out/bin + pushd $out + + mv $installDir/bin/sgx-gdb $out/bin + mkdir $out/bin/x64 + for file in $installDir/bin/x64/*; do + mv $file bin/ + ln -sr bin/$(basename $file) bin/x64/ + done + rmdir $installDir/bin/{x64,} + + # Move `lib64` to `lib` and symlink `lib64` + mv $installDir/lib64 lib + ln -s lib/ lib64 + + mv $installDir/include/ . + + mkdir -p share/ + mv $installDir/{SampleCode,licenses} share/ + + mkdir -p share/bin + mv $installDir/{environment,buildenv.mk} share/bin/ + ln -s share/bin/{environment,buildenv.mk} . + + # pkgconfig should go to lib/ + mv $installDir/pkgconfig lib/ + ln -s lib/pkgconfig/ . + + # Also create the `sdk_libs` for compat. All the files + # link to libraries in `lib64/`, we shouldn't link the entire + # directory, however, as there seems to be some ambiguity between + # SDK and PSW libraries. + mkdir sdk_libs/ + for file in $installDir/sdk_libs/*; do + ln -sr lib/$(basename $file) sdk_libs/ + rm $file + done + rmdir $installDir/sdk_libs + + # No uninstall script required + rm $installDir/uninstall.sh + + # Create an `sgxsdk` symlink which points to `$out` for compat + ln -sr . sgxsdk + + # Make sure we didn't forget any files + rmdir $installDir || (echo "Error: The directory $installDir still contains unhandled files: $(ls -A $installDir)" >&2 && exit 1) + + popd + + runHook postInstall ''; - dontFixup = true; + + preFixup = '' + header "Strip sgxsdk prefix" + for path in "$out/share/bin/environment" "$out/bin/sgx-gdb"; do + substituteInPlace $path --replace "$TMPDIR/sgxsdk" "$out" + done + + header "Fixing pkg-config files" + sed -i "s|prefix=.*|prefix=$out|g" $out/lib/pkgconfig/*.pc + + header "Fixing SGX_SDK default in samples" + substituteInPlace $out/share/SampleCode/LocalAttestation/buildenv.mk \ + --replace '/opt/intel/sgxsdk' "$out" + for file in $out/share/SampleCode/*/Makefile; do + substituteInPlace $file \ + --replace '/opt/intel/sgxsdk' "$out" \ + --replace '$(SGX_SDK)/buildenv.mk' "$out/share/bin/buildenv.mk" + done + + header "Fixing BINUTILS_DIR in buildenv.mk" + substituteInPlace $out/share/bin/buildenv.mk \ + --replace 'BINUTILS_DIR ?= /usr/local/bin' \ + 'BINUTILS_DIR ?= ${BINUTILS_DIR}' + + header "Fixing GDB path in bin/sgx-gdb" + substituteInPlace $out/bin/sgx-gdb --replace '/usr/local/bin/gdb' '${gdb}/bin/gdb' + ''; doInstallCheck = true; - installCheckInputs = [ which ]; + installCheckPhase = '' - source $out/sgxsdk/environment - cd SampleCode/SampleEnclave - make SGX_MODE=SGX_SIM - ./app + runHook preInstallCheck + + # Make sure all symlinks are valid + output=$(find "$out" -type l -exec test ! -e {} \; -print) + if [[ -n "$output" ]]; then + echo "Broken symlinks:" + echo "$output" + exit 1 + fi + + runHook postInstallCheck ''; - meta = with lib; { + setupHook = writeText "setup-hook.sh" '' + sgxsdk() { + export SGX_SDK=@out@ + } + + postHooks+=(sgxsdk) + ''; + + passthru.tests = callPackage ./samples.nix { }; + + meta = { description = "Intel SGX SDK for Linux built with IPP Crypto Library"; homepage = "https://github.com/intel/linux-sgx"; - maintainers = with maintainers; [ sbellem arturcygan ]; + maintainers = with maintainers; [ sbellem arturcygan veehaitch ]; platforms = [ "x86_64-linux" ]; license = with licenses; [ bsd3 ]; }; diff --git a/pkgs/os-specific/linux/sgx-sdk/ipp-crypto.nix b/pkgs/os-specific/linux/sgx-sdk/ipp-crypto.nix index 52cef4f82815..ac5fd2ad1ccc 100644 --- a/pkgs/os-specific/linux/sgx-sdk/ipp-crypto.nix +++ b/pkgs/os-specific/linux/sgx-sdk/ipp-crypto.nix @@ -4,7 +4,7 @@ , cmake , python3 , nasm -, extraCmakeFlags ? [] +, extraCmakeFlags ? [ ] }: stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/sgx-sdk/samples.nix b/pkgs/os-specific/linux/sgx-sdk/samples.nix new file mode 100644 index 000000000000..82dbc24568ef --- /dev/null +++ b/pkgs/os-specific/linux/sgx-sdk/samples.nix @@ -0,0 +1,57 @@ +{ stdenv +, sgx-sdk +, which +}: +let + buildSample = name: stdenv.mkDerivation rec { + inherit name; + + src = sgx-sdk.out; + sourceRoot = "${sgx-sdk.name}/share/SampleCode/${name}"; + + buildInputs = [ + sgx-sdk + ]; + enableParallelBuilding = true; + buildFlags = [ + "SGX_MODE=SIM" + ]; + + installPhase = '' + mkdir $out + install -m 755 app $out/app + install *.so $out/ + ''; + + doInstallCheck = true; + installCheckInputs = [ which ]; + installCheckPhase = '' + pushd $out + ./app + popd + ''; + }; +in +{ + cxx11SGXDemo = buildSample "Cxx11SGXDemo"; + localAttestation = (buildSample "LocalAttestation").overrideAttrs (oldAttrs: { + installPhase = '' + mkdir $out + cp -r bin/. $out/ + ''; + }); + powerTransition = (buildSample "PowerTransition").overrideAttrs (oldAttrs: { + # Requires interaction + doInstallCheck = false; + }); + remoteAttestation = (buildSample "RemoteAttestation").overrideAttrs (oldAttrs: { + dontFixup = true; + installCheckPhase = '' + echo "a" | LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/sample_libcrypto ./app + ''; + }); + sampleEnclave = buildSample "SampleEnclave"; + sampleEnclavePCL = buildSample "SampleEnclavePCL"; + sealUnseal = buildSample "SealUnseal"; + switchless = buildSample "Switchless"; +} diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 802948474bc3..97c92fe0ec33 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGo117Module rec { pname = "grafana"; - version = "8.2.5"; + version = "8.3.0"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,15 +10,15 @@ buildGo117Module rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-Bi4z8HqKUeVOxbkKXazNIzFBFy7lW0T27ROVC6enrZE="; + sha256 = "sha256-I+jfWHkTm11qIm6CdDFOFHs/qR9pswbjAdfejkxZnrQ="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-ngQA8580rvH3C04TfuIsdiStbvk7/HRDDtS04gR92M4="; + sha256 = "sha256-o8uw9VRuK93IbZgcZmFmZ2zbgKdryGbeaPAlQr8wJXw="; }; - vendorSha256 = "sha256-adWWL2shdsp1hGxhYvxBbr1YFM89Ym1J0kBNGUrj6vc="; + vendorSha256 = "sha256-aS9yz0JODZtichaIkiBJLiMjbjGY93eSYwuactbRqOY="; nativeBuildInputs = [ wire ]; @@ -26,19 +26,14 @@ buildGo117Module rec { # Generate DI code that's required to compile the package. # From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35 wire gen -tags oss ./pkg/server + wire gen -tags oss ./pkg/cmd/grafana-cli/runner # The testcase makes an API call against grafana.com: # - # --- Expected - # +++ Actual - # @@ -1,4 +1,4 @@ - # (map[string]interface {}) (len=2) { - # - (string) (len=5) "error": (string) (len=16) "plugin not found", - # - (string) (len=7) "message": (string) (len=16) "Plugin not found" - # + (string) (len=5) "error": (string) (len=171) "Failed to send request: Get \"https://grafana.com/api/plugins/repo/test\": dial tcp: lookup grafana.com on [::1]:53: read udp [::1]:48019->[::1]:53: read: connection refused", - # + (string) (len=7) "message": (string) (len=24) "Failed to install plugin" - # } - sed -i -e '/func TestPluginInstallAccess/a t.Skip();' pkg/tests/api/plugins/api_install_test.go + # [...] + # grafana> t=2021-12-02T14:24:58+0000 lvl=dbug msg="Failed to get latest.json repo from github.com" logger=update.checker error="Get \"https://raw.githubusercontent.com/grafana/grafana/main/latest.json\": dial tcp: lookup raw.githubusercontent.com on [::1]:53: read udp [::1]:36391->[::1]:53: read: connection refused" + # grafana> t=2021-12-02T14:24:58+0000 lvl=dbug msg="Failed to get plugins repo from grafana.com" logger=plugin.manager error="Get \"https://grafana.com/api/plugins/versioncheck?slugIn=&grafanaVersion=\": dial tcp: lookup grafana.com on [::1]:53: read udp [::1]:41796->[::1]:53: read: connection refused" + sed -i -e '/Request is not forbidden if from an admin/a t.Skip();' pkg/tests/api/plugins/api_plugins_test.go # Skip a flaky test (https://github.com/NixOS/nixpkgs/pull/126928#issuecomment-861424128) sed -i -e '/it should change folder successfully and return correct result/{N;s/$/\nt.Skip();/}'\ diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 348ffa0e37e0..5490b29090e0 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -54,6 +54,11 @@ in { version = "22.2.3"; sha256 = "sha256-ZqKaakkHOMCr7bZ3y2jHyR+rqz5kGaPJnYtAaJnrlCo="; }; + + nextcloud23 = generic { + version = "23.0.0"; + sha256 = "sha256-w3WSq8O2XI/ShFkoGiT0FLh69S/IwuqXm+P5vnXQGiw="; + }; # tip: get she sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix index 4f231137bf54..1108116af1d3 100644 --- a/pkgs/servers/piping-server-rust/default.nix +++ b/pkgs/servers/piping-server-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "piping-server-rust"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "nwtgck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7L5YNpQXJQoB/VR/x1HtPfB0F/K0IWcJUb4/wE39Zp0="; + sha256 = "sha256-3EDUG9W4WzYk/bjUFIQ7Ho0KR6aMykhyTnWR/+VNxz8="; }; - cargoSha256 = "sha256-t7TJx12CBauWW+1EZ80ouDO4p+0R5jLMaGc/YaPnYRc="; + cargoSha256 = "sha256-8xUhYyjc4560PowCRwYeZMUJLhZFTHcMRLe/iQAwaWE="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index e6605fb6ce26..7be9b53fb9f3 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.17.3"; + version = "0.17.8"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9V6yblRnOAZBYuGChjeDyOTWjCCVhdFxljSndEr7GdY="; + hash = "sha256-wjF7XTiUw5lPSmNiHvqUz4ZswpzLBoYF9S25dL8VPMU="; }; - vendorSha256 = "sha256-lFyRMoI+frzAa7sL8wIzUgzJRrCQjt9Ri8T9pHIpoug="; + vendorSha256 = "sha256-rntfePkwNGnyPjIzjLJhBYLTcndHP605Ah/xPcM6sRo="; # Tests need docker doCheck = false; diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 51123f55b60b..7f746b9a49bb 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -5,7 +5,7 @@ , util-linux , bash , makeWrapper -, electron_12 +, electron }: let @@ -23,8 +23,6 @@ let "i686-linux" = "i386"; }."${system}" or throwSystem; - electron = electron_12; - in stdenv.mkDerivation rec { diff --git a/pkgs/tools/misc/lilo/default.nix b/pkgs/tools/misc/lilo/default.nix index 2babcb2bedd7..bba9db383907 100644 --- a/pkgs/tools/misc/lilo/default.nix +++ b/pkgs/tools/misc/lilo/default.nix @@ -8,7 +8,12 @@ stdenv.mkDerivation rec { hash = "sha256-4VjxneRWDJNevgUHwht5v/F2GLkjDYB2/oxf/5/b1bE="; }; nativeBuildInputs = [ dev86 sharutils ]; - DESTDIR = placeholder "out"; + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "SBIN_DIR=/bin" + "USRSBIN_DIR=/bin" + "MAN_DIR=/share/man" + ]; meta = with lib; { homepage = "https://www.joonet.de/lilo/"; diff --git a/pkgs/tools/security/gospider/default.nix b/pkgs/tools/security/gospider/default.nix index f4b750d394a0..469be63a9024 100644 --- a/pkgs/tools/security/gospider/default.nix +++ b/pkgs/tools/security/gospider/default.nix @@ -1,20 +1,20 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { pname = "gospider"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "jaeles-project"; repo = pname; - rev = version; - sha256 = "sha256-yfW94sQzT1u6O0s1sqpeANlukC5y8fNvHNL2c77+dxU="; + rev = "v${version}"; + sha256 = "sha256-1EnKheHaS1kxw0cjxCahT3rUWBXiqxjKefrDBI2xIvY="; }; - vendorSha256 = "sha256-1aOw0lk+khcX9IETA0+wGx91BFXrJ79zYWhEI2JrhDU="; + vendorSha256 = "sha256-egjjSEZH8F6UMbnkz3xytIzdW/oITB3RL1ddxrmvSZM="; # tests require internet access and API keys doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f9fe8d7caf6..65418a5c5478 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1480,7 +1480,7 @@ with pkgs; bic = callPackage ../development/interpreters/bic { }; binance = callPackage ../applications/misc/binance { - electron = electron_12; + electron = electron_13; }; bit = callPackage ../applications/version-management/git-and-tools/bit { }; @@ -3489,7 +3489,7 @@ with pkgs; pn = callPackage ../tools/text/pn { }; pocket-casts = callPackage ../applications/audio/pocket-casts { - electron = electron_12; + electron = electron_14; }; poweralertd = callPackage ../tools/misc/poweralertd { }; @@ -5028,7 +5028,9 @@ with pkgs; escrotum = callPackage ../tools/graphics/escrotum { }; - etcher = callPackage ../tools/misc/etcher { }; + etcher = callPackage ../tools/misc/etcher { + electron = electron_14; + }; ethtool = callPackage ../tools/misc/ethtool { }; @@ -7917,7 +7919,7 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud20 nextcloud21 nextcloud22; + nextcloud20 nextcloud21 nextcloud22 nextcloud23; nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -10022,7 +10024,7 @@ with pkgs; thc-ipv6 = callPackage ../tools/security/thc-ipv6 { }; thedesk = callPackage ../applications/misc/thedesk { - electron = electron_12; + electron = electron_14; }; theharvester = callPackage ../tools/security/theharvester { }; @@ -20655,6 +20657,8 @@ with pkgs; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli; + clickhouse-backup = callPackage ../development/tools/database/clickhouse-backup { }; + couchdb3 = callPackage ../servers/http/couchdb/3.nix { erlang = erlangR22; }; @@ -29142,7 +29146,7 @@ with pkgs; weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; whalebird = callPackage ../applications/misc/whalebird { - electron = electron_12; + electron = electron_14; }; wio = callPackage ../applications/window-managers/wio { }; @@ -31873,7 +31877,7 @@ with pkgs; geogebra = callPackage ../applications/science/math/geogebra { }; geogebra6 = callPackage ../applications/science/math/geogebra/geogebra6.nix { - electron = electron_12; + electron = electron_14; }; maxima = callPackage ../applications/science/math/maxima {