diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-05 00:13:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 00:13:14 +0000 |
| commit | 85f6f759598316052872e46c1cf1ccd4a6976ae3 (patch) | |
| tree | 1e5e50a9d22387d08c7d78cd2808098c02c707f8 | |
| parent | a09e41ed5a7c1424c4dc483046e67afae1994a39 (diff) | |
| parent | 231e60ee5c1b1f1fcbec7f867e3f57731ccc661e (diff) | |
Merge master into haskell-updates
183 files changed, 2384 insertions, 3410 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index 61bb531d2f627..c7d40339d05f5 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -343,7 +343,24 @@ rec { , newScope }: { otherSplices + # Attrs from `self` which won't be spliced. + # Avoid using keep, it's only used for a python hook workaround, added in PR #104201. + # ex: `keep = (self: { inherit (self) aAttr; })` , keep ? (_self: {}) + # Additional attrs to add to the sets `callPackage`. + # When the package is from a subset (but not a subset within a package IS #211340) + # within `spliced0` it will be spliced. + # When using an package outside the set but it's available from `pkgs`, use the package from `pkgs.__splicedPackages`. + # If the package is not available within the set or in `pkgs`, such as a package in a let binding, it will not be spliced + # ex: + # ``` + # nix-repl> darwin.apple_sdk.frameworks.CoreFoundation + # «derivation ...CoreFoundation-11.0.0.drv» + # nix-repl> darwin.CoreFoundation + # error: attribute 'CoreFoundation' missing + # nix-repl> darwin.callPackage ({ CoreFoundation }: CoreFoundation) { } + # «derivation ...CoreFoundation-11.0.0.drv» + # ``` , extra ? (_spliced0: {}) , f }: diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 0e704b7d7de0d..75578b9749454 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -115,6 +115,7 @@ rec { }; gnu64 = { config = "x86_64-unknown-linux-gnu"; }; + gnu64_simplekernel = gnu64 // platforms.pc_simplekernel; # see test/cross/default.nix gnu32 = { config = "i686-unknown-linux-gnu"; }; musl64 = { config = "x86_64-unknown-linux-musl"; }; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 876c7531a992f..40c1c894f955c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1411,6 +1411,12 @@ githubId = 58516559; name = "Alexander Rezvov"; }; + argrat = { + email = "n.bertazzo@protonmail.com"; + github = "argrat"; + githubId = 98821629; + name = "Nicolò Bertazzo"; + }; arian-d = { email = "arianxdehghani@gmail.com"; github = "arian-d"; @@ -19179,6 +19185,12 @@ githubId = 43315; name = "William Roe"; }; + wladmis = { + email = "dev@wladmis.org"; + github = "wladmis"; + githubId = 5000261; + name = "Wladmis"; + }; wldhx = { email = "wldhx+nixpkgs@wldhx.me"; github = "wldhx"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 5a205f3cb22ee..ea5f4a53e1d12 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -440,6 +440,7 @@ with lib.maintainers; { members = [ GaetanLepage natsukium + thomasjm ]; scope = "Maintain Jupyter and related packages."; shortName = "Jupyter"; diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix index de739faabee9c..698d9c2b46c46 100644 --- a/nixos/modules/programs/wayland/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -42,11 +42,6 @@ in { <https://github.com/swaywm/sway/wiki> and "man 5 sway" for more information''); - enableRealtime = mkEnableOption (lib.mdDoc '' - add CAP_SYS_NICE capability on `sway` binary for realtime scheduling - privileges. This may improve latency and reduce stuttering, specially in - high load scenarios'') // { default = true; }; - package = mkOption { type = with types; nullOr package; default = defaultSwayPackage; @@ -154,14 +149,6 @@ in { "sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config"; }; }; - security.wrappers = mkIf (cfg.enableRealtime && cfg.package != null) { - sway = { - owner = "root"; - group = "root"; - source = "${cfg.package}/bin/sway"; - capabilities = "cap_sys_nice+ep"; - }; - }; # To make a Sway session available if a display manager like SDDM is enabled: services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; } (import ./wayland-session.nix { inherit lib pkgs; }) diff --git a/nixos/modules/services/hardware/throttled.nix b/nixos/modules/services/hardware/throttled.nix index 9fa4958861198..0f1f00348ee8d 100644 --- a/nixos/modules/services/hardware/throttled.nix +++ b/nixos/modules/services/hardware/throttled.nix @@ -27,6 +27,7 @@ in { then pkgs.writeText "throttled.conf" cfg.extraConfig else "${pkgs.throttled}/etc/throttled.conf"; + hardware.cpu.x86.msr.enable = true; # Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs. # See https://github.com/erpalma/throttled/issues/215 hardware.cpu.x86.msr.settings.allow-writes = diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index ffc05d0e41f87..8b4ea2aa53c99 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -220,7 +220,7 @@ in "catch_workers_output" = true; }; phpEnv = { - FRESHRSS_DATA_PATH = "${cfg.dataDir}"; + DATA_PATH = "${cfg.dataDir}"; }; }; }; @@ -267,7 +267,7 @@ in WorkingDirectory = cfg.package; }; environment = { - FRESHRSS_DATA_PATH = cfg.dataDir; + DATA_PATH = cfg.dataDir; }; script = @@ -302,7 +302,7 @@ in wantedBy = [ "multi-user.target" ]; startAt = "*:0/5"; environment = { - FRESHRSS_DATA_PATH = cfg.dataDir; + DATA_PATH = cfg.dataDir; }; serviceConfig = defaultServiceConfig //{ ExecStart = "${cfg.package}/app/actualize_script.php"; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index fc32870457101..361dbe879a184 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -29,7 +29,7 @@ let libsForQt5 = pkgs.plasma5Packages; inherit (libsForQt5) kdeGear kdeFrameworks plasma5; inherit (lib) - getBin optionalString literalExpression + getBin optionalAttrs optionalString literalExpression mkRemovedOptionModule mkRenamedOptionModule mkDefault mkIf mkMerge mkOption mkPackageOptionMD types; @@ -178,7 +178,7 @@ in capabilities = "cap_sys_nice+ep"; source = "${getBin plasma5.kwin}/bin/kwin_wayland"; }; - } // mkIf (!cfg.runUsingSystemd) { + } // optionalAttrs (!cfg.runUsingSystemd) { start_kdeinit = { setuid = true; owner = "root"; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index f8d4232798b21..120a72dbd50f5 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -14,14 +14,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.11.3"; + version = "3.11.4"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "p8BgpvMK1kP4VnRfmcvSMbXmWs5DmWBZ6te7L9b+UJQ="; + sha256 = "kEhyV1o8VSQW9qMx6m5avj6LnJuVTONDd6msRuc8t/4="; }; patches = [ diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index f04f343e85de7..6165e2c6181a5 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.24"; + version = "10.26"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - sha256 = "sha256-18rHv9sbxpuMfMrqoSSeEncDmQlWpdA/xNPoYJoIgJ0="; + sha256 = "sha256-SXuuAavvqzZ7DRX6SKfPfC1smbTHVHUAv80w0RHLfpg="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index 189f1139d7e7b..3e130b0855d40 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "12.0.4"; + version = "13.0.0"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-pOs3VfgpDUD8KiBmJ37qpGLguxOXm5cr+jlTEeRZ4Bk="; + sha256 = "sha256-cYoGjge2VtU+QqIURGd/EpkSQ4fhvsdnYZYyESAd56U="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index f9a73abb64c1c..549437313bb4f 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "23.7.3"; + version = "23.10.0"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-wSymqYYVV+C/jycHb4yK/M5vFWRofl8Cv9yWwrGIRv8="; + sha256 = "sha256-PHXzeSv9sIknBbN48Li/wU72zs8div5xHY2Gh+1mh88="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 9eed461413a6c..84df7d5b0c275 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.200.0"; + version = "1.201.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-0+bjp9JOR06wLzA3CJqtGjCK1M0qPdzoLRt6+fV8tJ0="; + hash = "sha256-Do2JPNZtoi7zbUnJomQAZ8zR/WPB6+G051xZWmeUBP4="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 52a333495ef61..e2c4746735dfc 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.10.02", - "hash": "sha256-9oV8xqkqpCfA7rk4UMxWFBIFQQ9slClFbaENRldFb8Q=" + "rev": "2023.10.30", + "hash": "sha256-fuTQnnuWjIsABx457y+n6luLxQf+b9TiZGLXYjNsUrw=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.10.03", - "hash": "sha256-dJYpsvJNwQg6/NeXT23cpWFXwcfIYnWkHYoDItiUeOo=" + "rev": "2023.10.30", + "hash": "sha256-xsJ02zGzi7ByFBXql4lLWWLiPVWwtOLXzixmv4AeC2I=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -36,7 +36,7 @@ }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2023.06.29", + "rev": "2023.06.30", "hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc=" }, "Emmet-Pascal": { diff --git a/pkgs/applications/editors/greenfoot/default.nix b/pkgs/applications/editors/greenfoot/default.nix index 52d52a0785eea..6ca6f35246d3e 100644 --- a/pkgs/applications/editors/greenfoot/default.nix +++ b/pkgs/applications/editors/greenfoot/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "greenfoot"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb"; - sha256 = "sha256-HDXmgLHS18VZVV+hCA0RgIrKRftOlV7t+fvE0pAHGjk="; + sha256 = "sha256-utGSAbP74O1t1iEoN0CwiZVc8HxdCxhozPPMwQCtkEE="; }; nativeBuildInputs = [ dpkg wrapGAppsHook ]; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e63b4601ebaed..36553edc74e43 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2023-10-07"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "ac963d9dc54f175128aa31abc9a08c10ebef1ab3"; - sha256 = "05vzgn9lv6kkq81g31c9sc7bi5733x2jllzcm3vvk5mqzv3aczgp"; + rev = "ecca5017b6b27e1bded009f9725186d941d85b53"; + sha256 = "01dc9rih8f3hxvj5mi8ahdh7gf1hgb2zrks3wb8im4f4lc6nkdjz"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2023-10-22"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "e7130c8250c403140ce504bde9e973d5a301ab4c"; - sha256 = "0riz7djpmfald4dy41rwml7fr11jm85kqs3bkb020dhi9lgh22zw"; + rev = "db31b4073bd18d7e2d8e09b2752d51da01fc7722"; + sha256 = "1dx7vh8x46jy2f6rz3mqhygvyzxczmz7azrxsdc1z7702yp4qzha"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2023-10-17"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "2c85c8b160fb13d8af4fac3efbd6d48badf146cf"; - sha256 = "1z2y7pzk0fl8yphwsbfbdhhwcj2xlzn9bwfmrdqhjs9p722mqgjn"; + rev = "59bf3ccc33bcf7010a06521fd3ac9be912261bd3"; + sha256 = "14hnfva8mp9dy0bw5hsm5dj2axkpvhn9qa3w5h51aljkgcn6r7nb"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-10-19"; + version = "2023-11-03"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "e0268efbb748bc12c024311540acb91d7ed1148e"; - sha256 = "1nm0gsmz0mfb815ahqhm4wsdh4lr9i1bsljyi9mlfg11xqc0a62i"; + rev = "686687585c040529f7efa68aa433282068c9d78b"; + sha256 = "1n6f1i9g90m31s6skkk786hrd5qbafcvshv845adcph6mvs54gbb"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-10-20"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "3a3baf0930444c78d19964fdb401bd3a6a23270f"; - sha256 = "0nb6q36hd71migzzqrdrhak0a55l7li3v1vlij95wwi9yf8pry8n"; + rev = "8e4090bf9412e24b05823c771cb3956c2ba72981"; + sha256 = "0rwk63ggp6n7sm4s53zpd292y0lm4gag4gymcp80gbfywj73bl5l"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -631,12 +631,12 @@ final: prev: ansible-vim = buildVimPlugin { pname = "ansible-vim"; - version = "2022-02-11"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "93798e8c89c441d29d4678da0c0d5e1429eb43b0"; - sha256 = "0r2q7iyw0y7zaf33k6ka5ca9v6g7zlmya5x0ph5xgsylmglq6jca"; + rev = "afc739e505053a6143a1fc6cedac6fb4d7a1d4db"; + sha256 = "0hfbfjnzs53anzc9ljmbiph3xsq8d84kxx03msab05953sgyq3id"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -811,12 +811,12 @@ final: prev: aurora = buildVimPlugin { pname = "aurora"; - version = "2023-10-12"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "3fc8e5a30e7cdbabb34f5e18865c4d1c38755308"; - sha256 = "1jjjf4zy3mgmcfpjddjdf1c1vy3w0hz7akjk7m08wvclq16l8773"; + rev = "a7517e3dca1d4b75cba6e37d9d1f96ee1af1e7d1"; + sha256 = "14gv7w3kwlj20hhmjcd86n1mgk0fgmda39km59b947d4k6l6y6l9"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -991,12 +991,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2023-10-02"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "97d08b861cf69a4eeb63a7fa748a4392d0fca089"; - sha256 = "094gkjilrd8y8x9hnw69bxa84z8q6wr3hb8q4hcfql1sirzjsbk7"; + rev = "3f2b658cbd6650ddaf2bae3233e143a41ca25b1a"; + sha256 = "04xnnyinr93jriqg5yhwrwbf0q0zbb2ad1wrnl08sbi8fzl7a7a9"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1171,12 +1171,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2023-10-02"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3"; - sha256 = "0n99bshmyhzq4kg35gx9x3wpfyfji1ddlg66f11vgwaprsibi22a"; + rev = "9e8d2f695dd50ab6821a6a53a840c32d2067a78a"; + sha256 = "08k2b8i269c50gq3nl2s08izwl2p454xshl3yslcwwi3hsg25blm"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -2047,12 +2047,12 @@ final: prev: codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2023-10-20"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "7b2f57ba35bbff7dabd5e3eaa6e60d0490516c78"; - sha256 = "0icqlhb09grf2ivw7rzwc3krc78g3q1qpv9d3x8yqywyb95p5yyi"; + rev = "78f32674d42dcf8e5626e105bc8fb93b6c27120b"; + sha256 = "02hxv09k0qy0nkak9n2zcpadhyspml74yb7hv4mgzxlkvn1qgh90"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2287,12 +2287,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2023-10-22"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "7f5ff6d253ae3543f186787bccafdc411d3f4b0a"; - sha256 = "1iargrkz4k51bppp7qm2hlqy334x1qjg0d1ax8dr6qpkhi6al36v"; + rev = "893b139e6dcdb55dee4c98215d9217d3a1ec69eb"; + sha256 = "01y2ja4h1njqnidnf4b20z4fxsn47lqwc7dd9xjipp9651g4gx9f"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2348,24 +2348,24 @@ final: prev: copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2023-09-21"; + version = "2023-11-03"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "1a8032ae496916ccc7a7a52ee79194fbef29f462"; - sha256 = "0a3k8nb39j0n14ylg84x8c6n8g4m7llx78vad2vz247wnyw4z9sj"; + rev = "330a15ca3425a452103bc24c8287a73063089c2f"; + sha256 = "1y8bjhb1m5bbkha7dxnn90706da1j9lqmkc2g35i3hxygfmap7l7"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2023-10-18"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "59c02393c99335392e9cb572cb47951bbb4de6be"; - sha256 = "0w16vq683qddb5d7gc1f5kb5m0h3b01srnkakwnjbvbyb6l8ar9r"; + rev = "309b3c803d1862d5e84c7c9c5749ae04010123b8"; + sha256 = "1l2rvqcc85mxcpf8a5jsv79bgzb4hjl77bq02npjhpcj8gi8drna"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2384,12 +2384,12 @@ final: prev: coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; - version = "2023-08-27"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "47a748c18d6378df7aa033527d1b56d6dec94dc5"; - sha256 = "1jzxrkbynpr4nazjkw9b72liamzyb5ziqww51hc1lby72y4q0llc"; + rev = "f110ee91f1b2b897ab0026da347396756953ca41"; + sha256 = "1r4mzsvjd6swrp84cscsq7ikgqf60jm2dz4zzpja4vj1rpx4n2yc"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -3022,12 +3022,12 @@ final: prev: dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; - version = "2023-07-29"; + version = "2023-10-26"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "9fe831e685a76e1a1898a694623b33247c4d036c"; - sha256 = "03mrsy17fvdislkf50hfxp87kw2k53zfyygc21ln11792k2nmfc1"; + rev = "7200e64c589f899d29f8963aad7543856d1c2545"; + sha256 = "095jnw5wmphr7fp4n63sdjh787hlvhpz4baqcvcy7n90aiq3r3sq"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; @@ -3046,12 +3046,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2023-10-21"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "36b7cc1cc9e9d0525a3a841b1a048473ad1d619e"; - sha256 = "05504x6r4zpk4jvcidhhycmr1xrsmd2z239di6k2jhhhlja87k0l"; + rev = "570b49fb3c895808046799d16dc97ff3ef90f508"; + sha256 = "00brji6x45qrsni36fw73bi9q03a4hlk714201damgzqb35bygpn"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3070,12 +3070,12 @@ final: prev: edge = buildVimPlugin { pname = "edge"; - version = "2023-08-07"; + version = "2023-10-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "a4fd4f458331d42677d992f428235c491b2016aa"; - sha256 = "088s18nicji5zvx2xpwr2b1qvwq84ji5gd125lwxllq37vw6y6zv"; + rev = "d811acd067193fabadd04f081228fd97827ae5ae"; + sha256 = "1m62wnwkzy48s7a8q3fjzxxf3fgq2bfqvgjhmp7xkpc1bgad2rq1"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -3131,12 +3131,12 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2023-10-22"; + version = "2023-10-23"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "83263bd5679400adb07e41a0d85e056b6c865a05"; - sha256 = "1svwgg3lmwddwfc08ghpk3zlg3wfkb8h4w5jf0fxbg1as58q1a7i"; + rev = "7db13d3f609640e9f12d7d6f1251e6a8f964f579"; + sha256 = "0ih5c2llvw5sx7qxck12v5blh9kgc7kv643cjkqzhlf9cplpvihp"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -3216,12 +3216,12 @@ final: prev: everforest = buildVimPlugin { pname = "everforest"; - version = "2023-08-07"; + version = "2023-10-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "83b666410d7ae0eccf96dbbe3b4b6ac5b8172d38"; - sha256 = "1c0948bdqydl0r3qvx6p4vpaflfg82s1q9s3cl3c6alqzc46pdjh"; + rev = "72f101bd63228a1a45012325e39c5280ec22c828"; + sha256 = "0airdqkf1yrmsxl2id7v22f063j18rj499kly9rsp0qa8g3zh97r"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3300,12 +3300,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2023-09-29"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "ee9f8afdbe8654001b200530903f1dcbcc3394e6"; - sha256 = "1x7c6shkx5gxqv7lcby40gkx5f7sr4rgv23pxbzk0l2xy6nsvvmd"; + rev = "025db63b04ca0b22473871e532d90bf0d8bc1031"; + sha256 = "1qd2aphgk9kyicrkxig7fq8nj5xwb1dbxdjbq9vp68si3fahvlg1"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -3637,24 +3637,24 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-10-22"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "04e7382528f3f4970cb1cd559d06ae6f7b44560e"; - sha256 = "0rlzcyp1l9kny2sx4k0mclzkhva9kilrvjd2dnfav2chm0amwzh2"; + rev = "e5b63a01c884437b206750bcf2c7dcb102bbe8f7"; + sha256 = "1daj63f4ss4m3m18n435430kr566pi70j7315x7h1i04flpm7y39"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2023-10-14"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "d1016dbd7cec2d2a3bb5863776c84b4034e4b85e"; - sha256 = "1l4m20s2iqz6dcphqpp5xnvrbh0dl0mkchs2fmr4vjz9nw7sl1mi"; + rev = "1e054c1d075d87903647db9320116d360eb8b024"; + sha256 = "197fmlqk2hqrbsgbk9mq1kn67nf7zqcy7yn2zjk0cjk7ldppzfmk"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3685,12 +3685,12 @@ final: prev: gentoo-syntax = buildVimPlugin { pname = "gentoo-syntax"; - version = "2023-06-14"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "865f01aa04434838f0ed1915734e2200759d925b"; - sha256 = "029kbjrk7cr3zxc3yxjqi7mf58sq604xn7cx46r2kgs0d375f2gd"; + rev = "0938bf901201362721d38480f2ebd339a28a9cc1"; + sha256 = "1y9w0jvlr76k5kvd15iy9r2h75afdiydzgki60g4m6i3mh6pjfqr"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3805,12 +3805,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-10-17"; + version = "2023-10-26"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "5a9a6ac29a7805c4783cda21b80a1e361964b3f2"; - sha256 = "1vgs97iik9ziwbqv1xbs920qizcnshcpibj17mbsdr8lax8iycpl"; + rev = "af0f583cd35286dd6f0e3ed52622728703237e50"; + sha256 = "04qr0zm8cfrsf306jswah4cja8dsih3b41ikakcbvgq08qsngj86"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3865,12 +3865,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-10-23"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "8732792d9c30a113188f85f75c19f0effd199881"; - sha256 = "17jzn8dgprgr5wh2v2dxd26i44yha3rnl9dkq9ipgxxqqax1rqlg"; + rev = "57a3c3e7480031b4c04c11c948ac347f70995f73"; + sha256 = "0ha7ihrfqjdhn5biqk6yiqh0xmr85hwxkif674cdg036w3wr04qp"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -3985,12 +3985,12 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2023-10-03"; + version = "2023-10-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "c75bf1e96fdc33b8b3b613e5172a0acdba198fca"; - sha256 = "0sl7q943vxpfhkw8znzjs1i1iaz3mvbj0b8blidkl2b4377di2i6"; + rev = "d13f4d4e75510e3d798f2ff7561d3c8991220375"; + sha256 = "0hrgzfc4hss3ng6jmkn4rsvwkw1pgck98gnqv32hda4w9bni6pzc"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -4033,23 +4033,23 @@ final: prev: gv-vim = buildVimPlugin { pname = "gv.vim"; - version = "2022-10-25"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "320cc8c477c5acc4fa0e52a460d87b2af54fa051"; - sha256 = "1w0vwdvhbjs5gfggxrdphysj7y4yd53kklijgybjcchwjz98pncb"; + rev = "c67a016566e03d8936c7386e626f88956e87761e"; + sha256 = "0r2qgv22y3d2gb9l0wvgz3y9f3svn2ppydwr4rs42nyh56z702fd"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2023-10-23"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "fb74735f5c85e3e090ab8a1c312c0110426f2a5b"; + rev = "8cc4dec29a177cb7c33a900ccf45b451684c30a0"; sha256 = "0q8hpvy61qc5pbxbzkf5zna71j7h8xbvqjs23x8bimkhwgk21j0k"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; @@ -4057,11 +4057,11 @@ final: prev: hare-vim = buildVimPlugin { pname = "hare.vim"; - version = "2023-09-09"; + version = "2023-10-24"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "e24288327f88f459025a00632c7b1f543759906a"; - sha256 = "19xr3d4bbvn9s1ab9cnm3qw5lxs8jl5gs5hn62fagdl39a6bwn2d"; + rev = "92c63717c27584b53e6c9c9594e47a1840a8e107"; + sha256 = "0z4gm1p06li8fx9h0zjwbimhz8jfl9akh98a5l4q0qv211bpn0ya"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; @@ -4080,12 +4080,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-10-23"; + version = "2023-10-31"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "ba37a4ff4c42aec0ba7d1d1aad17aa0c513d7461"; - sha256 = "0fjwx6s8pr63vjzxjgz2bshic4vkcci5sdn96qibp5fgsah10y0v"; + rev = "1d2f10665927e93eb65913f65860285371d41af5"; + sha256 = "1hz26hcf5cg90ymax82d23207cyyc32p6s0w2yjn3mj27pg8qiw2"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4247,12 +4247,12 @@ final: prev: hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2023-10-02"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "smoka7"; repo = "hop.nvim"; - rev = "1cbaa79457e6b5e9b04e6d5d8d19bd6b65ffa2be"; - sha256 = "11c0bk9djs0v1szas7bcw4myw204gc0s7byiw4mqsfjqcz1qzl3p"; + rev = "ccf8e08dcc08126b1b12b32c5c76e42f6008ed56"; + sha256 = "07rhdz045pgqi9ypmhgf4grp0cfxgzl24v8qlc72qi5r8np8dgv2"; }; meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; @@ -4271,12 +4271,12 @@ final: prev: hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2023-10-06"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "a173256a9dba938e876ceb4bb5d2742f8866e349"; - sha256 = "1srpdzw0jbw2nf4h4hj8rvjrhkcs66najp6wny4cj4dr80cwx77i"; + rev = "24369e8595736077e30b3ca5fc233f44abeccb8b"; + sha256 = "16ws4jzh17cmnmb85xy2d5s94dd6zaiscgcqgv4wqqx8nspq6b7d"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4355,12 +4355,12 @@ final: prev: image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-10-22"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "1cb60be1cdc108e3a3b09cb0ed115ef75ce51320"; - sha256 = "1rdqmframawhjrb3jab4hl8mr0bsknry0i2wzbzkjysgxmp74gy2"; + rev = "ec91b89d3d3ba02b66cf7123042b90c432a7e413"; + sha256 = "0gdnkn58nqmdvkrd6zx7bg6abbzzfwz9dqpc24lz480wzvgrp9sw"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4427,12 +4427,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2023-10-23"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "2546441840172cc41e70f67c52e205cc7aa3e6ed"; - sha256 = "00p9dyqaa6h67pnkn5wh4iyvi8ydpnyqvbq5n6jk82c5c48h2s2s"; + rev = "29be0919b91fb59eca9e90690d76014233392bef"; + sha256 = "0z8n9d6f4qiq8m4ai1r2xz90955cp6cikqprq74ivfch3icrzdi1"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4788,12 +4788,12 @@ final: prev: lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2023-10-23"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "e42fccc3cda70266e0841c5126de2c23e8982800"; - sha256 = "09n839bmf2j40cvvzkry968akl1iy1pw953sdw6ilzm97pdxywy3"; + rev = "32dead0376f83b96728f5c799df64d0f0a325254"; + sha256 = "0i8g9r2yh1h6l05vrpwcl6r3ab8q0c42fhwv7q45zbhb9asl6gag"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4812,12 +4812,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-10-23"; + version = "2023-11-03"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "a32d035d6f5c57b83335813bcc84fb498b4e2b0f"; - sha256 = "1srl1h3diz65ncq9jj7qyvlzqcqmdiiv795y26111zf1ksdqzsai"; + rev = "5cf2c78e89c8492ccabd96edb580e265107176b1"; + sha256 = "1mqa0jpwyxh7h2c89swfbbva08myxsw7wk2lcw9iyw37ld118d6r"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4956,12 +4956,12 @@ final: prev: lightline-bufferline = buildVimPlugin { pname = "lightline-bufferline"; - version = "2023-06-06"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "718508395f4047eb8cd05389c1fec709cb7df90a"; - sha256 = "04pz3j1875adri8hjz6qir496jjmxjxppj3q3q5jqd08jcp9h2qx"; + rev = "d65e4d1220a35f1f19441116e0f1dab641e1cc51"; + sha256 = "0xx64dwfnra335kadr2p6a8hyv0bxpfcix7k3f0qbd1hvzf0pihc"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -5220,11 +5220,11 @@ final: prev: lsp_lines-nvim = buildVimPlugin { pname = "lsp_lines.nvim"; - version = "2023-09-25"; + version = "2023-10-29"; src = fetchgit { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "9e3f99fbbd28aaec80dc0158c43be8cca8dd5017"; - sha256 = "1rva0ykikkj8wssga5h0ccqarkvcvi9g2kgr3il889v3zsim7d2m"; + rev = "cf2306dd332e34a3e91075b40bdd4f6db824b2ee"; + sha256 = "18g9fhwr2mrjcns36h6x1xgy8q84i80566474zxsd6z7ckd8qdfw"; }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; @@ -5267,12 +5267,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-10-23"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "199eb00822f65b811f43736ba65ab7e16501125d"; - sha256 = "0a8l000bk2ss4fv75v5c2ygld2gmfiz3q1xzpzxdbyki4f7b7gj9"; + rev = "7ebd0cc5923c81516c1c050fc9aea70bec23fd02"; + sha256 = "04sg60hnb2vg22rbrvf20jc95hh65g6cwiik90pcsmj73jxz6pjl"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5315,12 +5315,12 @@ final: prev: luasnip = buildVimPlugin { pname = "luasnip"; - version = "2023-10-18"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "80a8528f084a97b624ae443a6f50ff8074ba486b"; - sha256 = "1pq2qd226kn9874dx97id9zg492snw16sb0fxj8fn61k8pw1mcpi"; + rev = "a4de64570b9620875c8ea04175cd07ed8e32ac99"; + sha256 = "0k6ql48hm0z9ii5p07cs217wz376fz8q1syl65xjcfnlvbdxb6x8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5424,12 +5424,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-10-20"; + version = "2023-10-26"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "09be3766669bfbabbe2863c624749d8da392c916"; - sha256 = "07wr0xx1bdcyjgj6xp5jbd2lx3v98m4gk92wzsd02lrm23k9lmch"; + rev = "40301e1c74bc0946eece13edf2b1c561cc497491"; + sha256 = "0j6haxvx5ha2a05wjqwlm8pwc5fp4v2a5f7vkwjij65y4vbssw6c"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5448,12 +5448,12 @@ final: prev: mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2023-10-10"; + version = "2023-10-31"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "cd7835b15f5a4204fc37e0aa739347472121a54c"; - sha256 = "0a915vj7vz87j9bgh431f3slmh6hfc23cixbcx2hy3z9azcaaqs9"; + rev = "eabf6d347fdb75be360d4c0ced1145670a171453"; + sha256 = "02gvv4bv7hl9lnb3g3rpjq8fqhc87i8zaa6lg60f0h8bjbp69pv3"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5472,12 +5472,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2023-10-21"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "5485e2e91b4117d9a4977c4afb6d70504559e1ac"; - sha256 = "0fnjrvxgrii42nrhhp1yd1k5b0sgqglvds5v7s1jh87qrk27nfaq"; + rev = "eb52634ec1f6cc186f85640ae4bf3ee80bb10551"; + sha256 = "1lb58jxkz2kzf0zqbba3znxckadi09yna9lmyq3my59xzkaqa7p4"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5544,12 +5544,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-10-23"; + version = "2023-11-03"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "66e3cdceaba8c0cd089d6f42cb95e04355718f7a"; - sha256 = "0sbznyd54snvvrgcj3pls1xnjg1f0b52fxdp9hsdaxivfar3qizl"; + rev = "e8a413b1a29f05bb556a804ebee990eb54479586"; + sha256 = "0wlkpbxrpy4m1n1s5vv368x43zc19zi9s7962hljr5a4qink7zaa"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5580,12 +5580,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2023-10-23"; + version = "2023-10-26"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "8ba85f00fb6534ffa5d82edab033ccb8962d3e59"; - sha256 = "0pyly0s3qqmb9mljbw3wyln842sdqza0sqn1cij23p36fppg5v3i"; + rev = "3b3563c61af31ecbf6522e92626929b8654649d5"; + sha256 = "0hqmxszry28in5c3nf6ixwa5q4ngwmpi75kx8niy8329nrnb7lzb"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -5604,12 +5604,12 @@ final: prev: modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2023-10-23"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "e642104114dcaa7efcc7ea6887663e991b5a444b"; - sha256 = "1vl777vs9d9hjdh0my8sbvk75znk22sz46a7s6ci1y7b67n5c0fj"; + rev = "1940afc3db7635e60934ca72774626a6c9a525d3"; + sha256 = "0b05l3q2fr95af4056pwzzzgbfk1nyqag5m192c11dy391vqvd75"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5626,14 +5626,26 @@ final: prev: meta.homepage = "https://github.com/tomasr/molokai/"; }; + molten-nvim = buildVimPlugin { + pname = "molten-nvim"; + version = "2023-10-21"; + src = fetchFromGitHub { + owner = "benlubas"; + repo = "molten-nvim"; + rev = "f9c28efc13f7a262e27669b984f3839ff5c50c32"; + sha256 = "1r8xf3jphgml0pax34p50d67rglnq5mazdlmma1jnfkm67acxaac"; + }; + meta.homepage = "https://github.com/benlubas/molten-nvim/"; + }; + monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2023-10-22"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "62cb35cf04499e33ee59bc00c4f9fa118733c12c"; - sha256 = "0mj4xg99jmfflc7g07flhgwgqh3lf4l4qrj66rkzrgk4dw4k9hg1"; + rev = "70c384c43b9e19b59df3d6489b544ad4df155100"; + sha256 = "0ddsfh39f6s1z2a42qgk8w0fl02j6xvsqqjcf4zqw32mgyfhwf6i"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -5664,12 +5676,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2023-10-19"; + version = "2023-11-03"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "b0c571caeff42090cc047cd97988dcfdb06b7fff"; - sha256 = "10whm17fh3clvjh2yiz78wxg0pn3fwhc3w6830fwvpwqy39q5n4g"; + rev = "b4e8571b79a7d2a2aea70922c35eac3a71578c0e"; + sha256 = "0brpnb1dbw9xsmd2g5ydq5gvmk3xf1q69n3x2i1rd5bcyzcg6f8n"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -5928,12 +5940,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2023-10-22"; + version = "2023-10-31"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "2c782550d8a6675f1735970d18ef5d0701f2d789"; - sha256 = "101bwb6qi8rqr5c01zm7xg1p53lb6vxxrrm32zg4vls3xjrcbnrw"; + rev = "76dd1b49c302620f2e11946ac7a7201105180be2"; + sha256 = "1i6mc4lv9bcz4gn18wdhbs1vkj2j4b7srxvf06x3xq8xcif2ljky"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5952,12 +5964,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2023-10-23"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "00dcf2b81c45de1768b4171faa16729f0888cfb8"; - sha256 = "053b283f0j9crkv6g1yhw1f6ff4pfh0k3qni4jg1110ijxx3prsv"; + rev = "64437787dba70fce50dad7bfbb97d184c5bc340f"; + sha256 = "1bwwjnn10b4spvcvdjqwi28zx7ghzvy3q9wspipp12kfvcmdfnbc"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5976,24 +5988,24 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-10-22"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "d617d9eb27e73e701e446874c6ea2cb528719260"; - sha256 = "18d3hcszkd7inqnkwykjx8m5n3mbz7fqzbp6nic2i7sha5lplqji"; + rev = "80487e4f7bfa11c2ef2a1b461963db019aad6a73"; + sha256 = "13ibahs8wf7izl90mb1pdscfw5chrn744grnjhq7szqjf4ib8cki"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPlugin { pname = "neoformat"; - version = "2023-09-22"; + version = "2023-10-31"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "aedb6f9d3f53d5da229095f7d761d749f8c5c7e0"; - sha256 = "09lk5q7zfvjcfvijk3pr830zl602j3i06zil148fwhkghig0flkg"; + rev = "51f0eef4c47f4a677ce6272c103d4ac74acb3b8f"; + sha256 = "19x9yppzln80pqdwbinfdn7ip0syrcq8wf45j0y80x1v7hk6hn1q"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -6012,12 +6024,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2023-10-22"; + version = "2023-10-31"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "51a6e6c8952b361300be57b36c8e1b973880cdd7"; - sha256 = "15y17j1qb84s8pb46r13k44vkiff2zq5wd0fwg52zx5bz6jiszlk"; + rev = "5a2d4688a80d67dc224375c78e62ffd7dc1e79e6"; + sha256 = "0mf0m5b7zsv4fk625bzzdy8bci11ng7lgzz5li8v78gl8q7if62b"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6084,24 +6096,24 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2023-10-18"; + version = "2023-11-03"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "073f04cdc5dc291f069935e36cdcd60927f67d5d"; - sha256 = "1razsikc03kv7imnkxm1fg96np37zz4w8qhql898h58xhpmlq4f7"; + rev = "98f390d8b0c42e40196ea4d831b42b3908137bc3"; + sha256 = "1f0n1s51i9xslwnlnnc0ncw55n6xz9j9my7jmr5649qxm0m7zzg4"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2023-08-06"; + version = "2023-10-26"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "1310d4aaefd8149c9839bbe1d5610e94389e2f0e"; - sha256 = "1k7hhyr8j9jzaqcg243xnqj94238sdzg5v09n7djcjg3cd4yjmwd"; + rev = "c3d25cc46145fba82c410245fb5bea66945eb1de"; + sha256 = "0pskhg2d5c6abcv568aiv39jqd50bpykbrhhyi7s582ikdhqis04"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; @@ -6192,12 +6204,12 @@ final: prev: neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2023-10-13"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "cee23e39d941b2deb14182d5a890144be6aa6164"; - sha256 = "14glp3pifjjfgppcgiw7fpcr7s9y40ffc0wxmgpg07gk2wy6qb4r"; + rev = "f7bdb60c3d7716f75fb04582f64dae8efb7716f1"; + sha256 = "1sibrd1nqhmp75jhv15fmfxk796bw419zmj9bz4y2kn9w4rdwv1z"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; @@ -6229,12 +6241,12 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-10-22"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "0a4d66a59165418d025565b943725822b438ab14"; - sha256 = "017wvpxc4rrpvad2d2sn7lpzag6s7gzpmd4j88kylxwy28kqgv18"; + rev = "961e538ebcf2c369fcc307420733bdb7b0560d4e"; + sha256 = "1kybzl7r5jriswhl54k7sw63ysmga8n6fbgf3db8i3s53nc1075f"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; @@ -6301,12 +6313,12 @@ final: prev: neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2023-09-17"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "51a3b866d85733d2df2c6b5a16d75ce6ed2fbade"; - sha256 = "028qqd0ywlf93ndy3vqp6pj9pbp3nsibdnkmg3b45g1phc49hbrw"; + rev = "8630acad9e84b8267646bc8712a4365af7a12f2b"; + sha256 = "13s3im555wz66z1hmmn8zlpy6vsry0xi87yxfm7hjpfcb56lqncc"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -6409,24 +6421,24 @@ final: prev: nerdcommenter = buildVimPlugin { pname = "nerdcommenter"; - version = "2023-10-23"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "c52b6e731c2b558bc164419d4c369fcc45f0be51"; - sha256 = "17q4713nwsk3lkxbmww106mnpkzlg0xksf29yxb8sfdf386vi66c"; + rev = "da948e160d9f54c2967c7927b9c74c5a68c8dc49"; + sha256 = "0ww8l7lfwqnkskil0dfl71brnb5v03dgyf7i0nfmrcnyc2c0xrcm"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPlugin { pname = "nerdtree"; - version = "2023-10-23"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "334542c361bfd250042c6a1ecd147ffcbcc8049a"; - sha256 = "1q33h1hcnhg3p0f96fapnlmpg0bc25rgxwirb05kapkby1kyi2fq"; + rev = "4c588f182090e01edadeecb127a353cb08d1e39f"; + sha256 = "1pibwk0vrb10h2r9x2s4ja54ballc548wb6cqdbdpcjfz4z5j14z"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -6565,36 +6577,36 @@ final: prev: no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2023-10-15"; + version = "2023-10-26"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "b4ed648483f96f6f212de3b9e38a8bb0d8c5255f"; - sha256 = "0xk759df6mczz013igiv0n5g8g8w426zk12l7b9kgrsl3bwf9hrw"; + rev = "e32701cd26c590be614fc85d7cf36c9994c3a936"; + sha256 = "1j3n1mj680nh2r8za16ridngd3bd31jik5b6wxjs02g4zvwp6cr7"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2023-10-19"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "8f1b53ab85f83e0687d0f267085ad781ec240432"; - sha256 = "1v4na1rdxgqsyy5ra7c7qjg2cmd7hxpf321ybc1zgbm6v56y2a38"; + rev = "92433164e2f7118d4122c7674c3834d9511722ba"; + sha256 = "0cs7hnjgv1np3pmz0li9g4m01i87z360x0fpbh4aqck4k8mhjn7f"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2023-10-18"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "dc9b7e28f5573a1a2225ffb33893d23d3e052ed6"; - sha256 = "1fyg6v34a7lh7j9jfhqxjlw6bhp8ddzqj2sbdksnvf7r0h91jcvl"; + rev = "b8fd44ee1616e6a9c995ed5f94ad9f1721d303ef"; + sha256 = "0wa15f4p6ggngc8jkjfi4s5l0g6fm9va49825khnw94my45b5h5g"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -6685,12 +6697,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2023-10-22"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "fd10af115e0507b3976d78123eda9748fe0e2d29"; - sha256 = "0ar0yfsnq9i708xxcv3c1y25n7q8xl7mfki62vrva2nz72nyjrzc"; + rev = "a8413849cf9d648df0ae81a9349c8b125e628919"; + sha256 = "04h6dahcqmk5plviv7ra30ilgj2fgrnf1nc4r5ndkaw7lrqkp5dv"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6745,12 +6757,12 @@ final: prev: nvim-base16 = buildVimPlugin { pname = "nvim-base16"; - version = "2023-10-09"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "0b62f6e40e213e9e60b913ebd3be73373fc145d1"; - sha256 = "1nny4514fvnf9m5j55gqqdcf77qc0486a80j9x9ljx10mx0jbq4v"; + rev = "7e2243aef1b62cde443fc10f8baf018f672e2a85"; + sha256 = "1xcgnp045gfshal3v5cka9kaqmnfmcwnzlr2vz3s2z7v5i73akzl"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -6805,12 +6817,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2023-10-18"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "d3a3056204e1a9dbb7c7fe36c114dc43b681768c"; - sha256 = "01y2grnq4kcj5d9v5r4klkzmi5yg8xl9p0s11lc1mpc7xink350x"; + rev = "51260c02a8ffded8e16162dcf41a23ec90cfba62"; + sha256 = "0h5n8ks34vxr2b17vddrv4vgjyr649bl7i839awpad21x146krkz"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6901,12 +6913,12 @@ final: prev: nvim-coverage = buildVimPlugin { pname = "nvim-coverage"; - version = "2023-10-09"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "andythigpen"; repo = "nvim-coverage"; - rev = "fd6f94781c94958d1c26353d0d43a82ea5572b31"; - sha256 = "05dk21s809mx586w6wvam31ihpc2ybwvi28b1jmjgppxj4v9qwr3"; + rev = "13e357d4a2a230070c64ede61252225f0b7d3b5e"; + sha256 = "11pw7izbb9yim3vcijxljhp3l7z39ycscjgqrl5wxaj4j2jvaldw"; }; meta.homepage = "https://github.com/andythigpen/nvim-coverage/"; }; @@ -6925,12 +6937,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2023-10-22"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "b595c820018a15b6d54bf53b5cbeaa6f2d7a27e2"; - sha256 = "0pbv21zbj5c2b14w02yspz6fw6bj2i4fy94abmmscpyhgmaxylvn"; + rev = "4048f37bc8b1a36fe1f5fde0df7d84aef71380e4"; + sha256 = "1i260w3g705blhsjhbsnqpp73phzxs5524ly1wjny7dm71b8sxdg"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -7093,12 +7105,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2023-10-13"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "a09f8cdd75c546eb024d0f0b5b3ad185f05b738f"; - sha256 = "1ck1f55y19m049bqwb3j77sq5glwafy48w7b01z324qdj68vhy6n"; + rev = "503a399e0d0b5d432068ab5ae24b9848891b0d53"; + sha256 = "0qq8sr32k9wv92km71h5clpmhsnck3i0dj40qapabb3iaw8iwhwf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -7164,24 +7176,24 @@ final: prev: nvim-lilypond-suite = buildVimPlugin { pname = "nvim-lilypond-suite"; - version = "2023-09-27"; + version = "2023-11-03"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "ac99483249bfa202395e3abcfce7bd39288d93e7"; - sha256 = "11l0bbbaxxinm17j9aqw7an1nfd77pgmkmh3acdx5ppnk8d9141z"; + rev = "3db31bb52aa1148e466a76d0d5adca1450f7eb5a"; + sha256 = "18m470w3hwamvsmhycxf72hcks1cczhnf32kqm4j4qd37c77p5am"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-10-22"; + version = "2023-11-03"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "a4b0511a9e757e78c8c9f9d3f201e0d8ff158b42"; - sha256 = "0laj6z74r3nz497nkgpyx9kvc5111hiaia57h5jx4qvajml9ysl1"; + rev = "8d2bd9a2d1f0b41c96dfa0c998cc22ba152935ed"; + sha256 = "124ckf0n3fjlw1f9rf1c8mv6jn1qxja5nfpb7l8p2zms8xssaksd"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7212,12 +7224,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-10-23"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "6428fcab6f3c09e934bc016c329806314384a41e"; - sha256 = "02hvjlk9i63xxrx52xvvrx0bhqajbhrdjvg6ws291dwmxyz285rs"; + rev = "b44737605807023d32e6310b87ba69f4dbf10e0e"; + sha256 = "1dhq2ai09ky724sfdb2lalmbh5xkj53w5v2yrpbybwpw0sxfaa1l"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7272,12 +7284,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2023-10-20"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "dfcb4f5d915fbc98e6b9b910fbe975b2fbda3227"; - sha256 = "1r814zppad7ig8h2daza0adj8z6472m844a8hgvchb521crwrn81"; + rev = "6692a6512a53b494984eac247ced40e8165dc2ca"; + sha256 = "0060s3w35r03h7g3dykx1dj31ns9dsmnlxm2rz100y7mvbxi7qcc"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -7392,12 +7404,12 @@ final: prev: nvim-pqf = buildVimPlugin { pname = "nvim-pqf"; - version = "2023-07-24"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "yorickpeterse"; repo = "nvim-pqf"; - rev = "f0ab5ea8388af8e6c1a7f7cdc07292b07c02662d"; - sha256 = "14m36146n0bbc0dfwpdyj4bcszaj31qfr7vwk70lhd1gynbsc40g"; + rev = "3f4f176a6dd50c8588cfbe1b0e9cbea39018003e"; + sha256 = "11mrgrdhcqsw1xg9pldby8gp0wpkmbcf9c9nbahxd73s77b5a0b4"; }; meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/"; }; @@ -7488,24 +7500,24 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2023-10-10"; + version = "2023-11-03"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "696cff781a4a7ecc91549736835e2acbd00fe859"; - sha256 = "0avm6klg32f9n0y399s51bhm8fmhvirq4dakxl0bbjv06m0lkwvy"; + rev = "5c3474fbe1028844cfe5a9c238366da04c2e7551"; + sha256 = "0h3f2nm6fc4755kj5fmsyi4img11sxqajl7cs23sbfi6ck65l2fg"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2023-10-07"; + version = "2023-11-03"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "28ea1139b3b566187813684a4d37e3da0ce2b888"; - sha256 = "0c9xlzg37ci7419gx830by8yczkx9x1aszwc5s7vgxwk4qdk72l8"; + rev = "a12b9e8189d09f1670e6b58b0eecf1cecb97e41c"; + sha256 = "0cgjgrsh67gj9y44wxl7nms8f7g5yfzj49slznv6k7sbffrzi1n5"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; @@ -7560,36 +7572,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-10-22"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "78a9ca5ed6557f29cd0ce203df44213e54bfabb9"; - sha256 = "1inh9vlzq3qxwv27zxjd61h8gs3ak3cp7bp1lbzi9fwfiz6gm6a9"; + rev = "7e3c0bee7b246ca835d5f7453db6fa19de359bab"; + sha256 = "12r3p0avnrla28mr0zizs4r3gcf0xrmzn4sn37vn2wzgfpwxx1lc"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-10-23"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "84544f5cd3b7c046ebe0db6763c9ce7f20f4fe23"; - sha256 = "0h2f20464609hmjc5qyymib1wv9vc78m740qpmp2xbjcsf1sbm7k"; + rev = "bef2c24e23d0da62a8542b1f08b1ac87ec43e93f"; + sha256 = "0xgbrkgj0cwds1igiidlc9nflnzf4p2iqwq364v2gv85rvi7b9jx"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-10-20"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "8aa32aa6b84dda357849dbc0f775e69f2e04c041"; - sha256 = "0a7j21rvhgi2mayqbw0a9c0r5q50b41i8idbrv83h78r87qdc77z"; + rev = "2806d83e3965017382ce08792ee527e708fa1bd4"; + sha256 = "0pk6pvqq8xm3jspq7zpkh7rpqdammq1np3gc5x1kjly0q11rf5pn"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -7632,24 +7644,24 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2023-10-22"; + version = "2023-10-26"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "eb208bfdfcf76efea0424747e23e44641e13aaa6"; - sha256 = "1vmhk5ag7dagi1kb6dip0rq1srhax0m3yhlvrq8d0jr8c7xwcr8r"; + rev = "e69a504baf2951d52e1f1fbb05145d43f236cbf1"; + sha256 = "0g5ys17vj88fq17alwn4vvj00imc0niliqj63zwscm2xharqb7sr"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; nvim-treesitter-textsubjects = buildVimPlugin { pname = "nvim-treesitter-textsubjects"; - version = "2023-09-30"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-textsubjects"; - rev = "48b3bf54e32f23e2299c59ff76fa3b0599565b39"; - sha256 = "11nmxnqr8dnn1l24gcrm4bpvpmy4ibsi6x46iz5y2vp7pzrj6cf9"; + rev = "011c09784f1a95cf469a48c1993b664190440391"; + sha256 = "1sik741s868ini18kqzndk3pdl44wzs8nra3sc3ggwi3ps9rs2qi"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/"; }; @@ -7727,12 +7739,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-10-21"; + version = "2023-10-24"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "f0267921c845c42685968401bc49aa65e18d3e09"; - sha256 = "1qqcjaknnq7bm1rl73nzv9gfcfwx2jrxc8vh2l400m4hj0bgvp9k"; + rev = "5de460ca7595806044eced31e3c36c159a493857"; + sha256 = "1ncwiha8ldxzx1g1hfisrgsvnqv05p7c19glbjp5bwbm5ihfsv04"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7835,24 +7847,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2023-10-17"; + version = "2023-11-04"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "e933611c74cb735c00d0db8ca94533bec1444bf0"; - sha256 = "06rp3fnh4v7kpssirp6jnas9ch4vf0iap05m78vr0ackdsgs6gxm"; + rev = "27d1c6613d6f5047d874c2418939100ee8491626"; + sha256 = "0m6ybgvb5af80cw0byz947d8fx0x9y3mpxqw456dn4ig10vgi8g0"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-10-18"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "4088efb8ff664b6f1624aab5dac6c3fe11d3962c"; - sha256 = "0csgywlmb092r1jys4x82bzzy4db491g4jczv4zcskckyjbqj7qk"; + rev = "2e6996b0757c454a8bbf1eb719d0b0b065442213"; + sha256 = "05sg7h368d92w6ss1d7784k94z6b0capfdcg13jamcbj4m3ac5ni"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7908,12 +7920,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2023-10-23"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "4c7a41e4379174384566bfc0f2c4d606e75aa1ef"; - sha256 = "1sy41m17msdk8zyccq3lfz5vdv7zciw23nzglj8n17q5nbfyiv3h"; + rev = "3fb972ee2a835c1b83199c9dbb3661f36e472c97"; + sha256 = "0h5fam6rhyh9nxnimp70w88w1h5qas37c7rlna27zhllvayp6gq9"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7932,12 +7944,12 @@ final: prev: onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2023-10-22"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "86273defb37a96a28d88ef4de99bbca6c8e3c204"; - sha256 = "0maz69j98n5c627m12i509n0w8asyj7gnjkmyaiahw9rms0gnvbk"; + rev = "3679fb93aaf473c1dd63222ac88577a909f6b41c"; + sha256 = "0xlfhmjqsx6cf12jkidp7bxpl9rdbrv1nrcszh0f2rvgir7r843k"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -7968,12 +7980,12 @@ final: prev: openingh-nvim = buildVimPlugin { pname = "openingh.nvim"; - version = "2023-09-26"; + version = "2023-10-31"; src = fetchFromGitHub { owner = "Almo7aya"; repo = "openingh.nvim"; - rev = "cdca4f17dbc2ed85ea5e54c594eb57c4057d9290"; - sha256 = "04jx2pprk1072a06vanyml6bv4qh0hhfmjz145jjp69rn1pzqm8f"; + rev = "5c9e851d7c26fdb236dfea8866b71fefe7ddeffc"; + sha256 = "0xq2s7vwjfxqm5g7k5c3b9cm9j3ngrx8g4dd9qfzq1s9pfkk3i3y"; }; meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; @@ -7992,12 +8004,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2023-10-23"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "346b6aaac4678832b80b1794d7873069e7efd423"; - sha256 = "1avspig0rg267ij6x40blcjxaf0xj86ka788v5a8zq7614ksd5n0"; + rev = "d1d6eff89d2ed0909764e13c3dea975051549f56"; + sha256 = "1i8jiyn5505p64i0cynd924gxv6hrqwrbyvd7ygb06l7nfi6b207"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8016,24 +8028,24 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2023-10-17"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "93227da6bc7db5c0e331df81dd92e91520e084de"; - sha256 = "1rviifp2chzih4nyh3hdsha57vl37bi7546giyb1ccxxxk7znfqn"; + rev = "b25537cc5c836f1a485176757da954b775a5b914"; + sha256 = "0vccwqhhsr4qqwf9jkv0pv1s06qf3mxsgzn67lkwimjsg58ksz9p"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2023-10-22"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "5e8498131867cd1b7c676ecdd1382ab2fd347dde"; - sha256 = "05a13mxzja9wa3f3wcz6m7hhs8nsc67jn9ipdsakq28w7rlrxjhs"; + rev = "6f462a61ce9a5f47743cbf78454bed14a855eb03"; + sha256 = "1zxqd6mjhxw1mcr6n4jgd0jxpz6j0qpcmzlzsgih8xkjn65vdxa3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -8499,11 +8511,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2023-10-22"; + version = "2023-10-29"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "9fda1322e704acfbb5a9691e2c4303368d591367"; - sha256 = "1crd6ybikdk768xsm769xvzia8wkg0hx9bh9h3nyak0gj779zdc4"; + rev = "df8cdf68234fbf056202a9684931c3dfa89988c1"; + sha256 = "03hmkdkny3rfhprjimxala058b31das66iqzkghm99jw7mbrd4xc"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8642,12 +8654,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2023-10-10"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "5bcaa1012ea8efd6093c69d2a4c67fbde760d043"; - sha256 = "1bdn9qc7cxp8ah90hqab8wc8sz676xkr62kvqaw2lcfh9k5ni0f5"; + rev = "b8d6c0a8762fd374e0204768a94241135ca3e311"; + sha256 = "038h0cygs58i6llps9lm58zgb806r1gvqf88afz8n56248jhkcmx"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -8750,12 +8762,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2023-10-23"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "a994f6efb894aa9b504ffed655309c041d45a3e7"; - sha256 = "1c99h3aix51r1slrwqyv9rks0qxyvqvadkwkl2skqi1y1l6psqmd"; + rev = "84b5674489e056598c8080c869b9485f11cb14e4"; + sha256 = "0y221wz44xfwy9i34nx5vq4m0azjlzgy4vybnsg9mwjzbm4xvcci"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -8810,12 +8822,12 @@ final: prev: scope-nvim = buildVimPlugin { pname = "scope.nvim"; - version = "2023-09-10"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "01ce40fe7434fba9a122c01b4734479b3860609a"; - sha256 = "10bc32imz72crnzd2fak5n571x0wq7vh9jqpy4q9f9kin2lw497b"; + rev = "cd27af77ad61a7199af5c28d27013fb956eb0e3e"; + sha256 = "1qb64f59qw4rrrxgqavqs7v05v47nr3kr36a3gcvkb2a3ivasp6g"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; @@ -9075,12 +9087,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2023-08-07"; + version = "2023-10-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "17308ee6d9c764bfc1e0fa97213e7a99701b4144"; - sha256 = "1zqdzc31xjmimnmc264zafshxip55kd1cypjbll1pz7h2yc1xr3r"; + rev = "bdce098fc9e7202d3c555e2dc98c755ca1c23835"; + sha256 = "09brv393ccqgvg0xwg55lh6ss5c16qs1as2hrrqh8952c1kqzxig"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -9256,12 +9268,12 @@ final: prev: ssr-nvim = buildVimPlugin { pname = "ssr.nvim"; - version = "2023-10-14"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "10d51ddaaba0cd03ccf9ae51620d6e8cad27f1e4"; - sha256 = "01g0jzlzxys67f0nvyscy7r03cvfpsx70qjxbzlbfmjakcvi3q7p"; + rev = "bb323ba621ac647b4ac5638b47666e3ef3c279e1"; + sha256 = "0w578iy0m0vvfyawjpfpi2yl51acay4alwm3g7pgf8h8rcya3pv8"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; @@ -9800,12 +9812,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2023-10-02"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "af9d5446d8e3da97ae2fcf4075d19aacd71c1cca"; - sha256 = "0pybdgx20r1jmrg38iv0f6779wsypfx2fpmcvs3gb0qgjag180vv"; + rev = "30f95237af9a9bbbd386742ec40e489bf09f8ead"; + sha256 = "1svw724jlhchsl191bmgr50zbjl9vghkaxk3j8g0nzvrn9677b22"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10137,12 +10149,12 @@ final: prev: tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; - version = "2023-09-06"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "673782b74a6055d430d3f5148a033edd99e5519f"; - sha256 = "0q3942mzp54jjkv3f1aazbnlwmqz3jxvd1jlfgfbk2jpk008r5xg"; + rev = "ea67d59721eb7e12144ce2963452e869bfd60526"; + sha256 = "020prdsczz2vc5cdb6075fdy1fj5zhvjcirfc46kfp5bahzfarzz"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; @@ -10161,12 +10173,12 @@ final: prev: todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; - version = "2023-07-28"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "3094ead8edfa9040de2421deddec55d3762f64d1"; - sha256 = "0qmx94fq1pllwnwzav87fi3v9d64sm8ggv9jgs19flr6r8kh0vs2"; + rev = "4a6737a8d70fe1ac55c64dfa47fcb189ca431872"; + sha256 = "1wf19rahk713qv834gpaw18w8a4ydl44m6jz6l933ns89q1kakk7"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -10198,12 +10210,12 @@ final: prev: tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2023-10-19"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "531b04704fc9ff994d8b9c0720428fdc3c7d49d1"; - sha256 = "1ifmpzd77ca48s73888xynk3a1jc87s48i6694s18gf4999kp7c7"; + rev = "f247ee700b569ed43f39320413a13ba9b0aef0db"; + sha256 = "0wyz1dcm92dc83rz3hy8a0m47yy5lmpk0pwiycpn5yc8jdaxj63b"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -10366,12 +10378,12 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2023-10-21"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "a0f2bb167617d871dc067b75ab72640f265990e4"; - sha256 = "1aapz1j152b5020v5vgny5c9gppfbzgl7lns4bybcn9h6jw2fyqz"; + rev = "2fddf2beeec265e0a41dd24ac668d825f8f3657a"; + sha256 = "0arxrf5lrqp31l9118wmsfjniabb5l113h7wc19s8j6fzdldgs0q"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -10390,12 +10402,12 @@ final: prev: undotree = buildVimPlugin { pname = "undotree"; - version = "2023-10-23"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "3ff3aa02fd3a18d7fc5be9ed3166d36c545707fe"; - sha256 = "08qy7k973xc2h2qa006v8gimgdbna16jhlxf6dn42k67nfckc99r"; + rev = "170aa9e516b6926e6bddfe21bbf01f2283a00e7d"; + sha256 = "1akmajm1fvf3dr0jm3n0f2qxana8lqi3k4wvrqn65h00g4ks6nd3"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -10414,12 +10426,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2023-10-15"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "d5e809b87f154c07d511cb1f164fdfad1c7926b1"; - sha256 = "0z0s94lp1xvy8wnh5y5g0ww5i8q6j5pp1xm2nkkx95cki0p65n1n"; + rev = "ddf15e39b393081a6f41d749a391a66827fca611"; + sha256 = "0p4231w0752hzpc2zrxb5dzaz7d36dsvpl7k3qx98xbkvh72q3lp"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10438,12 +10450,12 @@ final: prev: urlview-nvim = buildVimPlugin { pname = "urlview.nvim"; - version = "2023-09-19"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "bdbdf1e020e283551f003e71b0004096c746ef57"; - sha256 = "1bf226s400vyjffr6zqx9kr52qznzcgx1jnh356vfx3fjxsq81nl"; + rev = "7d622e11adbc2cac5bba62345ade9b6672d564a4"; + sha256 = "1cqzvbglqjy4563p4q08lsy3yhbsvn8i2davjlgplxvnvb76i68d"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -10510,12 +10522,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2023-10-15"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "840fa94041f432c7fb72ff60081913742eb7551f"; - sha256 = "0ijgp6ka1rd5mdbrs79kpyh7dn87y8y097hmyb8a9fn05lpp632p"; + rev = "c6c818626be306c675fd47d57be045a30cb44303"; + sha256 = "0vbpp775h79c3kkf5saqszckgmd7qafv0d58b9qan310a91dcl7s"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -10702,12 +10714,12 @@ final: prev: vim-addon-manager = buildVimPlugin { pname = "vim-addon-manager"; - version = "2023-02-13"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "MarcWeber"; repo = "vim-addon-manager"; - rev = "be43aaaa70cf7c08c93f66051612d24de4c9daf8"; - sha256 = "10gsrs69gcjvjcn4hjrqlpsnlqm67gygzlzld6c3cbav1gfbsq08"; + rev = "6b194728345dcd3e5eae9ee1f30e03c09c254d7f"; + sha256 = "11z1654h1pgndrykwjzll0f95pk9sx5cqad5dqpmfx66msxm9pff"; }; meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; @@ -11566,12 +11578,12 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2023-10-06"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "ee7e3bb5377d43cb31a101718dd0cfc09bb87d4b"; - sha256 = "1kh3fbk0lpasan90n17zg5fjsqr01ppfxpjl638mga0hq0ma7l1m"; + rev = "fecf5a3ecfb1869f34252c7c27351de99f01ab0e"; + sha256 = "18s05nvhfx56hqjg59ypvzrk7jm70c1yazic01i9pjznv5fpcnrg"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -12130,12 +12142,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2023-10-10"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "cbe9dfa162c178946afa689dd3f42d4ea8bf89c1"; - sha256 = "0jq91xc9m5i60gp1wvm9226q4wq393067v2kqsz0vfsclik650x6"; + rev = "46eaf8918b347906789df296143117774e827616"; + sha256 = "1xqznxw6f0arrvb4i5m2y3pkxy0lg5dimkzgm8rwci47w2r7rb3g"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -12864,12 +12876,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2023-10-20"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "3029bdda0da9674682fe46bd6c4b946ad229dcaa"; - sha256 = "0m8dbdr9pdisjnfh6x6nfs27zslnzq7wq1h9jndp810b8prngai3"; + rev = "3451e22daade268f99b1cfeb0d9fe39f4ddc06d5"; + sha256 = "0fyxrp076liypxmbh5jklx1xvv0icmkr9v23mvlj964xq6sdv76s"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -13200,12 +13212,12 @@ final: prev: vim-markdown = buildVimPlugin { pname = "vim-markdown"; - version = "2023-09-20"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "4e9b4deda11d05a157ab34e97f76089669b5b7af"; - sha256 = "027i9y3f0dh6m3fw4fr7jd3pichbs9004c5hqm4i2fz82vb35smm"; + rev = "46add6c3017d3e4035dc10ffa9cb54221d8dfe1a"; + sha256 = "06kkknpmj4ylx13f3rmfsz9f3psq637dp71lda00g1v7r6w86wbp"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -13345,12 +13357,12 @@ final: prev: vim-monokai-tasty = buildVimPlugin { pname = "vim-monokai-tasty"; - version = "2023-10-04"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "f1885575df9c0ed00c49544e213672d3a8da59ad"; - sha256 = "12xmkhw8rwl47zyqych1iml6nrrak57ckxiaas5nwybnygv5n36x"; + rev = "d1619fd4a107d835577668abaa3a164683f5c3cb"; + sha256 = "1cf3iqss0kd12k9q752z32b7w8946mzd24s9rnxckdnvxgiqafhb"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; @@ -13981,12 +13993,12 @@ final: prev: vim-prosession = buildVimPlugin { pname = "vim-prosession"; - version = "2023-08-08"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "3099aaea29b072525b2b387ef0375079da3cc1ed"; - sha256 = "1yd0kgjgv8gjp5dnk3r2pgi4b4cbk1d8zy52ayh2lzspxfhihphy"; + rev = "a79ac2677c5f7ee766454b6c30f21bc033049037"; + sha256 = "0rvimllhz91yykwqgl1ffxc19c4dds4q17wa4ip0zv7y7fydhzvf"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -14209,12 +14221,12 @@ final: prev: vim-ruby = buildVimPlugin { pname = "vim-ruby"; - version = "2023-09-15"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "88f29671b776fff56e5ee554becf34dd2ee1975c"; - sha256 = "1166568yvm54mlinbcxldb0f81c6x8pxsn471phh0n6kh6x9g8nk"; + rev = "f06f069ce67bdda6f2cd408f8859cdf031e5b6b4"; + sha256 = "08jkb840z1li8vbrbvigxffl5d84bl61cnm8xb2k59ic3l7ia96g"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -14533,12 +14545,12 @@ final: prev: vim-snippets = buildVimPlugin { pname = "vim-snippets"; - version = "2023-09-11"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "ccc2fa1529d372f7ac16d5eb07a385a72b50e05d"; - sha256 = "19k2bl2w5z5yvjfgp7wfr9s7zvdj3ak1393q09lv2k11j57f90pm"; + rev = "b039190177d97a968d80518470910aae7faf182a"; + sha256 = "18yanygh3an4vak8zdj242pvqf557pg7ybfcnzrl0052vr7s3pf8"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -14725,12 +14737,12 @@ final: prev: vim-table-mode = buildVimPlugin { pname = "vim-table-mode"; - version = "2022-10-20"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "9555a3e6e5bcf285ec181b7fc983eea90500feb4"; - sha256 = "0pzqk8h3h4z4dbgaxla76wlc1fzxk9cbw3xcwjpjgvbgxplg565s"; + rev = "4ff8de2ac93431ee6d85a9e04177012752e6abdc"; + sha256 = "0wpdh17chadai08kbvd1gkfyzv5b64l4nwbj80jgsig5p4qqz3pj"; }; meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; @@ -14810,12 +14822,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2023-09-30"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "53c6c72f3a0c6a24a74e659eaa769d7057ef2ecd"; - sha256 = "0y36ckap8z07b3ayj53l9drz1m4wrg0fd12q8p0cyhhghf0g8s2i"; + rev = "5880b17c3baf31a22077538dad5d88c658874303"; + sha256 = "1j42sdr24z7hg3n5g1paa3a5gc4sfdyp0rl43qqa2kvnghpzk93z"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -14906,12 +14918,12 @@ final: prev: vim-themis = buildVimPlugin { pname = "vim-themis"; - version = "2021-12-03"; + version = "2023-11-03"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "737e5444713ba53a9dcfbe3b962239bd0bd9162e"; - sha256 = "0wj3v45p7pxm7f4pdzdbvy78vhq57jki0ldgfb3229hb101k1sgh"; + rev = "24e870b39556898f6a184fb29d763d9fb4b24af7"; + sha256 = "0y9czcv6vqh5vsp2hwvjajgs8ss6yhizk10qmhkyk1ki31i05pl2"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; @@ -15134,12 +15146,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2022-09-14"; + version = "2023-10-26"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "724bd53adfbaf32e129b001658b45d4c5c29ca1a"; - sha256 = "0dhxyhclhsh3qrbvl18hxnif76k1bnyi5r7ry9p1cdcmyswa1bay"; + rev = "aec289a9fdabaa0ee6087d044d75b32e12084344"; + sha256 = "04i20r65pqmmspg8bpdlhmjymw8s4qahcyb99yjmj85ysz5lsph6"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -15230,12 +15242,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2023-10-17"; + version = "2023-11-02"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "945a441b83e48c7bafdd227ef8e2eb826f72ab90"; - sha256 = "13qrc8hgp944r819w3sxqva1knpy7m6y2ni9pvpwnf3vykq74l9r"; + rev = "3c6c5bf17f4ae6c53396667ce3405df02a80b894"; + sha256 = "0n8db9y20fmm4zngmhpnr3pcpjrm78071mmq96wx1nfgn544hsld"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -15374,12 +15386,12 @@ final: prev: vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2023-08-17"; + version = "2023-10-31"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "067362349ab701ae945285a4797918ed7a649575"; - sha256 = "13l4632nhzwb4afh16f6rdq9wxsffh25c08d452y7mrx9zrmp64c"; + rev = "5c23544a89ef5a820d3744e4bccbcfbeed3cc9be"; + sha256 = "0bpwgrml3yaszh39nkf3zxk4q4djjjlhyb8xjyikn1a4yvl0fs0y"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; @@ -15555,12 +15567,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2023-10-22"; + version = "2023-10-31"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "e6264120d31d0b5e69d06041b52d40f9ec5ffec5"; - sha256 = "0h21v1bgpxwmd33887ibjd8rd8w7afjll2y0fi75s4r2ykzix0cj"; + rev = "2ee33217ba76cb875429ceabd2d99c2f59fdfe11"; + sha256 = "04zlvlxia42x7786m2bafmjl0cqw8sp1d4h0idngh6pdy4gkq7sa"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15579,12 +15591,12 @@ final: prev: vimwiki = buildVimPlugin { pname = "vimwiki"; - version = "2023-10-16"; + version = "2023-10-31"; src = fetchFromGitHub { owner = "vimwiki"; repo = "vimwiki"; - rev = "5d86b625f52e80476cb73c0a14ac62d51e7eb36f"; - sha256 = "1b0953d9cjhl9ycbnr38irzrynypjyvczs2ax7wr1zg478pw2aly"; + rev = "0bb1b4945bb205a076a35b66174e5d66be8eaafe"; + sha256 = "1vymahgvlgx864f4hwfy1ahpg1py095qz4n2dcj152z3hl7rkd4l"; }; meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; @@ -15928,12 +15940,12 @@ final: prev: zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2023-10-02"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "e2a3fda09b3da0d5a23182a8ffdf03c2c2771794"; - sha256 = "1bjfnd6nz7705gmm5a55y7ml4jsazv4q4wbcxj2i5lnq3nyi5wk0"; + rev = "510d12c088ed45a410371c63ebd62ffb54c1615f"; + sha256 = "1pr1qvd7fdhza3rijs0jg0byi7z82hpzsw1qvqgrz527vk0vgci0"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -15976,12 +15988,12 @@ final: prev: zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2023-09-30"; + version = "2023-10-27"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk-nvim"; - rev = "e9e5e21dbeacd0e753728c7ea45b7a7582d9080a"; - sha256 = "0ycx8ad6a9xyc2i4gzjccbl5pzvg1y7rqhpxf4mys5vh5j7iisvv"; + rev = "142625638d2fad464939c6ee1775571aba6379c6"; + sha256 = "1aha78jjpfrmlji5lnzzylycqvm84g9qqjmbs9ynn84yfl2brd8f"; }; meta.homepage = "https://github.com/mickael-menu/zk-nvim/"; }; @@ -16012,12 +16024,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-10-16"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "dcef0a062de380885193fb0f919217d58b979753"; - sha256 = "1c0ci2h6b3y89rz3hd5ql885qw3hn3p23m4anbh5a9hppcyxcrli"; + rev = "40dc9f0621c55bd40da4ad0731fac44d15bb393a"; + sha256 = "1sldlipm5rkx9nwrwjnqahfr5w4i8mangkscqmdx0fqm4narhm4v"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -16036,12 +16048,12 @@ final: prev: dracula-vim = buildVimPlugin { pname = "dracula-vim"; - version = "2023-08-30"; + version = "2023-10-29"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "b2cc39273abbb6b38a3d173d2a5d8c2d1c79fc19"; - sha256 = "1fcggi03mh0rq1akr9a76mfycm6i34yihhkqmxzgbf63q4v90qrd"; + rev = "6495b4ff40479ec7705addb4ea800ec308026648"; + sha256 = "116gnd891v3rqaxk2dki1ril6j2y7f6vcdh421i0xwnvbj91pfc6"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -16084,12 +16096,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2023-10-17"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "9053e99131731f268258ab4d35d4841c3126ff9a"; - sha256 = "02d6b3qwylz6dg56rkccmpn5nipyg1d6capplbzz5pwv3y9g6bsw"; + rev = "06ad2689ebd251a71c6caeb9fb47e231773c9b47"; + sha256 = "0qv838nws43rdyyl16l8jlnldm4cdyghpl6ylpw2h1php2bd4527"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -16108,12 +16120,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2023-10-20"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "9933e4079723311a94f428d64ac7ef9f900a7295"; - sha256 = "0342pwk8796iiaqjs56k2lcw93wib650gm5hcvxr6q2apd13c1qk"; + rev = "e89e67da3237d965ab10230de30071d1fdcf0b02"; + sha256 = "067w9rsp9srckxb4fyghy73cx50p5xg00l1x2fj4nsahv05bigkr"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -16144,12 +16156,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2023-07-28"; + version = "2023-10-25"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "e29002cbee4854a9c8c4b148d8a52fae3176070f"; - sha256 = "19gndx91dj3c76zbidlk4gjgjw0qkpv4x0ws6f1fsga9b9gplf3g"; + rev = "92762f4fa2144c05db760ea254f4c399a56a7ef5"; + sha256 = "1v65jvkj9z8zj6d5v6kxnz780hgc7svw0gjg3v6j9zpba4rmbs02"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index bb004e8bca1f7..15c4ff61cd70d 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -360,12 +360,12 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=e14bbac"; + version = "0.0.0+rev=f71e310"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "e14bbac8a0fcb6fab1b3becf6ed3fe464123c377"; - hash = "sha256-9CNKTaP9XudM6BDUlXmroJZ31c3eqjF2s0+Bb5mcfm4="; + rev = "f71e310a93010863f4b17a2a501ea8e2032c345b"; + hash = "sha256-6iRUtQ1bol0a7whK35MaJ3UKrxmTAzchQ8Yxy4TeerE="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -593,12 +593,12 @@ }; forth = buildGrammar { language = "forth"; - version = "0.0.0+rev=e7d1f8a"; + version = "0.0.0+rev=9018923"; src = fetchFromGitHub { owner = "AlexanderBrevig"; repo = "tree-sitter-forth"; - rev = "e7d1f8a351fd5e95d9a89a8e87878c49ca14a5b0"; - hash = "sha256-AoV/DoQl2j4U0evWrM7ke544sei8VpdednWojwbhicU="; + rev = "90189238385cf636b9ee99ce548b9e5b5e569d48"; + hash = "sha256-vySBDu9cMnubu4+7/sBttNxg1S4/MxWUKpjwEa14Rws="; }; meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth"; }; @@ -681,12 +681,12 @@ }; gitattributes = buildGrammar { language = "gitattributes"; - version = "0.0.0+rev=2339ffe"; + version = "0.0.0+rev=f58a4a4"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gitattributes"; - rev = "2339ffe87a88d0b7838c015592c8269eb0063140"; - hash = "sha256-O3yzJjxrHdDoqcYu4ZDqrMuzinb0/0ub4puaSZPaG3c="; + rev = "f58a4a4bc55b9b43dfa7c4106257422764f97776"; + hash = "sha256-COCQXia5TiPjJ8/WZELB2lARbn/5YeNvunrm+GHFDQs="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes"; }; @@ -714,12 +714,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=32c8f1e"; + version = "0.0.0+rev=0589025"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "32c8f1e32aee036583ca09e7e6e4ea881852b42c"; - hash = "sha256-tAYlenGQM+TK8AR8RtyDULBgWjAXgHx13/lrhNAZVhs="; + rev = "0589025ee57e335fe0698190a1bc322748d8f026"; + hash = "sha256-/lNo6p4hsl7TiWzIdJOuSHu0RFwPYdZGIVzlcgKOWr4="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -736,12 +736,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=952739a"; + version = "0.0.0+rev=bea82d3"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "952739a25a7c014882aa777f1a32da8950f31f58"; - hash = "sha256-f68bObZPZuPvzyLYP/PeZKbtG0YqbX8BhsLyviBfRY4="; + rev = "bea82d337801e472e35b5cd08038afdf13263768"; + hash = "sha256-O1c9LJex/VHAYuoVaM6dMhTSKNg7RYZJ4N+MYAYZ/AE="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -978,12 +978,12 @@ }; htmldjango = buildGrammar { language = "htmldjango"; - version = "0.0.0+rev=717e83a"; + version = "0.0.0+rev=8873e3d"; src = fetchFromGitHub { owner = "interdependence"; repo = "tree-sitter-htmldjango"; - rev = "717e83aefd328735beeeb671f3f95b2624e70c57"; - hash = "sha256-xOWR5Lp9Ggkqmm5rutKrnMNXFASdyn6vPtxcY2mu2zs="; + rev = "8873e3df89f9ea1d33f6235e516b600009288557"; + hash = "sha256-zVpjgnP39ToEDf59Ldq/DhRVKZOGaWX+usVOcSsJX3k="; }; meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango"; }; @@ -1033,12 +1033,12 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=bd9cbaf"; + version = "0.0.0+rev=3c6f947"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "bd9cbaf1ea8b942dfd58e68df10c9a378ab3d2b6"; - hash = "sha256-2FucTi1wATBcomyNx2oCqMJVmAqLWHJiPQ2+L0VtwUM="; + rev = "3c6f947f9039bbd803d9f3cf57dcee3783b3e2ce"; + hash = "sha256-wpiI0KQ4fy7fGTT3+oDfQy9zEuWmF5P/xSc1pLeA++I="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; @@ -1165,12 +1165,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=5baa0fe"; + version = "0.0.0+rev=494fb76"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "5baa0fe2288830f88bd38e328b08d829f3914164"; - hash = "sha256-e2X8Hl8N8iTL0JUJhyyeebNPZ63QAq9C+R5F2lOYZKk="; + rev = "494fb7644a9d2bbe4c7a0c5db2ef94d2aad6b0d8"; + hash = "sha256-AnUqNfqs8QMeiwltaVNnYGxEnqCeAyTi4nNEyUsH8F0="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1220,12 +1220,12 @@ }; liquidsoap = buildGrammar { language = "liquidsoap"; - version = "0.0.0+rev=4620ab7"; + version = "0.0.0+rev=cff1fea"; src = fetchFromGitHub { owner = "savonet"; repo = "tree-sitter-liquidsoap"; - rev = "4620ab746d1e9e5b6ebccaaa6afc5ebce06b4d75"; - hash = "sha256-M9HTG58WMvQ1PS7oRDeJ+bUwe+bmXf/fuTc6inEtkek="; + rev = "cff1fea7c2ef9eed066a4d3de8af6cb4d7117056"; + hash = "sha256-WWq7aLFqjHnNe280u4+4SuqD+x73ww75fAE/Zm5ttAs="; }; meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; }; @@ -1408,6 +1408,28 @@ }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; + nim = buildGrammar { + language = "nim"; + version = "0.0.0+rev=1f9308c"; + src = fetchFromGitHub { + owner = "alaviss"; + repo = "tree-sitter-nim"; + rev = "1f9308c9e440ddbc67c0aaeb9396c992d266b281"; + hash = "sha256-VgyZk6P2hMCySE8ZrYip7bVtP5OKdfRIgXESDmMgFBc="; + }; + meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; + }; + nim_format_string = buildGrammar { + language = "nim_format_string"; + version = "0.0.0+rev=d45f750"; + src = fetchFromGitHub { + owner = "aMOPel"; + repo = "tree-sitter-nim-format-string"; + rev = "d45f75022d147cda056e98bfba68222c9c8eca3a"; + hash = "sha256-hbM0JIxtZ3e2JUV4jXYO4RIO6r63nf2csvsLeIxkMn0="; + }; + meta.homepage = "https://github.com/aMOPel/tree-sitter-nim-format-string"; + }; ninja = buildGrammar { language = "ninja"; version = "0.0.0+rev=0a95cfd"; @@ -1512,12 +1534,12 @@ }; odin = buildGrammar { language = "odin"; - version = "0.0.0+rev=d165dbe"; + version = "0.0.0+rev=751f779"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-odin"; - rev = "d165dbee27617dab2653e38737d96ede1030d14f"; - hash = "sha256-NxF3aSDtXGMcE7v0BrYQbnUM/hophanKgsYX1ad8AFY="; + rev = "751f7796fa76075cff52edd1afff569a8a09c2a7"; + hash = "sha256-VKcyuoXSRN4PAHQKzfuCKB9lg5y5MQyofy3FkN79Nrw="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-odin"; }; @@ -1567,23 +1589,23 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=495ea4b"; + version = "0.0.0+rev=e99bb52"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "495ea4b2bb2ca7ebc64c598e4a60d8c0856b2811"; - hash = "sha256-6xLeT4dfBnxysrfW7kX3KyW96dfJgN4L040xI8IWVMU="; + rev = "e99bb5283805db4cb86c964722d709df21b0ac16"; + hash = "sha256-PiQIHB94UYvm0fHeBcjJiegcfZ3Rqhs1lxusGdXQ5zI="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=0e02e7f"; + version = "0.0.0+rev=33e3016"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "0e02e7fab7913a0e77343edb347c8f17cac1f0ba"; - hash = "sha256-cHXstpU5XaBv9vO59DKol7PfrVLc0olBLlhkb3wFNDE="; + rev = "33e30169e6f9bb29845c80afaa62a4a87f23f6d6"; + hash = "sha256-xDk+zegvCef5O4uAF/DYzPLBQeFWwaqCTHjLUKK43Nc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1854,12 +1876,12 @@ }; rego = buildGrammar { language = "rego"; - version = "0.0.0+rev=b2667c9"; + version = "0.0.0+rev=9ac75e7"; src = fetchFromGitHub { owner = "FallenAngel97"; repo = "tree-sitter-rego"; - rev = "b2667c975f07b33be3ceb83bea5cfbad88095866"; - hash = "sha256-y3w+gfjXb9N8Vf6ZrafP1j50Ap2KPaNfwo5h06EqHKM="; + rev = "9ac75e71b2d791e0aadeef68098319d86a2a14cf"; + hash = "sha256-L6n6Z5y9t1ixpy9mktB9HVKy69jigqbIFB2SrSW/yoo="; }; meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego"; }; @@ -2077,12 +2099,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=caf2938"; + version = "0.0.0+rev=25be0b8"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "caf2938f1bc6b174e5bf5b6f3b5522cb723ee55b"; - hash = "sha256-PbbPp6CsnrFj7/OwF957MEbSf3PekXon7dMkcoHMO7c="; + rev = "25be0b8f17e9189ad9e1b875869d025c5aec1286"; + hash = "sha256-ztiTMusfPkCpzqiEQt+HmkLt6gDhHt6dBdjIOb4ZBxs="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2099,12 +2121,12 @@ }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=e400863"; + version = "0.0.0+rev=9dcfe0f"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-ssh-config"; - rev = "e4008633536870f3fed3198c96503250af0b0a12"; - hash = "sha256-jPEJQgFys+gwwLiIXmhHvrsT9ai0R7wXJVxRQANACkI="; + rev = "9dcfe0f30ccbde8115790c72acbde4c04ec8e74e"; + hash = "sha256-X7zfOxOVZ99vbCqRSt3rhtiaolByRPspldu9XF1B/XY="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; }; @@ -2121,12 +2143,12 @@ }; strace = buildGrammar { language = "strace"; - version = "0.0.0+rev=0dc85e4"; + version = "0.0.0+rev=d819cdd"; src = fetchFromGitHub { owner = "sigmaSd"; repo = "tree-sitter-strace"; - rev = "0dc85e4cfcd0cc4b33f855ddb782d81d1297bf6e"; - hash = "sha256-JK5+HlCELcBD2Af4uNNoBMYecDGnwcoTqdZr5mKBq+Q="; + rev = "d819cdd5dbe455bd3c859193633c8d91c0df7c36"; + hash = "sha256-u2LznohljEq7WEoVbwr1ZyV+qbchDuoktJFCeh4iePg="; }; meta.homepage = "https://github.com/sigmaSd/tree-sitter-strace"; }; @@ -2199,12 +2221,12 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=b075f2f"; + version = "0.0.0+rev=884a034"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "b075f2f55ba29edce51b6b6b9f234ce3988dbb0a"; - hash = "sha256-NoJLMzyQmE4XpI1KKyq5GkkotOl8MU/zniTnP2nkjes="; + rev = "884a034e0ae29ce72649041a603deacdfb4a3275"; + hash = "sha256-BGux3rIBOkZl7sKAjATjeVLhDXoL7kBvX5sACoceyWY="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2346,12 +2368,12 @@ }; twig = buildGrammar { language = "twig"; - version = "0.0.0+rev=779ee5a"; + version = "0.0.0+rev=eaf80e6"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-twig"; - rev = "779ee5ab1e065dcef7f51f253030dc875445b25f"; - hash = "sha256-4De6ETY0oqbvMXtTDyd1vwheJdfuIusNHjyqyspsz2A="; + rev = "eaf80e6af969e25993576477a9dbdba3e48c1305"; + hash = "sha256-fp7HcdJEFxi/zBFSrM86THwBMpqFwAGugcTVbPk3bd4="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-twig"; }; @@ -2367,6 +2389,17 @@ location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; + typoscript = buildGrammar { + language = "typoscript"; + version = "0.0.0+rev=43b221c"; + src = fetchFromGitHub { + owner = "Teddytrombone"; + repo = "tree-sitter-typoscript"; + rev = "43b221c0b76e77244efdaa9963e402a17c930fbc"; + hash = "sha256-7ottrupSWC83rDP59yceDG/TuikNHoyCBnAlns/x6Tc="; + }; + meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript"; + }; ungrammar = buildGrammar { language = "ungrammar"; version = "0.0.0+rev=debd26f"; @@ -2380,12 +2413,12 @@ }; unison = buildGrammar { language = "unison"; - version = "0.0.0+rev=694c8c0"; + version = "0.0.0+rev=a69d087"; src = fetchFromGitHub { owner = "kylegoetz"; repo = "tree-sitter-unison"; - rev = "694c8c0c79f8d1b80d497401acf4d1b77bfb004a"; - hash = "sha256-g8g/YUKabxWwN+w0akMYMu0fFOkUHGAN44CVDOfPqI4="; + rev = "a69d087590f2ca057d1ef1a393de7e22869bb557"; + hash = "sha256-9eDWvNkY3rEz6khluAJuTXF95CF384IRptaRXGOHma4="; }; generate = true; meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison"; @@ -2514,12 +2547,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=8abdb5e"; + version = "0.0.0+rev=61ed52f"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "8abdb5e1846a56004bcba6e1d9a735e22bb5fff4"; - hash = "sha256-Pmj7Tk9GSeRNIvWODo9StI1c0Hx35B/G15r4kGvErgs="; + rev = "61ed52fa76a1797b7d22b831959b3abbbfdb7a05"; + hash = "sha256-SE4BKB1IKsvNFeqrLAzajSfB9dbLQlSSvSpzOBNChcQ="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 514eda395c4ee..83de6aabbac38 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -470,6 +470,7 @@ https://github.com/jakewvincent/mkdnflow.nvim/,HEAD, https://github.com/SidOfc/mkdx/,, https://github.com/mawkler/modicator.nvim/,HEAD, https://github.com/tomasr/molokai/,, +https://github.com/benlubas/molten-nvim/,HEAD, https://github.com/loctvl842/monokai-pro.nvim/,HEAD, https://github.com/shaunsingh/moonlight.nvim/,,pure-lua https://github.com/leafo/moonscript-vim/,HEAD, diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index e1805df07c2e0..d84ae907b1795 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -760,7 +760,7 @@ in # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; - postBuild = "cd $NIX_BUILD_TOP/source/build/pcsx2"; + postBuild = "cd pcsx2"; meta = { description = "Port of PCSX2 to libretro"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index a780fc039a142..ac52af2a7d4c6 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitLab { owner = "azelpg"; repo = pname; rev = "v${version}"; - hash = "sha256-/shmLdZ4mCBZAeUuqJtCiUjeI8B5f/8dIGPqmXMjZ1I="; + hash = "sha256-RlsiN9pefpTYUh4M8j4Ty/Ipi9StoVcNcICd7QDirhI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/fiji/default.nix b/pkgs/applications/graphics/fiji/default.nix index 039eb45a29670..e3847b98d5198 100644 --- a/pkgs/applications/graphics/fiji/default.nix +++ b/pkgs/applications/graphics/fiji/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { binaryNativeCode ]; license = with lib.licenses; [ gpl2Plus gpl3Plus bsd2 publicDomain ]; - maintainers = with maintainers; [ zane ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch b/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch new file mode 100644 index 0000000000000..371da24680e0f --- /dev/null +++ b/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch @@ -0,0 +1,60 @@ +From c4f452ef6ae083ed21095313582f6d1bd775cbf3 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold <andreas@rammhold.de> +Date: Thu, 2 Nov 2023 17:32:07 +0100 +Subject: [PATCH] NIXOS: don't ignore PYTHONPATH + +On NixOS or rather within nixpkgs we provide the runtime Python +packages via the PYTHONPATH environment variable. FreeCAD tries its +best to ignore Python environment variables that are being inherited +from the environment. For Python versions >=3.11 it also tries to +initialize the interpreter config without any environmental data. We +have to initialize the configuration *with* the information from the +environment for our packaging to work. + +Upstream has purposely isolated the environments AFAIK and thus +shouldn't accept this patch (as is). What they might accept (once +support for older Python versions has been dropped) is removing the +PYTHONPATH specific putenv calls. +--- + src/Base/Interpreter.cpp | 2 +- + src/Main/MainGui.cpp | 3 --- + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp +index 52c47168af..9966bd0013 100644 +--- a/src/Base/Interpreter.cpp ++++ b/src/Base/Interpreter.cpp +@@ -554,7 +554,7 @@ void initInterpreter(int argc,char *argv[]) + { + PyStatus status; + PyConfig config; +- PyConfig_InitIsolatedConfig(&config); ++ PyConfig_InitPythonConfig(&config); + + status = PyConfig_SetBytesArgv(&config, argc, argv); + if (PyStatus_Exception(status)) { +diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp +index 48ae847ef4..28813df383 100644 +--- a/src/Main/MainGui.cpp ++++ b/src/Main/MainGui.cpp +@@ -112,17 +112,14 @@ int main( int argc, char ** argv ) + // See https://forum.freecad.org/viewtopic.php?f=18&t=20600 + // See Gui::Application::runApplication() + putenv("LC_NUMERIC=C"); +- putenv("PYTHONPATH="); + #elif defined(FC_OS_MACOSX) + (void)QLocale::system(); +- putenv("PYTHONPATH="); + #elif defined(__MINGW32__) + const char* mingw_prefix = getenv("MINGW_PREFIX"); + const char* py_home = getenv("PYTHONHOME"); + if (!py_home && mingw_prefix) + _putenv_s("PYTHONHOME", mingw_prefix); + #else +- _putenv("PYTHONPATH="); + // https://forum.freecad.org/viewtopic.php?f=4&t=18288 + // https://forum.freecad.org/viewtopic.php?f=3&t=20515 + const char* fc_py_home = getenv("FC_PYTHONHOME"); +-- +2.42.0 + diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index f997f23d43cfd..76b2a38320d82 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -108,6 +108,10 @@ stdenv.mkDerivation (finalAttrs: { qtx11extras ]; + patches = [ + ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch + ]; + cmakeFlags = [ "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on "-DBUILD_FLAT_MESH:BOOL=ON" @@ -127,10 +131,7 @@ stdenv.mkDerivation (finalAttrs: { export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; ''; - # Their main() removes PYTHONPATH=, and we rely on it. preConfigure = '' - sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp - qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") ''; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index f0f796ed59f32..c284774bd362a 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.12.3"; + version = "3.12.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-k9s11xQCxIoILVDPQIW7a4DkvVyLmxYaH3tRhBsQBxE="; + sha256 = "sha256-rdaTrArrmjDYKboDoGIIKJ0/aGjcOwJXNUnogZDHlOg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 507aaf0f76868..ba53a94f71076 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -27,6 +27,12 @@ mkDerivation rec { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/krita/-/raw/acd9a818660e86b14a66fceac295c2bab318c671/exiv2-0.28.patch"; hash = "sha256-iD2pyid513ThJVeotUlVDrwYANofnEiZmWINNUm/saw="; }) + (fetchpatch { + name = "krita-opencolorio-2.3-compat.patch"; + url = "https://invent.kde.org/graphics/krita/-/commit/520c633c2c868f2236d8e56eefecdcb6e3ebd840.patch"; + hash = "sha256-eXsgBN8OnKjZOQsOxViPypts6CVh3L+IYKMB/mDUcfQ="; + includes = [ "plugins/dockers/lut/ocio_display_filter_vfx2021.cpp" ]; + }) ]; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index d9f6e5913ff4a..b16ff896b6fa7 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -4,11 +4,11 @@ let inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; in buildDotnetPackage rec { pname = "keepass"; - version = "2.54"; + version = "2.55"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - hash = "sha256-fDXT4XxoJfPV8tU8uL94bnL//zKlvXGS9EzNls52kJg="; + hash = "sha256-XZf/5b+rwASB41DP3It3g8UUPIHWEtZBXGk+Qrjw1Bc="; }; sourceRoot = "."; diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index 8ec268c212deb..25ff9aed3b743 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "0.65.1"; + version = "0.69.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-wlsZV9yE9486EBbIwVOcA4KBf9tfI0Ao1JSIPjJAcEU="; + hash = "sha256-YVNcr8oYEOsy0KLOsPdWTZcXYTqyz4RYG9MCEngLn7c="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-Z5vCxzdpd2OmlZ/woHhlLN2QMgqa9mm873QGuqDToiM="; + vendorHash = "sha256-lU21nRfIi4/eobnHhX/fCWnWtoiQBiWvTUOjBL0I4X4="; doCheck = false; diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index d02bd6f0942f0..e82e7a266fb7d 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -74,13 +74,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "waybar"; - version = "0.9.23"; + version = "0.9.24"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = finalAttrs.version; - hash = "sha256-MYOnEqoIN74rw/+DdTLdZXG8JmF70j5hPXhahfp32m0="; + hash = "sha256-JhLKGzqZ8akWcyHTav2TGcGmXk9dy9Xj4+/oFCPeNU0="; }; postUnpack = lib.optional cavaSupport '' diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index e6a7e3f6c7adf..5a7bc3efa8d8d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,39 +1,39 @@ { stable = { chromedriver = { - hash_darwin = "sha256-ugsxRhIPtDD7Y4/PsIc8Apqrtyo4uiVKoLmtRvQaJ3k="; + hash_darwin = "sha256-sRAU9RJANz+Sov6oaoZasMoaqM+mIZSDbag92wXsVCI="; hash_darwin_aarch64 = - "sha256-aD/bHIxMm1OQu6un8cTYLPWoq/cC6kd1hTkxLEqGGRM="; - hash_linux = "sha256-Ie5wtKXz27/vI97Ku7dqqQicR+tujgFUzANAIKTRw8M="; - version = "118.0.5993.70"; + "sha256-U+PBsfpc7PNZYedHIdPnWXA9xKpRnon5vxgKKJr69ow="; + hash_linux = "sha256-2o6LAo2pEsCi1exPv1nEMk2Tklhh49UyWaYoyQ7Df/Y="; + version = "119.0.6045.105"; }; deps = { gn = { - hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M="; - rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; + hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4="; + rev = "991530ce394efb58fcd848195469022fa17ae126"; url = "https://gn.googlesource.com/gn"; - version = "2023-08-10"; + version = "2023-09-12"; }; }; - hash = "sha256-65rN17DIF+9FgZu7ohc9dM8ni6Qmqc9l1oyOcloip44="; - hash_deb_amd64 = "sha256-RJcyIA0TdXWRk+K2GVcHSv4OSq5c6Y7InUblao3uusc="; - version = "118.0.5993.117"; + hash = "sha256-sVBZ0FnaJg1P9a2X8N1MSs8ehPSPzgfbhprb+4v0gXA="; + hash_deb_amd64 = "sha256-WLTTFMUvtBHvvegDFpZ+7Eht9StMyleaqXEBhPhgPTs="; + version = "119.0.6045.105"; }; ungoogled-chromium = { deps = { gn = { - hash = "sha256-SwlET5h5xtDlQvlt8wbG73ZfUWJr4hlWc+uQsBH5x9M="; - rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; + hash = "sha256-4jWqtsOBh96xbYk1m06G9hj2eQwW6buUXsxWsa5W6/4="; + rev = "991530ce394efb58fcd848195469022fa17ae126"; url = "https://gn.googlesource.com/gn"; - version = "2023-08-10"; + version = "2023-09-12"; }; ungoogled-patches = { - hash = "sha256-10kSaLteFtvg3nGffslRpAxmc7nFsp0rA8gwm8jqt/8="; - rev = "118.0.5993.117-1"; + hash = "sha256-+1ln5xD+VwhB+f64rnSXeNOYmhbnm6Kb2xBe5Aanxkc="; + rev = "119.0.6045.105-1"; }; }; - hash = "sha256-65rN17DIF+9FgZu7ohc9dM8ni6Qmqc9l1oyOcloip44="; - hash_deb_amd64 = "sha256-RJcyIA0TdXWRk+K2GVcHSv4OSq5c6Y7InUblao3uusc="; - version = "118.0.5993.117"; + hash = "sha256-sVBZ0FnaJg1P9a2X8N1MSs8ehPSPzgfbhprb+4v0gXA="; + hash_deb_amd64 = "sha256-WLTTFMUvtBHvvegDFpZ+7Eht9StMyleaqXEBhPhgPTs="; + version = "119.0.6045.105"; }; } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index d6898e9d86c28..3577c2a12b252 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -32,6 +32,9 @@ , libuuid , systemd , wayland + +# command line arguments which are always set e.g "--disable-gpu" +, commandLineArgs ? "" }: let @@ -179,7 +182,9 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram "$out/bin/${longName}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} ''; passthru.updateScript = ./update.py; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 77fc279e581d5..b0b7e8a08eb4b 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -35,16 +35,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.4.11"; + version = "3.5.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-H14a1JzFvzxoNDv8WGzHgfalLnDZ+nX19BbM5ptrEes="; + hash = "sha256-3MwSiI21j2tMqdDInK7Q+QDMiFCophJyNXMOXMwJeEQ="; }; - vendorHash = "sha256-0563OHMNkKZcmLY1nHS70pbtrufY1d1WNXrxcCl6MKY="; + vendorHash = "sha256-Zh/r4/+x67C1yXGW/R+FYKiGFaGPEV//Sg9cWwVIMxI="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index 70c70d9ead43c..60fb991fb0b3f 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.17.1"; + version = "1.18.0"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz"; - sha256 = "sha256-HpVDS3ydi2Z1SINAUed9lni9i8FCr0SI8yBCYP4wxyM="; + sha256 = "sha256-mwlpRx/snaTymCubVLTnvN5SpXO2EWl9qZ8seNtNKtI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/k8sgpt/default.nix b/pkgs/applications/networking/cluster/k8sgpt/default.nix index 1afac13c05af9..69e8427be0279 100644 --- a/pkgs/applications/networking/cluster/k8sgpt/default.nix +++ b/pkgs/applications/networking/cluster/k8sgpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "k8sgpt"; - version = "0.3.17"; + version = "0.3.19"; src = fetchFromGitHub { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${version}"; - hash = "sha256-vSytBicpYWs7MqVts+3d6qVZ19nrM1oi00YRPmCQb/I="; + hash = "sha256-yXlcTU0efgjcWy4nlhEIjd9dzErKyAW9gFhacOXv6pA="; }; - vendorHash = "sha256-UFXESGdipfM/TI/9ZSVwoUPsd3LVeEmTFB6sVqkkzQo="; + vendorHash = "sha256-/yibMktAzoUCGED8oJWmNZJxOY0UM0zMl4Qww6olOZY="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index ee6508ae75e0e..3af7a5990826f 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.35.1"; + version = "0.36.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-vpjz2t5wnSWbxc5kdASXIaq2m7izqmC3aSLXvnC+IyE="; + sha256 = "sha256-nDLdATiUcg5o86Pda1/Do9dPMtdNCUo/xj6ERRzih8w="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index f662e965ff215..1b3b11bfed205 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { inherit pname; - version = "2.3.1"; + version = "2.4.3"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-BayfHBTTqgc0ArD6ux9HOqaZy0GrEpqgDa7zHZtiG2I="; + hash = "sha256-MAruZVXkokwiRIIo84dikIEUuYYJLgTDl4Zgivrltyk="; }; - vendorHash = "sha256-St+jGks7ojKrgecmN7UJ9FjGrmjtgEKsunSY+4itUyA="; + vendorHash = "sha256-F428xc4YeTtBMlTEUdEdbLwtm2MPpCkDib/dgRTT/3Y="; # no test files doCheck = false; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index a763177034459..3544669ee9cfa 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.14.1"; - sha256 = "1fxwy8c1zcjwnv055czn9ixalpvq710k0m82633n73a0ixnlmjbv"; - vendorHash = "sha256-hOuvIndyGGvNWYmzE0rho/Y30/ilCzeBtL5GEvl9QqU="; + version = "2.14.2"; + sha256 = "0j7w1x88fxbwlmdj111l3v02m8a2p75zsjj847d09a901jav3ih5"; + vendorHash = "sha256-yEwz9CopCbK8mOUxzjDG3nsbWzhJlA3JTO4nYN8G68E="; } diff --git a/pkgs/applications/networking/cluster/pv-migrate/default.nix b/pkgs/applications/networking/cluster/pv-migrate/default.nix index 67f19882205e4..871f8287b8259 100644 --- a/pkgs/applications/networking/cluster/pv-migrate/default.nix +++ b/pkgs/applications/networking/cluster/pv-migrate/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "pv-migrate"; - version = "1.3.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "utkuozdemir"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J4GsXLff9OQNiLv3AvBLtmz383E2JPEB3VEN3nzE5R8="; + sha256 = "sha256-xbg32ckxAUQkkN/yumHz4v1U4FvUcmx5ftd3+4zc3/c="; }; subPackages = [ "cmd/pv-migrate" ]; - vendorHash = "sha256-PzmNCBTw9AfDUBh/tWlukH5EGJffEBCBT1gJTMIZRO0="; + vendorHash = "sha256-AqR9Gy8sAX4wrKGPnQUj33juBOfhUn0BR8OyJPiDrO0="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix index 70da2b8796a4c..0c97ad68b824a 100644 --- a/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "goeland"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "slurdge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b/A76f9/pFDdG1ZiHQnJrxYmlvFIjhZZhTIGl09cMcg="; + sha256 = "sha256-bjPmhNJFkN0N0Mx3Q4RJuNfeqFy9v8KphiAU1WyKCo4="; }; - vendorHash = "sha256-jOtIA7+rM/2qObhR61utvmXD+Rxi/+dEvzgYkGR76I8="; + vendorHash = "sha256-jYrPsVagGgvpQ9Zj3o2kB82xgw/yaJS9BXxuqMkNjEA="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 17c9d9de710f8..ecbe202487a09 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "9.2.0"; + version = "9.4.0"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - sha256 = "sha256-bvcKM9rBUHZFvoFKW/ksjrgqJfovcHaoDNEcSWhHJTU="; + sha256 = "sha256-bOK6QP9uLMJP9pgts4EyvW0WIKqcfhtvb1heG629Q38="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index d0c3a2145aac8..b570c5bb53f09 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.36.0"; - hash = "sha256-zoeRBBu+eYWibpCUiyDOcDVKFQSRI+l1dZgUlESdUsk="; + version = "6.37.0"; + hash = "sha256-oPW2YHyYsbTvQ+8VQtaubBki7w2wd1tlgVmPL5v5E5s="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.36.0-beta.2"; - hash = "sha256-LOfKdyXosU0bJB35+TSszfHROPhLvMtngzy4zFeVVmI="; + version = "6.38.0-beta.1"; + hash = "sha256-DZXqq4AD1arP+o5xbuR8yD5By5VPBtClchScZb2Nb1U="; }; } diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index 9e3ce81e3392c..59cf07d695ad8 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.11.4"; + version = "2.12.0"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jzLckRFdjivWcyM3NWSVBauT5/7A1jTICtK2j65Wojo="; + hash = "sha256-6TDfNkEqtSrPpyExJ/68GAalIo9pSNiIDo7KdqwoulQ="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 7d5da76a74536..7d53cbbcb8dac 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.5.1"; + version = "3.6.1"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-nYr9M9jRtKDZdtCWirpLAKA/tgz07N6/EI6JV4NzjXM="; + hash = "sha256-1Dkw30WW7bCf89I+HUAvkfmlBbl+TcOVmAfBIFnTExE="; }; - vendorHash = "sha256-I7vDmSLccJSov5RlTtzrQTc+uCprMxwOrHkroL9oZXE="; + vendorHash = "sha256-1mBcYVmVLTFVyYU9QuJz1JoR0wAIREC0cCQZbHMdgZU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index a0e95b62edfe1..dfa19511327dc 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.3.6"; + version = "0.3.7"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-MH5NLppwe/W5d0duNwyQtUBryqDzfV3u0LqWI40GqLQ="; + hash = "sha256-Z2iNYNpf0a3kXBLaJeGVYIW5EGiBuMPdFNK2jSpnmws="; stripRoot = false; }; diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 4814672bfa3ce..073909b80e5cf 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,16 +8,16 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.4.11"; + version = "2.5.0"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-w1QCEow0K8uzbHlyASCggw2U+1RXjPbmxd5XRSdp6yE="; + hash = "sha256-4+aP+y7TNCq7zGOK3HCrl1NQOmpOHezfbL9B1vW2AUo="; }; - postPath = '' + postPatch = '' substituteInPlace index.php \ --replace "define('ENVIRONMENT', 'development');" "define('ENVIRONMENT', 'production');" ''; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index d6d371bf5054f..89fb3534c6070 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -21,10 +21,10 @@ in stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.63"; + version = "2.64"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "sha256-FSs/Dbnr1shEw/W51DhUFPb61tM+0atc6wxY81EiTdM="; + sha256 = "sha256-FDL4XDHH6WYF47OsnhxpM7s7YadutiCDjcJKCF8ZlCw="; }; nativeBuildInputs = [ pkg-config file ]; diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix index 7312f989cb66b..ec25d58efcbfa 100644 --- a/pkgs/applications/science/logic/uhdm/default.nix +++ b/pkgs/applications/science/logic/uhdm/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "UHDM"; # When updating this package, also consider updating science/logic/surelog - version = "1.76"; + version = "1.77"; src = fetchFromGitHub { owner = "chipsalliance"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-Q/u5lvILYDT5iScES3CTPIm/B5apoOHXOQmCsZ73NlU="; + hash = "sha256-JKhpcPG4hWlcn2C+Wlx7yNIMXXurAMxLSK4xWN2akMQ="; fetchSubmodules = false; # we use all dependencies from nix }; diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 380659e71faa3..ad9487b082c85 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.16.1"; + version = "1.16.2"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256-laE4Ytt64ao1vvF05g4l1AkEnKPwKRYCVCybsX1Ae9U="; + hash = "sha256-hT+btlfqfwGBDWTssYl8KN6SbR9/Y2ors4ipECliigM="; }; separateDebugInfo = true; diff --git a/pkgs/applications/video/haruna/default.nix b/pkgs/applications/video/haruna/default.nix index 2d50099141d62..b73933e36a716 100644 --- a/pkgs/applications/video/haruna/default.nix +++ b/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-x3tgH2eoLVELQKbgNLvJPGQsay8iOfMY/BGLOEov3OM="; + hash = "sha256-6UXgAb42DttNgmO5KRFC5M6kuYrv+GIxQ0EQ4P5cgUI="; domain = "invent.kde.org"; }; diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index e90781c3d976f..5daac65313e82 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , which , frei0r @@ -34,12 +35,19 @@ stdenv.mkDerivation { "-DBUILD_QT6=1" ]; + patches = [ + (fetchpatch { + # Taken from https://github.com/olive-editor/olive/pull/2294. + name = "olive-editor-openimageio-2.3-compat.patch"; + url = "https://github.com/olive-editor/olive/commit/311eeb72944f93f873d1cd1784ee2bf423e1e7c2.patch"; + hash = "sha256-lswWn4DbXGH1qPvPla0jSgUJQXuqU7LQGHIPoXAE8ag="; + }) + ]; + # https://github.com/olive-editor/olive/issues/2200 - patchPhase = '' - runHook prePatch + postPatch = '' substituteInPlace ./app/node/project/serializer/serializer230220.cpp \ --replace 'QStringRef' 'QStringView' - runHook postPatch ''; nativeBuildInputs = [ diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 2370eda34b649..3ff03781732bb 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - hash = "sha256-5Tw7xltrsp+yGrdJ0O4MoFUvIaEiCQpMip5X1kfV/iM="; + hash = "sha256-p16qHJD0i0ZNEFGEbfmbxiedX9/uHkZxhCeB3x/5iLM="; }; vendorHash = null; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index a830a6a5752da..6e11d842fe926 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -44,8 +44,6 @@ stdenv.mkDerivation (finalAttrs: { # Use /run/current-system/sw/share and /etc instead of /nix/store # references: ./sway-config-nixos-paths.patch - # Drop ambient capabilities after getting SCHED_RR - ./drop_ambient_capabilities.patch ]; strictDeps = true; diff --git a/pkgs/applications/window-managers/sway/drop_ambient_capabilities.patch b/pkgs/applications/window-managers/sway/drop_ambient_capabilities.patch deleted file mode 100644 index 17010ede25a77..0000000000000 --- a/pkgs/applications/window-managers/sway/drop_ambient_capabilities.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e7d9098e81289ae99d07ec3eac1fec1d303b8fe4 Mon Sep 17 00:00:00 2001 -From: Thiago Kenji Okada <thiagokokada@gmail.com> -Date: Thu, 5 Oct 2023 15:23:35 +0100 -Subject: [PATCH] drop ambient capabilities - -Within NixOS the only possibility to gain cap_sys_nice is using the -security.wrapper infrastructure. However to pass the capabilities to the -wrapped program, they are raised to the ambient set. To fix this we make -sure to drop the ambient capabilities during sway startup and realtime -setup. Otherwise all programs started by sway also gain cap_sys_nice, -which is not something we want. - -Co-authored-by: Rouven Czerwinski <rouven@czerwinskis.de> ---- - sway/realtime.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sway/realtime.c b/sway/realtime.c -index 11154af0..06f872a8 100644 ---- a/sway/realtime.c -+++ b/sway/realtime.c -@@ -3,6 +3,7 @@ - #include <unistd.h> - #include <pthread.h> - #include "sway/server.h" -+#include "sys/prctl.h" - #include "log.h" - - static void child_fork_callback(void) { -@@ -10,6 +11,8 @@ static void child_fork_callback(void) { - - param.sched_priority = 0; - -+ prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_CLEAR_ALL, 0, 0, 0); -+ - int ret = pthread_setschedparam(pthread_self(), SCHED_OTHER, ¶m); - if (ret != 0) { - sway_log(SWAY_ERROR, "Failed to reset scheduler policy on fork"); --- -2.42.0 - diff --git a/pkgs/by-name/bo/borealis-cursors/package.nix b/pkgs/by-name/bo/borealis-cursors/package.nix new file mode 100644 index 0000000000000..e88f5fb72269f --- /dev/null +++ b/pkgs/by-name/bo/borealis-cursors/package.nix @@ -0,0 +1,33 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "borealis-cursors"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "alvatip"; + repo = "Borealis-cursors"; + rev = finalAttrs.version; + hash = "sha256-1qgyU0Npbx/AgqGbmF/BWtlVC0KsKtgC48SL/HtkDrk="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + cp -a Borealis-cursors $out/share/icons + runHook postInstall + ''; + + meta = with lib; { + description = "Cursor theme using a custom color palette inspired by boreal colors"; + homepage = "https://www.gnome-look.org/s/Gnome/p/1717914"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with lib.maintainers; [ argrat ]; + }; +}) diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix index 3908d14ef56eb..9b5d37dc16458 100644 --- a/pkgs/by-name/co/composefs/package.nix +++ b/pkgs/by-name/co/composefs/package.nix @@ -27,13 +27,13 @@ assert installExperimentalTools -> (!stdenv.hostPlatform.isMusl); stdenv.mkDerivation (finalAttrs: { pname = "composefs"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "containers"; repo = "composefs"; rev = "v${finalAttrs.version}"; - hash = "sha256-OjayMhLc3otqQjHsbLN8nm9D9yGOifBcrSLixjnJmvE="; + hash = "sha256-8YbDKw4jYEU6l3Nmqu3gsT9VX0lwYF/39hhcwzgTynY="; }; strictDeps = true; @@ -75,9 +75,8 @@ stdenv.mkDerivation (finalAttrs: { # MUSL: https://github.com/containers/composefs/issues/204 substituteInPlace tests/Makefile \ --replace " check-checksums" "" - '' + lib.optionalString (stdenv.hostPlatform.isMusl || enableValgrindCheck) '' - # seccomp sandbox breaks these tests - # MUSL: https://github.com/containers/composefs/issues/206 + '' + lib.optionalString enableValgrindCheck '' + # valgrind is incompatible with seccomp substituteInPlace tests/test-checksums.sh \ --replace "composefs-from-json" "composefs-from-json --no-sandbox" ''; diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix new file mode 100644 index 0000000000000..e90bd8d10ba4c --- /dev/null +++ b/pkgs/by-name/me/mercure/package.nix @@ -0,0 +1,53 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +, testers +, mercure +}: + +buildGoModule rec { + pname = "mercure"; + version = "0.15.5"; + + src = fetchFromGitHub { + owner = "dunglas"; + repo = "mercure"; + rev = "v${version}"; + hash = "sha256-DyKNKhxjnOfxYcp3w1nB6kxs9c4ZaHL0AN0Eb5vc6mA="; + }; + + sourceRoot = "source/caddy"; + + vendorHash = "sha256-2SZv6iwEZjq/50WwwupfHjbg0vNpff/Cn21nPqeHJMw="; + + subPackages = [ "mercure" ]; + excludedPackages = [ "../cmd/mercure" ]; + + ldflags = [ + "-s" + "-w" + "-X 'github.com/caddyserver/caddy/v2.CustomVersion=Mercure.rocks v${version} Caddy'" + ]; + + doCheck = false; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + version = "v${version}"; + package = mercure; + command = "mercure version"; + }; + }; + + meta = with lib; { + description = "An open, easy, fast, reliable and battery-efficient solution for real-time communications"; + homepage = "https://github.com/dunglas/mercure"; + changelog = "https://github.com/dunglas/mercure/releases/tag/v${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ gaelreyrol ]; + platforms = platforms.unix; + mainProgram = "mercure"; + }; +} diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index f3b47f0c581c7..3543115eda493 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -1,27 +1,33 @@ { lib , stdenv +, testers , fetchFromGitHub , rustPlatform , darwin +, numbat }: rustPlatform.buildRustPackage rec { pname = "numbat"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "numbat"; rev = "v${version}"; - hash = "sha256-r6uPe2NL+6r/fKjf0C/5DLdB5YP3SIo8g8EsDxKP/3g="; + hash = "sha256-KX/V1cVZoPtkP/ehnvcTeaQavHlHP6NJ7g+FbOaYKC4="; }; - cargoHash = "sha256-MPqJjCfIwgK8QigWQYfWAYlg9RNMzF4x+0SprS0raKY="; + cargoHash = "sha256-skCvIMz50GqveyawVHicpEqMknvZuYNvp1u+gW4wG8A="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + passthru.tests.version = testers.testVersion { + package = numbat; + }; + meta = with lib; { description = "High precision scientific calculator with full support for physical units"; longDescription = '' diff --git a/pkgs/by-name/tu/tuxmux/package.nix b/pkgs/by-name/tu/tuxmux/package.nix index 9714c63696ab6..b5c7eaf0c7b4f 100644 --- a/pkgs/by-name/tu/tuxmux/package.nix +++ b/pkgs/by-name/tu/tuxmux/package.nix @@ -2,26 +2,25 @@ , stdenv , fetchFromGitHub , rustPlatform -, openssl +, libiconv , pkg-config , installShellFiles -, darwin }: rustPlatform.buildRustPackage rec { pname = "tuxmux"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "edeneast"; repo = pname; rev = "v${version}"; - hash = "sha256-QySDC/aEU9Fo0UbRUNvgBQLfESYzENGfS8Tl/ycn1YY="; + hash = "sha256-BZ1Vo1NIpzUBGyvd/UbxLaFbrLzoaP8kn/8GoAYBmlo="; }; - cargoHash = "sha256-MlLTaN+KMeF0A1hh0oujLYWqjwrbmoNzoRoXjeCUf7I="; + cargoHash = "sha256-HIYQPHLMhQtpCIkl5EzjJGHXzBtw7mY85l5bqapw3rg="; - buildInputs = [ openssl ] ++ (lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]); + buildInputs = [ libiconv ]; nativeBuildInputs = [ pkg-config installShellFiles ]; postInstall = '' diff --git a/pkgs/desktops/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix index 643b7ddecc26a..867c82881c1ab 100644 --- a/pkgs/desktops/gnustep/back/default.nix +++ b/pkgs/desktops/gnustep/back/default.nix @@ -11,11 +11,11 @@ gsmakeDerivation rec { pname = "gnustep-back"; - version = "0.29.0"; + version = "0.30.0"; src = fetchzip { url = "ftp://ftp.gnustep.org/pub/gnustep/core/${pname}-${version}.tar.gz"; - sha256 = "sha256-4n2SC68G0dpSz9nqCL5Kz76nyoRxWcRTWDwZsnMoHSM="; + sha256 = "sha256-HD4PLdkE573nPWqFwffUmcHw8VYIl5rLiPKWrbnwpCI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index def8e297b552e..f9b4ae553c85c 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnustep-make"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; - sha256 = "sha256-oLBmwRJXh5x8hTEd6mnGf23HQe8znbZRT4W2SZLEDSo="; + sha256 = "sha256-w9bnDPFWsn59HtJQHFffP5bidIjOLzUbk+R5xYwB6uc="; }; configureFlags = [ diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index 4eaa731ce277b..29ca54632478b 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.8.1"; + version = "2201.8.2"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - hash = "sha256-tfsaZnZOsKVm56s3nNI/27wrbVg5fcJ8tW2THSQ8ec0="; + hash = "sha256-vTrVcWo7fjcj9oZqIzvVTTynf4dSh5D7PAUYj3Vs8Gg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index f3bf14e36f7eb..c8342ae90054a 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -36,7 +36,7 @@ lib.optionals (lib.versionAtLeast version "11.0") (let targetPlatformSlash = - if hostPlatform.config == targetPlatform.config + if hostPlatform == targetPlatform then "" else "${targetPlatform.config}/"; @@ -83,7 +83,7 @@ in lib.optionalString (!langC) '' rm -f $out/lib/libgcc_s.so* '' - + lib.optionalString (hostPlatform.config != targetPlatform.config) '' + + lib.optionalString (hostPlatform != targetPlatform) '' mkdir -p $lib/lib/ ln -s ${targetPlatformSlash}lib $lib/lib '' diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 818377912808e..2fe786271a782 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -104,9 +104,6 @@ builder rec { # See below. "--without-threads" ] - # Disable JIT on Apple Silicon, as it is not yet supported - # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44505"; - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "--enable-jit=no" # At least on x86_64-darwin '-flto' autodetection is not correct: # https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028 ++ lib.optional (stdenv.isDarwin) "--disable-lto"; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index eac1ba98beed1..9ecc27fa1c725 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -581,7 +581,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { mv $out/share/doc/* $out/share/doc/python${pythonVersion}-${version} ''; - nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python_docs_theme ]; + nativeBuildInputs = with pkgsBuildBuild.python3.pkgs; [ sphinxHook python-docs-theme ]; }; tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index d8cbc6b1a7f55..0258165d4ee3f 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.32.0"; + version = "2.32.1"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "sha256-tX6O6w66DAXWb9pVJ8T/qEtas1xGvLyaIicUKXPMuOY="; + sha256 = "sha256-rSrBvzZXex01xKdxtNF0oG9SKh5e9sH15Tp5X7Ykhj4="; }; postPatch = '' diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index d056054554830..97c356a3aa4e2 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.2"; + version = "1.4.6"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-is0TOZicZHCYA+In0ggretJkvmauvU26LGmnaKy4ZxM="; + hash = "sha256-gTgCoca8Av4WlrbqMapTUiVxl3dza1v8I6OheFiVasA="; }; buildInputs = [ diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 331198e975edc..b909051aa77b0 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.3.11"; + version = "22.3.12"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-pweKUf/KW64neJkEZwjePh7ft8KEBu1I9zCIx/lMQT8="; + sha256 = "sha256-BfMH3gFInWiBCuFZC0bZzpoZCEQzv/+tMvRH9ep5rLk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 34082407c21fd..49357dc02bbed 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "5.2.98"; + version = "5.2.109"; dontWrapQtApps = true; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-02e1nGSwlhEHwQH6WqBSKBlWQWAYa7lKdZaZ8/0SAxs="; + hash = "sha256-uiuT53mM/dUw5tOYKsBEqEbvYRFKEyyTDKCLYaQvMAs="; }; patches = [ diff --git a/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch b/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch new file mode 100644 index 0000000000000..e60ebc9e1efef --- /dev/null +++ b/pkgs/development/libraries/opencolorio/broken-cmake-zlib-version.patch @@ -0,0 +1,17 @@ +diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in +index c122b013..04f36bf0 100644 +--- a/src/cmake/Config.cmake.in ++++ b/src/cmake/Config.cmake.in +@@ -43,11 +43,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@ + # ZLIB_VERSION_STRING is still available for backward compatibility. + # See https://cmake.org/cmake/help/git-stage/module/FindZLIB.html + +- if (@ZLIB_VERSION@) # @ZLIB_VERSION@ +- find_dependency(ZLIB @ZLIB_VERSION@) +- else() +- find_dependency(ZLIB @ZLIB_VERSION_STRING@) +- endif() ++ find_dependency(ZLIB) + endif() + + if (NOT TARGET MINIZIP::minizip-ng) diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 40a64077acc93..9b5018ef41826 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -27,32 +27,25 @@ stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "sha256-l5UUysHdP/gb4Mn5A64XEoHOkthl6Mlb95CuI0l4vXQ="; + sha256 = "sha256-E4TmMEFzI3nKqiDFaAkNx44uo84sacvZqjbfWe3A8fE="; }; patches = [ (fetchpatch { - name = "darwin-no-hidden-l.patch"; - url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/48bab7c643ed8d108524d718e5038d836f906682.patch"; - revert = true; - sha256 = "sha256-0DF+lwi2nfkUFG0wYvL3HYbhZS6SqGtPWoOabrFS1Eo="; - }) - (fetchpatch { - name = "pkg-config-absolute-path.patch"; - url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/332462e7f5051b7e26ee3d8c22890cd5e71e7c30.patch"; - sha256 = "sha256-7xHALhnOkKszgFBgPIbiZQaORnEJ+1M6RyoZdFgjElM="; - }) - (fetchpatch { - name = "minizip-ng-4.patch"; - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/opencolorio/-/raw/5fc40f42f5c05d905793610c37b46ca3649245f3/minizip-ng-4.patch"; - hash = "sha256-B+dbBVRn0EuGtJaWxz5ah9el0RN7cLb81hgqnKkvhew="; + # Taken from https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1891. + name = "opencolorio-yaml-cpp-8.0-compat.patch"; + url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/e99b4afcf0408d8ec56fdf2b9380327c9284db00.patch"; + sha256 = "sha256-7eIvVWKcpE0lmuYdNqFQFHkW/sSSzQ//LNIMOC28KZg="; }) + # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200. + # Needed for zlib >= 1.3 && cmake < 3.27.4. + ./broken-cmake-zlib-version.patch ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -81,14 +74,17 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" + "-DOCIO_USE_SSE2NEON=OFF" # GPU test fails with: freeglut (GPU tests): failed to open display '' "-DOCIO_BUILD_GPU_TESTS=OFF" - "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include" + "-Dminizip-ng_INCLUDE_DIR=${minizip-ng}/include/minizip-ng" ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; # precision issues on non-x86 doCheck = stdenv.isx86_64; + # Tends to fail otherwise. + enableParallelChecking = false; meta = with lib; { homepage = "https://opencolorio.org"; diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 610a458c071d3..a0f520dcb6cea 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M="; }; + # Workaround broken zlib version detecion in CMake < 3.37. + postPatch = '' + substituteInPlace ./src/cmake/Config.cmake.in \ + --replace " @ZLIB_VERSION@" "" + ''; + outputs = [ "bin" "out" "dev" "doc" ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 1459d605acbec..b3037c463e526 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "poco"; - version = "1.12.4"; + version = "1.12.5"; src = fetchFromGitHub { owner = "pocoproject"; repo = "poco"; - sha256 = "sha256-gQ97fkoTGI6yuMPjEsITfapH9FSQieR8rcrPR1nExxc="; + sha256 = "sha256-2macXa2pi5FebSrTIfSQbIiafNCXczNQEP+PFbFxylw="; rev = "poco-${version}-release"; }; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 3774a3e05dcfa..d2af5d9e1e949 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -4,7 +4,6 @@ , fetchFromGitLab , cairo , cmake -, pcre , boost , cups-filters , curl @@ -20,11 +19,11 @@ , pkg-config , python3 , scribus -, texlive , zlib , withData ? true, poppler_data , qt5Support ? false, qt6Support ? false, qtbase ? null , introspectionSupport ? false, gobject-introspection ? null +, gpgmeSupport ? false, gpgme ? null , utils ? false, nss ? null , minimal ? false , suffix ? "glib" @@ -47,13 +46,13 @@ let in stdenv.mkDerivation (finalAttrs: rec { pname = "poppler-${suffix}"; - version = "23.08.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "23.11.0"; # beware: updates often break cups-filters build, check scribus too! outputs = [ "out" "dev" ]; src = fetchurl { url = "https://poppler.freedesktop.org/poppler-${version}.tar.xz"; - hash = "sha256-Skv3/JA7nxoqt9BLfF2CINubxiYcxz/bmoJtwnL0mqg="; + hash = "sha256-+ZzKZ5nLnLbJL8Hg63hUe2EctzN1CrfLBHyw5sJGU5w="; }; nativeBuildInputs = [ @@ -65,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ boost - pcre libiconv libintl ] ++ lib.optionals withData [ @@ -88,6 +86,8 @@ stdenv.mkDerivation (finalAttrs: rec { qtbase ] ++ lib.optionals introspectionSupport [ gobject-introspection + ] ++ lib.optionals gpgmeSupport [ + gpgme ]; cmakeFlags = [ @@ -95,9 +95,13 @@ stdenv.mkDerivation (finalAttrs: rec { (mkFlag (!minimal) "GLIB") (mkFlag (!minimal) "CPP") (mkFlag (!minimal) "LIBCURL") + (mkFlag (!minimal) "LCMS") + (mkFlag (!minimal) "LIBTIFF") + (mkFlag (!minimal) "NSS3") (mkFlag utils "UTILS") (mkFlag qt5Support "QT5") (mkFlag qt6Support "QT6") + (mkFlag gpgmeSupport "GPGME") ] ++ lib.optionals finalAttrs.doCheck [ "-DTESTDATADIR=${testData}" ]; @@ -110,13 +114,24 @@ stdenv.mkDerivation (finalAttrs: rec { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; + # Work around gpgme trying to write to $HOME during qt5 and qt6 tests: + preCheck = lib.optionalString gpgmeSupport '' + HOME_orig="$HOME" + export HOME="$(mktemp -d)" + ''; + + postCheck = lib.optionalString gpgmeSupport '' + export HOME="$HOME_orig" + unset -v HOME_orig + ''; + doCheck = true; passthru = { inherit testData; tests = { # These depend on internal poppler code that frequently changes. - inherit inkscape cups-filters texlive scribus; + inherit inkscape cups-filters scribus; }; }; diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 6629f618a2e6c..4a211e5cb915f 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -178,12 +178,12 @@ let # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 baseScope = lib.makeScope newScope addPackages; - bootstrapScope = baseScope.overrideScope'(final: prev: { + bootstrapScope = baseScope.overrideScope(final: prev: { qtbase = prev.qtbase.override { qttranslations = null; }; qtdeclarative = null; }); - finalScope = baseScope.overrideScope'(final: prev: { + finalScope = baseScope.overrideScope(final: prev: { qttranslations = bootstrapScope.qttranslations; }); in finalScope diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index 8ee048c2819bf..a6bc5a086251c 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "osi"; - version = "0.108.8"; + version = "0.108.9"; src = fetchFromGitHub { owner = "coin-or"; repo = "Osi"; rev = "releases/${version}"; - hash = "sha256-Wyxeyn49QWzGvW6bMwCp39iLkB1eMQUEpIxUgpLcxgA="; + hash = "sha256-ueIa9CL4K5ygKpkMRvfuWR0emEG6omg65ZKCsConWsw="; }; buildInputs = diff --git a/pkgs/development/libraries/yaml-cpp/default.nix b/pkgs/development/libraries/yaml-cpp/default.nix index c9468b10b99be..20d546e346b8f 100644 --- a/pkgs/development/libraries/yaml-cpp/default.nix +++ b/pkgs/development/libraries/yaml-cpp/default.nix @@ -3,36 +3,19 @@ , fetchFromGitHub , gitUpdater , cmake -, fetchpatch }: stdenv.mkDerivation rec { pname = "yaml-cpp"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "jbeder"; repo = "yaml-cpp"; - rev = "yaml-cpp-${version}"; - hash = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; + rev = version; + hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI="; }; - patches = [ - # https://github.com/jbeder/yaml-cpp/issues/774 - # https://github.com/jbeder/yaml-cpp/pull/1037 - (fetchpatch { - name = "yaml-cpp-Fix-generated-cmake-config.patch"; - url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; - hash = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; - }) - # TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available - (fetchpatch { - name = "yaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patch"; - url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch"; - hash = "sha256-1M2rxfbVOrRH9kiImcwcEolXOP8DeDW9Cbu03+mB5Yk="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ @@ -47,9 +30,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - passthru.updateScript = gitUpdater { - rev-prefix = "yaml-cpp-"; - }; + passthru.updateScript = gitUpdater { }; meta = with lib; { description = "A YAML parser and emitter for C++"; diff --git a/pkgs/development/python-modules/aioairq/default.nix b/pkgs/development/python-modules/aioairq/default.nix index 73be4e3f64cfa..13eff2506598d 100644 --- a/pkgs/development/python-modules/aioairq/default.nix +++ b/pkgs/development/python-modules/aioairq/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairq"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CorantGmbH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9OO3ox6q08QQcYfz4ArsKy/6jR329bAQPUo+mVYuhJs="; + hash = "sha256-SRsDSHTZkkygaQZjHENKNLx3ZWMi/PubS1m/MonEKNk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 586f74c89c7a8..3b722f0fa5f2a 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.3.2"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-aaa2/E6QCeWtTc1c7n0z05Kn3gCCjuQVbdwCgMAYX1A="; + hash = "sha256-X3OhfMW+0oOzubDdSumja//GyI4qgfuyz9/I9xybR9M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix index c4e0d9c5aa476..93b345d89a1d4 100644 --- a/pkgs/development/python-modules/aiortm/default.nix +++ b/pkgs/development/python-modules/aiortm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiortm"; - version = "0.6.3"; + version = "0.6.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MartinHjelmare"; repo = pname; - rev = "v${version}"; - hash = "sha256-9Ny1Xby2e1lyrDTZLd6UVASx8/kwjsq4ogMTSKryQqg="; + rev = "refs/tags/v${version}"; + hash = "sha256-PFZ8B2Wtjg3xUFYcnthTW5QXLk//lFH25jwpF7hygxQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosmtplib/default.nix b/pkgs/development/python-modules/aiosmtplib/default.nix index 7eefe5fa155fd..dda58fc011e88 100644 --- a/pkgs/development/python-modules/aiosmtplib/default.nix +++ b/pkgs/development/python-modules/aiosmtplib/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "aiosmtplib"; - version = "3.0.0"; + version = "3.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "cole"; - repo = pname; - rev = "v${version}"; - hash = "sha256-A9pvHj2riIHCd1F+ve6aLdbtl3tPPDovV1AZeWNeOEo="; + repo = "aiosmtplib"; + rev = "refs/tags/v${version}"; + hash = "sha256-67Z+k+PBIGP2oGb/52dMtsapUsHufvFcX+wWiMj5Jsg="; }; nativeBuildInputs = [ @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module which provides a SMTP client"; homepage = "https://github.com/cole/aiosmtplib"; + changelog = "https://github.com/cole/aiosmtplib/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index 8eb392f68595f..25aa924491057 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.7.0"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OxwCnCGvSwrVxBzQwxMBqESsETu2q1vdevJHDr/IfUI="; + hash = "sha256-HEy1EGP47FFyuMjvsb+3mGHTQMNJEiDVa4wqaqjbOz0="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/pkgs/development/python-modules/apipkg/default.nix b/pkgs/development/python-modules/apipkg/default.nix index efea1e3302f4d..0edddd68be32a 100644 --- a/pkgs/development/python-modules/apipkg/default.nix +++ b/pkgs/development/python-modules/apipkg/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apipkg"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; - rev = "v${version}"; - hash = "sha256-gf84SzfuKLGYfI88IzPRJCqMZWwowUR10FgIbwXjwuY="; + rev = "refs/tags/v${version}"; + hash = "sha256-ANLD7fUMKN3RmAVjVkcpwUH6U9ASalXdwKtPpoC8Urs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index fd389308c9315..45f61e63c10c8 100644 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.41.1"; + version = "3.41.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DSIJOp5c/bqOOIZylhUGyIwIco5isA3ytCRR51WfTyI="; + hash = "sha256-MIzBuIeQfAVlllaU02htx1eufRlpe+V9Kzo+EFF45ME="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index d10e3a966344d..36f282fe1e459 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.19.7"; + version = "0.19.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t/LwioUTZ0fNrJUlx83HG1ytmLW64gH6W17Gd2UXets="; + hash = "sha256-d6I1nRL41sWFvv9Nxw5dSJDEv15i9Lni0wySyWruEGU="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 42b3ea063de5d..3eba6f3317a42 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.15.0"; + version = "0.16.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Kvao2KcmfM99Jx4aO9kIr7wCXSoJqlESNWfX17N0ON8="; + hash = "sha256-GtqJzy1usw624Vbu0utUkzV3gpN5ENdDgJGOU8Lq4L8="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/bincopy/default.nix b/pkgs/development/python-modules/bincopy/default.nix index 1bb3a5b46eb4b..67b64e2a71af3 100644 --- a/pkgs/development/python-modules/bincopy/default.nix +++ b/pkgs/development/python-modules/bincopy/default.nix @@ -1,12 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi, argparse-addons, humanfriendly, pyelftools }: +{ lib +, buildPythonPackage +, fetchPypi +, argparse-addons +, humanfriendly +, pyelftools +, pythonOlder +}: buildPythonPackage rec { pname = "bincopy"; - version = "19.1.0"; + version = "20.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aDVkrTBEhrTP1Oc/kiE9ZsJ+8fDGXcb2+FSMQP0X0lY="; + hash = "sha256-FM+0z5cie/Kx9bhWI99MdnrSGa/cn+BzLdLP3/RGr98="; }; propagatedBuildInputs = [ @@ -15,7 +25,9 @@ buildPythonPackage rec { pyelftools ]; - pythonImportsCheck = [ "bincopy" ]; + pythonImportsCheck = [ + "bincopy" + ]; meta = with lib; { description = "Mangling of various file formats that conveys binary information (Motorola S-Record, Intel HEX, TI-TXT, ELF and binary files)"; diff --git a/pkgs/development/python-modules/bip-utils/default.nix b/pkgs/development/python-modules/bip-utils/default.nix index b7337c0642775..1608ecdf89f1d 100644 --- a/pkgs/development/python-modules/bip-utils/default.nix +++ b/pkgs/development/python-modules/bip-utils/default.nix @@ -1,37 +1,32 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pythonOlder -, ecdsa +, cbor2 , coincurve -, pynacl , crcmod +, ecdsa , ed25519-blake2b +, fetchFromGitHub , py-sr25519-bindings -, cbor2 , pycryptodome +, pynacl , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "bip-utils"; - version = "2.7.1"; + version = "2.8.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ebellocchia"; repo = "bip_utils"; rev = "refs/tags/v${version}"; - hash = "sha256-QrCkLiGBdZTQCnbWSTN0PeoAsQfg2CoSGdZcbhqTvOk="; + hash = "sha256-FW3ni7kPB0VeVK/uWjDEeWgilP9dNiuvSaboUpG5DLo="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "coincurve>=15.0.1,<18.0.0" "coincurve" - ''; - propagatedBuildInputs = [ ecdsa cbor2 diff --git a/pkgs/development/python-modules/boilerpy3/default.nix b/pkgs/development/python-modules/boilerpy3/default.nix index 49573b94ae81d..ef2980959d0b0 100644 --- a/pkgs/development/python-modules/boilerpy3/default.nix +++ b/pkgs/development/python-modules/boilerpy3/default.nix @@ -6,7 +6,7 @@ let pname = "boilerpy3"; - version = "1.0.6"; + version = "1.0.7"; in buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ buildPythonPackage { owner = "jmriebold"; repo = "BoilerPy3"; rev = "refs/tags/v${version}"; - hash = "sha256-hl2+XpSvVaHpq9RGMnSzWHCA8TtBQnYwDtEOia1Rl/A="; + hash = "sha256-dhAB0VbBGsSrgYGUlZEYaKA6sQB/f9Bb3alsRuQ8opo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 2efe495478347..3975fa900a1c5 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -363,12 +363,12 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.28.64"; + version = "1.28.78"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-zky/LBr6GhTFw8xWp094wMGISAzalgom+Zi5P/FjzgY="; + hash = "sha256-LPjWdNfoXewM9M4I/jGqExgpzHq9NvIZ5ymslTUfTe4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index c6472883c5c8d..bccc6a2055c18 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.31.64"; + version = "1.31.78"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-K1sbzvl1nNMgIyJ1PLrNk2s2rtAwFuUjh98y4aojMwo="; + hash = "sha256-zVUOuUqlDXGds8oAt5/7zEgOPe/tBx4SOiQ9+B3UVDA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 5729a7a40a411..39ed52eb94290 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "botorch"; - version = "0.9.2"; + version = "0.9.3"; format = "pyproject"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; - rev = "v${version}"; - hash = "sha256-8obS+qMQwepKUxPkMbufR/SaacYekl6FA6t6XW6llA4="; + rev = "refs/tags/v${version}"; + hash = "sha256-d8EMmA499Zxyagkqx0JCKMZPwSH4LvBya+raD3v3iZU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/boxx/default.nix b/pkgs/development/python-modules/boxx/default.nix index a2a71ad0c986d..7dd580c345a7c 100644 --- a/pkgs/development/python-modules/boxx/default.nix +++ b/pkgs/development/python-modules/boxx/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "boxx"; - version = "0.10.10"; + version = "0.10.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7A5qFpISrjVrqQfKk6BPb7RhDWd9f90eF3bku+LsCcc="; + hash = "sha256-pumkDVyotm8bJEl/rrpNSsP8KZIVIgThGFB/Sy4OdUs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bsdiff4/default.nix b/pkgs/development/python-modules/bsdiff4/default.nix index 3c8df0a178559..f65fe77af252e 100644 --- a/pkgs/development/python-modules/bsdiff4/default.nix +++ b/pkgs/development/python-modules/bsdiff4/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bsdiff4"; - version = "1.2.3"; + version = "1.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-G5XOk7nzBoRvbJHJ0OPrZZCkyFrCu+crX2DZ24KtKhw="; + hash = "sha256-HXEpqBIYYHMejM4pAdMYPhSuxwJE9k6PdFYyddw4gGc="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix new file mode 100644 index 0000000000000..fdbfe0ff71a2a --- /dev/null +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -0,0 +1,79 @@ +{ lib +, buildPythonPackage +, dask +, fetchFromGitHub +, matplotlib +, pint +, pooch +, pytestCheckHook +, pythonOlder +, regex +, rich +, scipy +, setuptools +, setuptools-scm +, shapely +, wheel +, xarray +}: + +buildPythonPackage rec { + pname = "cf-xarray"; + version = "0.8.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "xarray-contrib"; + repo = "cf-xarray"; + rev = "refs/tags/v${version}"; + hash = "sha256-qcoHz/yZoPVu0uBKKx4AV7MOokiuXSCaWPD/92VlRFk="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + xarray + ]; + + propagatedBuildInputs = [ + xarray + ]; + + passthru.optional-dependencies = { + all = [ + matplotlib + pint + pooch + regex + rich + shapely + ]; + }; + + nativeCheckInputs = [ + dask + pytestCheckHook + scipy + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "cf_xarray" + ]; + + disabledTestPaths = [ + # Tests require network access + "cf_xarray/tests/test_accessor.py" + "cf_xarray/tests/test_helpers.py" + ]; + + meta = with lib; { + description = "An accessor for xarray objects that interprets CF attributes"; + homepage = "https://github.com/xarray-contrib/cf-xarray"; + changelog = "https://github.com/xarray-contrib/cf-xarray/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index b4d0c4b407656..e6bff88f43210 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "9.9.3"; + version = "9.10.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-9h/d1w5toxWMHMvVkQiuHySf3+IjeumD4EipgI1kaEs="; + hash = "sha256-8jx2OP1VcQtGmen58r1k/w7srjSJC/53sNxFrRm7IXs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 8277d8e28f40a..20c26da372b6a 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.4.39"; + version = "0.4.41"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-2jmgi0evGqVgtcPRTYpTWG0wFrG1i5W7ryZJslPweNc="; + hash = "sha256-1CnRgPJTG7cpfa/SyhBwVw0Lj6ENI/YY/q2yNeve9c0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/httpx-ntlm/default.nix b/pkgs/development/python-modules/httpx-ntlm/default.nix index 83d427c73ef17..8d8a5e838b793 100644 --- a/pkgs/development/python-modules/httpx-ntlm/default.nix +++ b/pkgs/development/python-modules/httpx-ntlm/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , httpx , pyspnego , pythonOlder @@ -9,7 +8,7 @@ buildPythonPackage rec { pname = "httpx-ntlm"; - version = "1.1.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,18 +16,9 @@ buildPythonPackage rec { src = fetchPypi { pname = "httpx_ntlm"; inherit version; - hash = "sha256-a1a5laZ4tNOtpVDFCK1t2IXWbyJytZMhuad2JtmA52I="; + hash = "sha256-Qb6KK6hRQ0hOYX3LkX1LGeOuEq/caIYipJAQNJk7U+Q="; }; - patches = [ - # Update version specifiers, https://github.com/ulodciv/httpx-ntlm/pull/15 - (fetchpatch { - name = "update-version-specifiers.patch"; - url = "https://github.com/ulodciv/httpx-ntlm/commit/dac67a957c5c23df29d4790ddbc7cc4bccfc0e35.patch"; - hash = "sha256-YtgRrgGG/x7jvNg+NuQIrkOUdyD6Bk53fRaiXBwiV+o="; - }) - ]; - propagatedBuildInputs = [ httpx pyspnego @@ -44,6 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "NTLM authentication support for HTTPX"; homepage = "https://github.com/ulodciv/httpx-ntlm"; + changelog = "https://github.com/ulodciv/httpx-ntlm/releases/tag/${version}"; license = licenses.isc; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index c69df0352c2a8..8da513c5b7874 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ical"; - version = "5.1.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ffNgYtwErt9tzfDWQnt0h7QHQL+gMvFpP8zH6FSoHEM="; + hash = "sha256-ewKQzjtVgx9c6h67epgFNhY4MjR7kFNCr4EKZ+UF2xA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 63a5a15e2593c..6081f17c27270 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.3.7"; + version = "0.3.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-iiGxAIHZcq3VaSSmGrB16IutJf8JEAeFkvZsEuIbR3g="; + hash = "sha256-tse2Hgu50KfxWLBkzyV4VpDj2YHgxIc5izgvwJAJ/7k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index e973c2289e5ed..1e034efa19712 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.14.0"; + version = "5.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-HNgH01ZoQLuZ3K9sSYAYa6/ZTbVYsOUFhOqgP7y2F3Q="; + hash = "sha256-lQNsVpkMRn23qzqAa/K6aPrip67TsL+nXpMRqOXNFik="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 150b323d0f29b..7cca122333ca2 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.4.1"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-+UWHYhPX54Jc9gnrb2Az5Nc3/kt42/wa+zhUnCWdVU4="; + hash = "sha256-jqevKKOQrVpeCe305VKYnF6ODD5JEdt7du+deSZXreA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openapi3/default.nix b/pkgs/development/python-modules/openapi3/default.nix new file mode 100644 index 0000000000000..72e852d209c93 --- /dev/null +++ b/pkgs/development/python-modules/openapi3/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, requests +, pyyaml +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "openapi3"; + version = "1.8.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + src = fetchPypi { + inherit pname version; + hash = "sha256-ohpJBXPYnKaa2ny+WFrbL8pJZCV/bzod9THxKBVFXSw="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + pyyaml + ]; + + nativeCheckinputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "openapi3" + ]; + + meta = with lib; { + changelog = "https://github.com/Dorthu/openapi3/releases/tag/${version}"; + description = "A Python3 OpenAPI 3 Spec Parser"; + homepage = "https://github.com/Dorthu/openapi3"; + license = licenses.bsd3; + maintainers = with maintainers; [ techknowlogick ]; + }; +} diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index ca5d4f45677c6..deeccfe698819 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.16.3"; + version = "3.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "coleifer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QeJaGTKZHmzN+J8uUGXQJXCTINX7iP30u+s+GDP/kpQ="; + hash = "sha256-QbbwC55q/BjMGtm3fH8HPd0aETMzLAFwVYFvOS/4dqA="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 3eba4ff828787..dad7c762ff254 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.148"; + version = "2.1.149"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XRER28ObI9TsZ5h5LkAXhExGq+c4hpoEun2hagkpUXk="; + hash = "sha256-C3RR0WUq63O875v23TQ8GwPGTgGuOqhYhwtfkCMFBfE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 00edd1433813f..78ffc8ebed80c 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20231030"; + version = "0.10.0.20231104"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1yRv6zg9mKJTinR57QHvCx/0mi0b2O3CkcoH1v4QuNo="; + hash = "sha256-p+sOaRfp2IDdXL6eotCrSHu91i+mAwavmqELa5nDB7c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyduotecno/default.nix b/pkgs/development/python-modules/pyduotecno/default.nix index 17fd2d78885c4..365490a224c59 100644 --- a/pkgs/development/python-modules/pyduotecno/default.nix +++ b/pkgs/development/python-modules/pyduotecno/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyduotecno"; - version = "2023.10.1"; + version = "2023.11.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "pyDuotecno"; rev = "refs/tags/${version}"; - hash = "sha256-fDooQb1i9rgzDZBzZ+lYb0WUYC8JNPEYk5DJ9wtS2Dg="; + hash = "sha256-XtNaghYVoE28Dp6YY92SNy0Zw2BxZLYX83EzUSvx/HM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix index 9848af44925d9..58fcc8c515cef 100644 --- a/pkgs/development/python-modules/pyinstrument/default.nix +++ b/pkgs/development/python-modules/pyinstrument/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyinstrument"; - version = "4.5.3"; + version = "4.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "joerick"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rGjHVbIl0kXgscKNZ/U1AU3Ij9Y+iOpIXnmO4jeb3jI="; + hash = "sha256-NSE2mZPbKmvlQbBPx0MoqYfAOjmsf9CllX7dxygZfc4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pypitoken/default.nix b/pkgs/development/python-modules/pypitoken/default.nix index 816afc262f906..59a3be31094c5 100644 --- a/pkgs/development/python-modules/pypitoken/default.nix +++ b/pkgs/development/python-modules/pypitoken/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pypitoken"; - version = "7.0.0"; + version = "7.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ewjoachim"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CjSENkk1VlzrCngwFoJuq31Iai60qTJXBGMoV5QkSsE="; + hash = "sha256-1SUR6reZywgFpSdD49E5PjEDNrlvsHH4TK6SkXStUws="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyschlage/default.nix b/pkgs/development/python-modules/pyschlage/default.nix index ed2659fad6ca9..8cedcfb434ad4 100644 --- a/pkgs/development/python-modules/pyschlage/default.nix +++ b/pkgs/development/python-modules/pyschlage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2023.10.0"; + version = "2023.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; rev = "refs/tags/${version}"; - hash = "sha256-9RXk3wDDX0sGNsci8EClfj17VCYwtUiMyNJj1FLLJKk="; + hash = "sha256-18kVXGpklfvCGOy2jBOG9BAAzE0ZVQ3LONjiwo9YnjU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 7670b443318b4..5dfa7fb823fa8 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -10,11 +10,6 @@ , qt5 , shiboken2 }: - -# Only build when Python<=3.10 -# See https://bugreports.qt.io/browse/PYSIDE-1864 -# "There are no plans to support Python versions > 3.10 in the 5.15 branch." -disabledIf (pythonAtLeast "3.11") ( stdenv.mkDerivation rec { pname = "pyside2"; version = "5.15.11"; @@ -80,4 +75,4 @@ stdenv.mkDerivation rec { homepage = "https://wiki.qt.io/Qt_for_Python"; maintainers = with maintainers; [ gebner ]; }; -}) +} diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 4fbfb942eddaa..3b1def125e0f0 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -1,10 +1,9 @@ -{ stdenv -, lib -, buildPythonPackage -, fetchFromGitHub +{ lib +, stdenv , ansible-core +, buildPythonPackage , coreutils -, coverage +, fetchFromGitHub , pytest , pytestCheckHook , pythonOlder @@ -15,16 +14,16 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "4.1.0"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ansible"; - repo = pname; + repo = "pytest-ansible"; rev = "refs/tags/v${version}"; - hash = "sha256-TV/dR4eTiwjrgamwRCig10acaf3MpAzLu0fHF0V2pzw="; + hash = "sha256-51DQ+NwD454XaYLuRxriuWRZ8uTSX3ZpadXdxs7FspQ="; }; postPatch = '' @@ -49,7 +48,6 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - coverage pytestCheckHook ]; @@ -74,7 +72,10 @@ buildPythonPackage rec { "test_param_override_with_marker" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = [ + # Test want s to execute pytest in a subprocess + "tests/integration/test_molecule.py" + ] ++ lib.optionals stdenv.isDarwin [ # These tests fail in the Darwin sandbox "tests/test_adhoc.py" "tests/test_adhoc_result.py" @@ -85,7 +86,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures"; + description = "Plugin for pytest to simplify calling ansible modules from tests or fixtures"; homepage = "https://github.com/jlaska/pytest-ansible"; changelog = "https://github.com/ansible-community/pytest-ansible/releases/tag/v${version}"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix new file mode 100644 index 0000000000000..464697c35bfa7 --- /dev/null +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonOlder +, sphinx +}: + +buildPythonPackage rec { + pname = "python-docs-theme"; + version = "2023.9"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "python"; + repo = "python-docs-theme"; + rev = "refs/tags/${version}"; + hash = "sha256-XVwMEfprTNdNnaW38HMCAu4CswdVjBXYtNWBgqXfbno="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + sphinx + ]; + + pythonImportsCheck = [ + "python_docs_theme" + ]; + + meta = with lib; { + description = "Sphinx theme for CPython project"; + homepage = "https://github.com/python/python-docs-theme"; + changelog = "https://github.com/python/python-docs-theme/blob/${version}/CHANGELOG.rst"; + license = licenses.psfl; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index 59d3058b1757f..418ce7c7928ac 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.33"; + version = "0.0.34"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mdz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BGG5SQfVxhp6ID2Ob+afm75cInVixSPD5012K4HwthU="; + hash = "sha256-PFlVxSxGcbqvA1cQZkKLtrmg+Dere4B1VCUzIU8RaI8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python_docs_theme/default.nix b/pkgs/development/python-modules/python_docs_theme/default.nix deleted file mode 100644 index 1a1a05733ad38..0000000000000 --- a/pkgs/development/python-modules/python_docs_theme/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, flit-core, sphinx }: - -buildPythonPackage rec { - pname = "python_docs_theme"; - version = "2023.9"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "python"; - repo = "python-docs-theme"; - rev = "refs/tags/${version}"; - sha256 = "sha256-XVwMEfprTNdNnaW38HMCAu4CswdVjBXYtNWBgqXfbno="; - }; - - nativeBuildInputs = [ flit-core ]; - - propagatedBuildInputs = [ sphinx ]; - - pythonImportsCheck = [ "python_docs_theme" ]; - - meta = with lib; { - homepage = "https://github.com/python/python-docs-theme"; - description = "Sphinx theme for CPython project"; - license = licenses.psfl; - maintainers = with maintainers; [ kaction ]; - }; -} diff --git a/pkgs/development/python-modules/qcodes-loop/default.nix b/pkgs/development/python-modules/qcodes-loop/default.nix index 93f452786512b..a20841319b741 100644 --- a/pkgs/development/python-modules/qcodes-loop/default.nix +++ b/pkgs/development/python-modules/qcodes-loop/default.nix @@ -80,6 +80,11 @@ buildPythonPackage rec { export HOME="$TMPDIR" ''; + disabledTests = [ + # AssertionError: False is not true + "TestHDF5_Format" + ]; + meta = with lib; { description = "Features previously in QCoDeS"; homepage = "https://github.com/QCoDeS/Qcodes_loop"; diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index 2083000992bc2..320054041104e 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -1,19 +1,19 @@ { lib +, broadbean , buildPythonPackage +, cf-xarray +, dask +, deepdiff , fetchPypi -, pythonOlder -, setuptools -, versioningit -, wheel - - # mandatory -, broadbean , h5netcdf , h5py +, hypothesis , importlib-metadata -, ipywidgets , ipykernel +, ipython +, ipywidgets , jsonschema +, lxml , matplotlib , numpy , opencensus @@ -21,54 +21,44 @@ , opentelemetry-api , packaging , pandas -, pyvisa -, ruamel-yaml -, tabulate -, typing-extensions -, tqdm -, uncertainties -, websockets -, wrapt -, xarray -, ipython , pillow -, rsa - - # optional -, qcodes-loop -, slack-sdk - - # test , pip -, pytestCheckHook -, deepdiff -, hypothesis -, lxml , pytest-asyncio , pytest-mock , pytest-rerunfailures , pytest-xdist +, pytestCheckHook +, pythonOlder +, pyvisa , pyvisa-sim +, qcodes-loop +, rsa +, ruamel-yaml +, setuptools , sphinx +, tabulate +, tqdm +, typing-extensions +, uncertainties +, versioningit +, websockets +, wheel +, wrapt +, xarray }: buildPythonPackage rec { pname = "qcodes"; - version = "0.40.0"; + version = "0.41.1"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-C8/ltX3tSxCbbheuel3BjIkRBl/E92lK709QYx+2FL0="; + hash = "sha256-3Ncg51E4KYbvzlEyesVbTmzmz+UPfFkj3tudVbNYqHQ="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'versioningit ~=' 'versioningit >=' - ''; - nativeBuildInputs = [ setuptools versioningit @@ -77,6 +67,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ broadbean + cf-xarray + dask h5netcdf h5py ipykernel @@ -109,13 +101,8 @@ buildPythonPackage rec { loop = [ qcodes-loop ]; - slack = [ - slack-sdk - ]; }; - __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ deepdiff hypothesis @@ -130,6 +117,8 @@ buildPythonPackage rec { sphinx ]; + __darwinAllowLocalNetworking = true; + pytestFlagsArray = [ # Follow upstream with settings "--durations=20" @@ -138,6 +127,8 @@ buildPythonPackage rec { disabledTestPaths = [ # Test depends on qcodes-loop, causing a cyclic dependency "qcodes/tests/dataset/measurement/test_load_legacy_data.py" + # TypeError + "qcodes/tests/dataset/test_dataset_basic.py" ]; disabledTests = [ @@ -161,8 +152,8 @@ buildPythonPackage rec { ''; meta = with lib; { - changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}"; description = "Python-based data acquisition framework"; + changelog = "https://github.com/QCoDeS/Qcodes/releases/tag/v${version}"; downloadPage = "https://github.com/QCoDeS/Qcodes"; homepage = "https://qcodes.github.io/Qcodes/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio-beam/default.nix index 1a349736787a4..41653caaa3e09 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio-beam/default.nix @@ -12,14 +12,13 @@ }: buildPythonPackage rec { - pname = "radio_beam"; - version = "0.3.4"; - format = "pyproject"; + pname = "radio-beam"; + version = "0.3.6"; + pyproject = true; src = fetchPypi { - inherit version; - pname = "radio-beam"; - sha256 = "e032257f1501303873f251c00c74b1188180785c79677fb4443098d517852309"; + inherit pname version; + hash = "sha256-U+IjOTt7x9uzUl7IcQRu2s+MBKF/OR+sLddvHmp9hqU="; }; nativeBuildInputs = [ @@ -39,12 +38,16 @@ buildPythonPackage rec { pytest-astropy ]; - meta = { + pythonImportsCheck = [ + "radio_beam" + ]; + + meta = with lib; { description = "Tools for Beam IO and Manipulation"; homepage = "http://radio-astro-tools.github.io"; - license = lib.licenses.bsd3; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ smaret ]; + changelog = "https://github.com/radio-astro-tools/radio-beam/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ smaret ]; }; } diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index bd6dfe20f0824..6aad6e5279752 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.7.0"; + version = "1.7.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ewels"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Fmdxs7yeaHe8++LSQGuYK3Qwc0CdPvV9UCSXa09Djt4="; + hash = "sha256-rWVJEuJx5nDUg6RvhubHu9U2Glilrkugjg28SpFIZys="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index bd37f1c530b70..e7ed8996ba6f8 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -1,8 +1,12 @@ { lib +, asyncclick , buildPythonPackage , fetchPypi , oauthlib , poetry-core +, pytest-asyncio +, pytest-mock +, pytest-socket , pytestCheckHook , pythonOlder , pytz @@ -13,7 +17,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.7.4"; + version = "0.7.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-hto3MwlC6ADjKkcB/4l/uFyw+0CgvLZM0sp3FF62XUA="; + hash = "sha256-chhZj9yr/MCbvh3wo8RTqtyyt1Mj22ku4aRMK2c8Efc="; }; nativeBuildInputs = [ @@ -29,6 +33,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + asyncclick oauthlib pytz requests @@ -36,6 +41,9 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytest-socket pytestCheckHook requests-mock ]; diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 83980ecdcd0a7..141276717c62e 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.6.3"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-3pcQsSUBHlgHKuZt5kb4ozvIujP6dsaYMab/+fri4a4="; + hash = "sha256-Ro8glYHzekuk85DQgRwvrmhbez37EEIiLSMrN5AziB8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index abeb5d0f9277b..d1c85407fdd62 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -11,7 +11,7 @@ , pytest-astropy , pytestCheckHook , pythonOlder -, radio_beam +, radio-beam , setuptools-scm }: @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ astropy casa-formats-io - radio_beam + radio-beam joblib dask ]; diff --git a/pkgs/development/python-modules/stdlibs/default.nix b/pkgs/development/python-modules/stdlibs/default.nix index 4d3398d326c35..1b2f80da245d0 100644 --- a/pkgs/development/python-modules/stdlibs/default.nix +++ b/pkgs/development/python-modules/stdlibs/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "stdlibs"; - version = "2022.10.9"; + version = "2023.11.2"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "omnilib"; repo = "stdlibs"; rev = "refs/tags/v${version}"; - hash = "sha256-HkGZw58gQGd8mHnCP4aF6JWXxlpIIfe7B//HJiHVwA4="; + hash = "sha256-084px8p+pOHonSiOvi/BklaccudSlw9URtCaalWlI0o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index 615d2a76d0582..ada6db7af8672 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "timm"; - version = "0.9.8"; + version = "0.9.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-NB4uj9gB6QGxhnQMoYXN16T8v/o8IZuRMnN7pDXmaj4="; + hash = "sha256-mJzKDRc7husSpunlu12gnx9WErI6oEcEyCtrpkKbPBs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 77f1acb868712..afd09159424d8 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.19.7"; + version = "0.19.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-OkqKWCnwpNgGR2vZTEp+IxpWGHn6xP4ERwWsxEshKmQ="; + hash = "sha256-otU0twF8NHbuaaRL2K6vO1iMQrqoMiRz0QCkXuZ1ENc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix index b6d596f7a88f0..56d08ad5146d6 100644 --- a/pkgs/development/python-modules/xknxproject/default.nix +++ b/pkgs/development/python-modules/xknxproject/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknxproject"; - version = "3.4.0"; + version = "3.4.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-YHHiA0AKyqOYQHeNJqInxjjn4L64z9Y2mf6otMZVscA="; + hash = "sha256-J257Y8Y0mVtlFHiHju5lxPyV0yx3IAYH8ikbmZlI3fY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/detekt/default.nix b/pkgs/development/tools/detekt/default.nix index 27e11032d9399..cf446008928a6 100644 --- a/pkgs/development/tools/detekt/default.nix +++ b/pkgs/development/tools/detekt/default.nix @@ -1,13 +1,13 @@ { detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: stdenv.mkDerivation rec { pname = "detekt"; - version = "1.23.1"; + version = "1.23.3"; jarfilename = "${pname}-${version}-executable.jar"; src = fetchurl { url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; - sha256 = "sha256-CJwVQF7FVjrbooXQnOzP8Efrx4iLi7w6OGu8bGdE14g="; + sha256 = "sha256-Lm9z8XB7BdB7ikiyJyuVtV8eqlPucxmMNNC90E99qpA="; }; dontUnpack = true; diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix deleted file mode 100644 index 7ecb7895d2f9d..0000000000000 --- a/pkgs/development/tools/gdm/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "gdm"; - version = "1.4"; - - goPackagePath = "github.com/sparrc/gdm"; - - src = fetchFromGitHub { - owner = "sparrc"; - repo = "gdm"; - rev = version; - sha256 = "0kpqmbg144qcvd8k88j9yx9lrld85ray2viw161xajafk16plvld"; - }; - - goDeps = ./deps.nix; - - meta = with lib; { - description = "Minimalist dependency manager for Go written in Go"; - homepage = "https://github.com/sparrc/gdm"; - license = licenses.unlicense; - maintainers = [ maintainers.mic92 ]; - }; -} diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 4d980d521d629..c5624f2c49b32 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.0.4"; + version = "7.0.5"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-Qy4ozTRdDF8ENyk4AB2a/4AuMSLJd/3w/q9TjGgrkPE="; + hash = "sha256-D+69R63er4OIMOdyoCuGVvVcUlM2PhLKEyUat1yEmLU="; }; - cargoHash = "sha256-or69dz+wMhp8CPLzip6c6S7HpilAE2DAVkv/3IJMJWQ="; + cargoHash = "sha256-2/0gUavyrNxhc2j+ECPsvMLKCkZdSClivEcJVE1zFgA="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 4c122db6f3404..0b64b59467b78 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md"; maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; + mainProgram = "ktlint"; }; } diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 055077dd20f3a..d751e0f43fd2f 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "4.2.3"; + version = "4.2.5"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - hash = "sha256-dtfs2hUC1Y0N5R/qYrW/bQ+w1X95rgNjo3e9FBKnkvg="; + hash = "sha256-zhu1fBqa6rNO2MoOFUE50I3dtAaOP4Dr9v2rTNB5oro="; }; - vendorHash = "sha256-iBzW/IdG8NTlw22If6PwGsoikB2l3hIvTf7lLQa4s4c="; + vendorHash = "sha256-GuzBSFENkHTri1FF2Ar6paGId7Yj7HuWSEDirFZrqZM="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index 4f657ff3b6d4d..13a689c61cb43 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -1,17 +1,19 @@ { lib , buildGoModule , fetchFromGitHub +, testers +, devspace }: buildGoModule rec { pname = "devspace"; - version = "6.3.3"; + version = "6.3.4"; src = fetchFromGitHub { - owner = "loft-sh"; + owner = "devspace-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-xAK06bpl8BGsVUu6O1C2l+tzeiCQoRUMIUtwntUZVvU="; + hash = "sha256-AKEa9LDe1bLJxJH5k4axALoWkTh+bkBviCpof7x7+fY="; }; vendorHash = null; @@ -26,10 +28,14 @@ buildGoModule rec { # TODO: add a nixosTest to be able to perform the package check doCheck = false; + passthru.tests.version = testers.testVersion { + package = devspace; + }; + meta = with lib; { - description = "DevSpace is an open-source developer tool for Kubernetes that lets you develop and deploy cloud-native software faster"; + description = "An open-source developer tool for Kubernetes that lets you develop and deploy cloud-native software faster"; homepage = "https://devspace.sh/"; - changelog = "https://github.com/loft-sh/devspace/releases/tag/v${version}"; + changelog = "https://github.com/devspace-sh/devspace/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ darkonion0 ]; }; diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 15998a7520ae2..f7a6e5555288f 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-AHnEvDzuQd6W+n9wXhMt6TJwoH1rZEY5UXbhFGwl8+g="; + hash = "sha256-vdhyzFUimc9gBsLpk7WKwQQ0YtGJg3us+6JCFnXSMrI="; }; - cargoHash = "sha256-E4alnDonG45JBAKdLI2eaI+fXW2xOo21HI2UtBEVTx0="; + cargoHash = "sha256-3p6X+EV4xQ+eh2ezPh5+cJxvoGErx0q2n5pESVf11Eg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 4f7dd010b844c..c6ae034d509f4 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -1,15 +1,20 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule +, fetchFromGitHub +, lib +, testers +, symfony-cli +}: buildGoModule rec { pname = "symfony-cli"; - version = "5.6.0"; - vendorHash = "sha256-1BqgnWFMk8hWwra75a5o6Rwbj5wiCUIdSnsAcB+7Mno="; + version = "5.7.0"; + vendorHash = "sha256-Sq3Cr/iVW3OSHLujnR2fE5ZtJhYLiobkmKXKz8hjSus="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-AtHRuzpKXp+WlFser0J5MR63rbO0xO4N/L3U0Q3iax8="; + hash = "sha256-wq+4czVQXQHV2Ci0zUV66+RiRREWawjH4i1i18T8RrA="; }; ldflags = [ @@ -23,11 +28,16 @@ buildGoModule rec { ''; # Tests requires network access - checkPhase = '' - $GOPATH/bin/symfony-cli - ''; + doCheck = false; + + passthru.tests.version = testers.testVersion { + inherit version; + package = symfony-cli; + command = "symfony version --no-ansi"; + }; meta = { + changelog = "https://github.com/symfony-cli/symfony-cli/releases/tag/v${version}"; description = "Symfony CLI"; homepage = "https://github.com/symfony-cli/symfony-cli"; license = lib.licenses.agpl3Plus; diff --git a/pkgs/development/web/pnpm-lock-export/default.nix b/pkgs/development/web/pnpm-lock-export/default.nix index 831ad4f5cd039..4c39eab90fef4 100644 --- a/pkgs/development/web/pnpm-lock-export/default.nix +++ b/pkgs/development/web/pnpm-lock-export/default.nix @@ -6,11 +6,11 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "adamcstephens"; repo = "pnpm-lock-export"; - rev = "cc03755d6718a9c0d268d0f375907328ac15dc92"; - hash = "sha256-9OlFgmdKjvz4pB36Wm/fUAQDsD8zs32OSA3m2IAgrH8="; + rev = "a7ede6d96f9d273b6b495718b85ed40f432c34ba"; + hash = "sha256-RQGyUQOyFZW7UbIPRRlZu8FKcZN2kO0DcPfB8uLFFg4="; }; - npmDepsHash = "sha256-nqkH7vFD78YvYr9Klguk2o7qHr5wr3ZjaywUKRRRjJo="; + npmDepsHash = "sha256-1VTXzlafuI+dU4k1JyZPVI5/5h0gt/eggPPXKYxKsbs="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/development/web/pnpm-lock-export/package-lock.json b/pkgs/development/web/pnpm-lock-export/package-lock.json index 7ca48860c5f87..6618d656f3532 100644 --- a/pkgs/development/web/pnpm-lock-export/package-lock.json +++ b/pkgs/development/web/pnpm-lock-export/package-lock.json @@ -1,11 +1,11 @@ { - "name": "@cvent/pnpm-lock-export", + "name": "pnpm-lock-export", "version": "0.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "@cvent/pnpm-lock-export", + "name": "pnpm-lock-export", "version": "0.4.0", "license": "MIT", "dependencies": { @@ -36,7 +36,7 @@ "@typescript-eslint/eslint-plugin": "^6.1.0", "@typescript-eslint/parser": "^6.1.0", "eslint": "^8.45.0", - "jest": "^28.1.3", + "jest": "^29.5.3", "prettier": "^3.0.0", "tmp-promise": "^3.0.3", "typescript": "^4.9.5" @@ -65,45 +65,110 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", - "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", + "version": "7.22.13", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", + "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", "dependencies": { - "@babel/highlight": "^7.22.5" + "@babel/highlight": "^7.22.13", + "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/code-frame/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/code-frame/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + }, + "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/code-frame/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/compat-data": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", - "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz", + "integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", - "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz", + "integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.9", - "@babel/helper-compilation-targets": "^7.22.9", - "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.8", - "@babel/types": "^7.22.5", - "convert-source-map": "^1.7.0", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.23.0", + "@babel/helpers": "^7.23.2", + "@babel/parser": "^7.23.0", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0", + "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", + "json5": "^2.2.3", "semver": "^6.3.1" }, "engines": { @@ -124,12 +189,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz", - "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz", + "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5", + "@babel/types": "^7.23.0", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -139,22 +204,19 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz", - "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", + "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", "dev": true, "dependencies": { "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", "browserslist": "^4.21.9", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { @@ -167,22 +229,22 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, "dependencies": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" @@ -201,28 +263,28 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", - "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", - "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz", + "integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-simple-access": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.5" + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -274,43 +336,43 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz", + "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz", - "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz", + "integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==", "dev": true, "dependencies": { - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.6", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.2", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", - "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", - "chalk": "^2.0.0", + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, "engines": { @@ -382,9 +444,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.7", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz", - "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz", + "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -453,6 +515,21 @@ "@babel/core": "^7.0.0-0" } }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", + "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, "node_modules/@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", @@ -567,33 +644,33 @@ } }, "node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.22.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz", - "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==", + "version": "7.23.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz", + "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.7", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/code-frame": "^7.22.13", + "@babel/generator": "^7.23.0", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.7", - "@babel/types": "^7.22.5", + "@babel/parser": "^7.23.0", + "@babel/types": "^7.23.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -611,13 +688,13 @@ } }, "node_modules/@babel/types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", - "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", + "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -801,41 +878,29 @@ } }, "node_modules/@jest/console": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz", - "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz", + "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/console/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/console/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -843,126 +908,55 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/console/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/console/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/@jest/console/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/console/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/console/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/console/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/core": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz", - "integrity": "sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz", + "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/reporters": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.7.0", + "@jest/reporters": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", "ci-info": "^3.2.0", "exit": "^0.1.2", "graceful-fs": "^4.2.9", - "jest-changed-files": "^28.1.3", - "jest-config": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-resolve-dependencies": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "jest-watcher": "^28.1.3", + "jest-changed-files": "^29.7.0", + "jest-config": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-resolve-dependencies": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", + "jest-watcher": "^29.7.0", "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "rimraf": "^3.0.0", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-ansi": "^6.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -973,25 +967,13 @@ } } }, - "node_modules/@jest/core/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/core/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -999,88 +981,18 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/core/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/core/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/@jest/core/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/core/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/core/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/core/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/create-cache-key-function": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/@jest/create-cache-key-function/-/create-cache-key-function-27.5.1.tgz", @@ -1094,39 +1006,27 @@ } }, "node_modules/@jest/environment": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz", - "integrity": "sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz", + "integrity": "sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==", "dev": true, "dependencies": { - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "jest-mock": "^28.1.3" + "jest-mock": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/environment/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/environment/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1134,269 +1034,67 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/environment/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/environment/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/@jest/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==", "dev": true, "dependencies": { - "expect": "^28.1.3", - "jest-snapshot": "^28.1.3" + "expect": "^29.7.0", + "jest-snapshot": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/expect-utils": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.6.2.tgz", - "integrity": "sha512-6zIhM8go3RV2IG4aIZaZbxwpOzz3ZiM23oxAlkquOIole+G6TrbeXnykxWYlqF7kz2HlBjdKtca20x9atkEQYg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz", + "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==", "dev": true, "dependencies": { - "jest-get-type": "^29.4.3" + "jest-get-type": "^29.6.3" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/expect/node_modules/@jest/expect-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", - "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", - "dev": true, - "dependencies": { - "jest-get-type": "^28.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, - "node_modules/@jest/expect/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/@jest/expect/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/expect/node_modules/diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", - "dev": true, - "dependencies": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/expect/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/fake-timers": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz", - "integrity": "sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz", + "integrity": "sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", - "@sinonjs/fake-timers": "^9.1.2", + "@jest/types": "^29.6.3", + "@sinonjs/fake-timers": "^10.0.2", "@types/node": "*", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/fake-timers/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/fake-timers/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1404,121 +1102,40 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/fake-timers/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/fake-timers/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/@jest/fake-timers/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/fake-timers/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/fake-timers/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/fake-timers/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/globals": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz", - "integrity": "sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==", - "dev": true, - "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/types": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/globals/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz", + "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==", "dev": true, "dependencies": { - "@sinclair/typebox": "^0.24.1" + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/types": "^29.6.3", + "jest-mock": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/globals/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1526,36 +1143,30 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/globals/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/globals/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/@jest/reporters": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz", - "integrity": "sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz", + "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==", "dev": true, "dependencies": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", + "@jest/console": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", "@types/node": "*", "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", @@ -1563,21 +1174,20 @@ "glob": "^7.1.3", "graceful-fs": "^4.2.9", "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^5.1.0", + "istanbul-lib-instrument": "^6.0.0", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", "istanbul-reports": "^3.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", "slash": "^3.0.0", "string-length": "^4.0.1", "strip-ansi": "^6.0.0", - "terminal-link": "^2.0.0", "v8-to-istanbul": "^9.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -1588,25 +1198,13 @@ } } }, - "node_modules/@jest/reporters/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/reporters/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1614,92 +1212,22 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/reporters/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/reporters/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/@jest/reporters/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@jest/reporters/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/reporters/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/reporters/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/schemas": { - "version": "29.6.0", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.0.tgz", - "integrity": "sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, "dependencies": { "@sinclair/typebox": "^0.27.8" @@ -1709,53 +1237,41 @@ } }, "node_modules/@jest/source-map": { - "version": "28.1.2", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz", - "integrity": "sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz", + "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==", "dev": true, "dependencies": { - "@jridgewell/trace-mapping": "^0.3.13", + "@jridgewell/trace-mapping": "^0.3.18", "callsites": "^3.0.0", "graceful-fs": "^4.2.9" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/test-result": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz", - "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz", + "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.7.0", + "@jest/types": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/test-result/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/test-result/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1763,84 +1279,66 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/test-result/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/test-result/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/@jest/test-sequencer": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz", - "integrity": "sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz", + "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==", "dev": true, "dependencies": { - "@jest/test-result": "^28.1.3", + "@jest/test-result": "^29.7.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", + "jest-haste-map": "^29.7.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/transform": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz", - "integrity": "sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz", + "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", - "@jest/types": "^28.1.3", - "@jridgewell/trace-mapping": "^0.3.13", + "@jest/types": "^29.6.3", + "@jridgewell/trace-mapping": "^0.3.18", "babel-plugin-istanbul": "^6.1.1", "chalk": "^4.0.0", - "convert-source-map": "^1.4.0", - "fast-json-stable-stringify": "^2.0.0", + "convert-source-map": "^2.0.0", + "fast-json-stable-stringify": "^2.1.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", + "jest-haste-map": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", "micromatch": "^4.0.4", "pirates": "^4.0.4", "slash": "^3.0.0", - "write-file-atomic": "^4.0.1" + "write-file-atomic": "^4.0.2" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/@jest/transform/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/@jest/transform/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -1848,41 +1346,18 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/@jest/transform/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/@jest/transform/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/@jest/transform/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/@jest/transform/node_modules/write-file-atomic": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", @@ -1927,9 +1402,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", - "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, "engines": { "node": ">=6.0.0" @@ -1951,21 +1426,15 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", - "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "dev": true - }, "node_modules/@manypkg/find-root": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@manypkg/find-root/-/find-root-1.1.0.tgz", @@ -2488,21 +1957,21 @@ "dev": true }, "node_modules/@sinonjs/commons": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", - "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz", + "integrity": "sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==", "dev": true, "dependencies": { "type-detect": "4.0.8" } }, "node_modules/@sinonjs/fake-timers": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz", - "integrity": "sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", + "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", "dev": true, "dependencies": { - "@sinonjs/commons": "^1.7.0" + "@sinonjs/commons": "^3.0.0" } }, "node_modules/@swc/core": { @@ -2728,9 +2197,9 @@ "dev": true }, "node_modules/@types/babel__core": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz", - "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==", + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.3.tgz", + "integrity": "sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==", "dev": true, "dependencies": { "@babel/parser": "^7.20.7", @@ -2741,18 +2210,18 @@ } }, "node_modules/@types/babel__generator": { - "version": "7.6.4", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", - "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "version": "7.6.6", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.6.tgz", + "integrity": "sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==", "dev": true, "dependencies": { "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__template": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", - "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.3.tgz", + "integrity": "sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==", "dev": true, "dependencies": { "@babel/parser": "^7.1.0", @@ -2760,18 +2229,18 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.20.1", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz", - "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==", + "version": "7.20.3", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.3.tgz", + "integrity": "sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==", "dev": true, "dependencies": { "@babel/types": "^7.20.7" } }, "node_modules/@types/graceful-fs": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", - "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.8.tgz", + "integrity": "sha512-NhRH7YzWq8WiNKVavKPBmtLYZHxNY19Hh+az28O/phfp68CF45pMFud+ZzJ8ewnxnC5smIdF3dqFeiSUQ5I+pw==", "dev": true, "dependencies": { "@types/node": "*" @@ -2829,12 +2298,6 @@ "integrity": "sha512-xlR1jahfizdplZYRU59JlUx9uzF1ARa8jbhM11ccpCJya8kvos5jwdm2ZAgxSCwOl0fq21svP18EVwPBXMQudw==", "dev": true }, - "node_modules/@types/prettier": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz", - "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==", - "dev": true - }, "node_modules/@types/semver": { "version": "7.5.0", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz", @@ -3905,21 +3368,21 @@ "dev": true }, "node_modules/babel-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz", - "integrity": "sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz", + "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==", "dev": true, "dependencies": { - "@jest/transform": "^28.1.3", + "@jest/transform": "^29.7.0", "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.1.1", - "babel-preset-jest": "^28.1.3", + "babel-preset-jest": "^29.6.3", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": "^7.8.0" @@ -3941,10 +3404,35 @@ "node": ">=8" } }, + "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dev": true, + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-istanbul/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/babel-plugin-jest-hoist": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz", - "integrity": "sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz", + "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==", "dev": true, "dependencies": { "@babel/template": "^7.3.3", @@ -3953,7 +3441,7 @@ "@types/babel__traverse": "^7.0.6" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/babel-preset-current-node-syntax": { @@ -3980,16 +3468,16 @@ } }, "node_modules/babel-preset-jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz", - "integrity": "sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz", + "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==", "dev": true, "dependencies": { - "babel-plugin-jest-hoist": "^28.1.3", + "babel-plugin-jest-hoist": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@babel/core": "^7.0.0" @@ -4135,9 +3623,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.10", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", - "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", + "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", "dev": true, "funding": [ { @@ -4154,10 +3642,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", + "caniuse-lite": "^1.0.30001541", + "electron-to-chromium": "^1.4.535", "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -4258,9 +3746,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001518", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz", - "integrity": "sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==", + "version": "1.0.30001559", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz", + "integrity": "sha512-cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA==", "dev": true, "funding": [ { @@ -4566,9 +4054,9 @@ } }, "node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true }, "node_modules/cookie": { @@ -4629,6 +4117,53 @@ "node": ">= 0.10" } }, + "node_modules/create-jest": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz", + "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==", + "dev": true, + "dependencies": { + "@jest/types": "^29.6.3", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "prompts": "^2.0.1" + }, + "bin": { + "create-jest": "bin/create-jest.js" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/create-jest/node_modules/@jest/types": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", + "dev": true, + "dependencies": { + "@jest/schemas": "^29.6.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/create-jest/node_modules/@types/yargs": { + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -4687,10 +4222,18 @@ } }, "node_modules/dedent": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", - "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==", - "dev": true + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz", + "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", + "dev": true, + "peerDependencies": { + "babel-plugin-macros": "^3.1.0" + }, + "peerDependenciesMeta": { + "babel-plugin-macros": { + "optional": true + } + } }, "node_modules/deep-is": { "version": "0.1.4", @@ -4802,9 +4345,9 @@ } }, "node_modules/diff-sequences": { - "version": "29.4.3", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz", - "integrity": "sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -4885,15 +4428,15 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.477", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.477.tgz", - "integrity": "sha512-shUVy6Eawp33dFBFIoYbIwLHrX0IZ857AlH9ug2o4rvbWmpaCUdBpQ5Zw39HRrfzAFm4APJE9V+E2A/WB0YqJw==", + "version": "1.4.575", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.575.tgz", + "integrity": "sha512-kY2BGyvgAHiX899oF6xLXSIf99bAvvdPhDoJwG77nxCSyWYuRH6e9a9a3gpXBvCs6lj4dQZJkfnW2hdKWHEISg==", "dev": true }, "node_modules/emittery": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", - "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==", + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", + "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==", "dev": true, "engines": { "node": ">=12" @@ -5268,17 +4811,16 @@ } }, "node_modules/expect": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/expect/-/expect-29.6.2.tgz", - "integrity": "sha512-iAErsLxJ8C+S02QbLAwgSGSezLQK+XXRDt8IuFXFpwCNw2ECmzZSmjKcCaFVp5VRMk+WAvz6h6jokzEzBFZEuA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz", + "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==", "dev": true, "dependencies": { - "@jest/expect-utils": "^29.6.2", - "@types/node": "*", - "jest-get-type": "^29.4.3", - "jest-matcher-utils": "^29.6.2", - "jest-message-util": "^29.6.2", - "jest-util": "^29.6.2" + "@jest/expect-utils": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" @@ -5653,9 +5195,9 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -6299,28 +5841,19 @@ } }, "node_modules/istanbul-lib-instrument": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.1.tgz", + "integrity": "sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==", "dev": true, "dependencies": { "@babel/core": "^7.12.3", "@babel/parser": "^7.14.7", "@istanbuljs/schema": "^0.1.2", "istanbul-lib-coverage": "^3.2.0", - "semver": "^6.3.0" + "semver": "^7.5.4" }, "engines": { - "node": ">=8" - } - }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + "node": ">=10" } }, "node_modules/istanbul-lib-report": { @@ -6365,21 +5898,21 @@ } }, "node_modules/jest": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz", - "integrity": "sha512-N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz", + "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==", "dev": true, "dependencies": { - "@jest/core": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/core": "^29.7.0", + "@jest/types": "^29.6.3", "import-local": "^3.0.2", - "jest-cli": "^28.1.3" + "jest-cli": "^29.7.0" }, "bin": { "jest": "bin/jest.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -6391,16 +5924,17 @@ } }, "node_modules/jest-changed-files": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz", - "integrity": "sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz", + "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==", "dev": true, "dependencies": { "execa": "^5.0.0", + "jest-util": "^29.7.0", "p-limit": "^3.1.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-changed-files/node_modules/execa": { @@ -6427,54 +5961,43 @@ } }, "node_modules/jest-circus": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz", - "integrity": "sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz", + "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/expect": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/environment": "^29.7.0", + "@jest/expect": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "co": "^4.6.0", - "dedent": "^0.7.0", + "dedent": "^1.0.0", "is-generator-fn": "^2.0.0", - "jest-each": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", + "jest-each": "^29.7.0", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", "p-limit": "^3.1.0", - "pretty-format": "^28.1.3", + "pretty-format": "^29.7.0", + "pure-rand": "^6.0.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-circus/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -6482,160 +6005,41 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-circus/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-circus/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-circus/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-circus/node_modules/diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-circus/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-cli": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz", - "integrity": "sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz", + "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==", "dev": true, "dependencies": { - "@jest/core": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/core": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "chalk": "^4.0.0", + "create-jest": "^29.7.0", "exit": "^0.1.2", - "graceful-fs": "^4.2.9", "import-local": "^3.0.2", - "jest-config": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", - "prompts": "^2.0.1", + "jest-config": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "yargs": "^17.3.1" }, "bin": { "jest": "bin/jest.js" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" @@ -6646,25 +6050,13 @@ } } }, - "node_modules/jest-cli/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-cli/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -6672,72 +6064,49 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-cli/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-cli/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-cli/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-config": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz", - "integrity": "sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz", + "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", - "@jest/test-sequencer": "^28.1.3", - "@jest/types": "^28.1.3", - "babel-jest": "^28.1.3", + "@jest/test-sequencer": "^29.7.0", + "@jest/types": "^29.6.3", + "babel-jest": "^29.7.0", "chalk": "^4.0.0", "ci-info": "^3.2.0", "deepmerge": "^4.2.2", "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-circus": "^28.1.3", - "jest-environment-node": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-runner": "^28.1.3", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", + "jest-circus": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-runner": "^29.7.0", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "micromatch": "^4.0.4", "parse-json": "^5.2.0", - "pretty-format": "^28.1.3", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "peerDependencies": { "@types/node": "*", @@ -6752,25 +6121,13 @@ } } }, - "node_modules/jest-config/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-config/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -6778,139 +6135,68 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-config/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-config/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-config/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-config/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-config/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-config/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-diff": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.6.2.tgz", - "integrity": "sha512-t+ST7CB9GX5F2xKwhwCf0TAR17uNDiaPTZnVymP9lw0lssa9vG+AFyDZoeIHStU3WowFFwT+ky+er0WVl2yGhA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "diff-sequences": "^29.4.3", - "jest-get-type": "^29.4.3", - "pretty-format": "^29.6.2" + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-docblock": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz", - "integrity": "sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz", + "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==", "dev": true, "dependencies": { "detect-newline": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-each": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz", - "integrity": "sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz", + "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", - "jest-util": "^28.1.3", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-each/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" + "jest-get-type": "^29.6.3", + "jest-util": "^29.7.0", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-each/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -6918,113 +6204,42 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-each/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-each/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-each/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-each/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-each/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-each/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-environment-node": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz", - "integrity": "sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz", + "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==", "dev": true, "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", - "jest-mock": "^28.1.3", - "jest-util": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-environment-node/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" + "jest-mock": "^29.7.0", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-environment-node/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7032,94 +6247,59 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-environment-node/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-environment-node/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-environment-node/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-get-type": { - "version": "29.4.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.4.3.tgz", - "integrity": "sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", "dev": true, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-haste-map": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz", - "integrity": "sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz", + "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "@types/graceful-fs": "^4.1.3", "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", "graceful-fs": "^4.2.9", - "jest-regex-util": "^28.0.2", - "jest-util": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-regex-util": "^29.6.3", + "jest-util": "^29.7.0", + "jest-worker": "^29.7.0", "micromatch": "^4.0.4", "walker": "^1.0.8" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" }, "optionalDependencies": { "fsevents": "^2.3.2" } }, - "node_modules/jest-haste-map/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-haste-map/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7127,136 +6307,59 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-haste-map/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-haste-map/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-haste-map/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-leak-detector": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz", - "integrity": "sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz", + "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==", "dev": true, "dependencies": { - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-leak-detector/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-leak-detector/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, - "node_modules/jest-leak-detector/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-leak-detector/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-leak-detector/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-matcher-utils": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.6.2.tgz", - "integrity": "sha512-4LiAk3hSSobtomeIAzFTe+N8kL6z0JtF3n6I4fg29iIW7tt99R7ZcIFW34QkX+DuVrf+CUe6wuVOpm7ZKFJzZQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz", + "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==", "dev": true, "dependencies": { "chalk": "^4.0.0", - "jest-diff": "^29.6.2", - "jest-get-type": "^29.4.3", - "pretty-format": "^29.6.2" + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" }, "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-message-util": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.6.2.tgz", - "integrity": "sha512-vnIGYEjoPSuRqV8W9t+Wow95SDp6KPX2Uf7EoeG9G99J2OVh7OSwpS4B6J0NfpEIpfkBNHlBZpA2rblEuEFhZQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz", + "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==", "dev": true, "dependencies": { "@babel/code-frame": "^7.12.13", - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.9", "micromatch": "^4.0.4", - "pretty-format": "^29.6.2", + "pretty-format": "^29.7.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" }, @@ -7265,12 +6368,12 @@ } }, "node_modules/jest-message-util/node_modules/@jest/types": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz", - "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^29.6.0", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7282,46 +6385,35 @@ } }, "node_modules/jest-message-util/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/jest-mock": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz", - "integrity": "sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-mock/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz", + "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==", "dev": true, "dependencies": { - "@sinclair/typebox": "^0.24.1" + "@jest/types": "^29.6.3", + "@types/node": "*", + "jest-util": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-mock/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7329,19 +6421,13 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-mock/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-mock/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -7365,159 +6451,86 @@ } }, "node_modules/jest-regex-util": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz", - "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz", + "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==", "dev": true, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz", - "integrity": "sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz", + "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==", "dev": true, "dependencies": { "chalk": "^4.0.0", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", + "jest-haste-map": "^29.7.0", "jest-pnp-resolver": "^1.2.2", - "jest-util": "^28.1.3", - "jest-validate": "^28.1.3", + "jest-util": "^29.7.0", + "jest-validate": "^29.7.0", "resolve": "^1.20.0", - "resolve.exports": "^1.1.0", + "resolve.exports": "^2.0.0", "slash": "^3.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-resolve-dependencies": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz", - "integrity": "sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz", + "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==", "dev": true, "dependencies": { - "jest-regex-util": "^28.0.2", - "jest-snapshot": "^28.1.3" + "jest-regex-util": "^29.6.3", + "jest-snapshot": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-resolve/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-resolve/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^17.0.8", - "chalk": "^4.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-resolve/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, - "node_modules/jest-resolve/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", - "dev": true, - "dependencies": { - "@types/yargs-parser": "*" - } - }, - "node_modules/jest-resolve/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runner": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz", - "integrity": "sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz", + "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==", "dev": true, "dependencies": { - "@jest/console": "^28.1.3", - "@jest/environment": "^28.1.3", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/console": "^29.7.0", + "@jest/environment": "^29.7.0", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", - "emittery": "^0.10.2", + "emittery": "^0.13.1", "graceful-fs": "^4.2.9", - "jest-docblock": "^28.1.1", - "jest-environment-node": "^28.1.3", - "jest-haste-map": "^28.1.3", - "jest-leak-detector": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-resolve": "^28.1.3", - "jest-runtime": "^28.1.3", - "jest-util": "^28.1.3", - "jest-watcher": "^28.1.3", - "jest-worker": "^28.1.3", + "jest-docblock": "^29.7.0", + "jest-environment-node": "^29.7.0", + "jest-haste-map": "^29.7.0", + "jest-leak-detector": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-resolve": "^29.7.0", + "jest-runtime": "^29.7.0", + "jest-util": "^29.7.0", + "jest-watcher": "^29.7.0", + "jest-worker": "^29.7.0", "p-limit": "^3.1.0", "source-map-support": "0.5.13" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runner/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runner/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7525,140 +6538,58 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-runner/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-runner/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-runner/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-runner/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runner/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runner/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-runtime": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz", - "integrity": "sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==", - "dev": true, - "dependencies": { - "@jest/environment": "^28.1.3", - "@jest/fake-timers": "^28.1.3", - "@jest/globals": "^28.1.3", - "@jest/source-map": "^28.1.2", - "@jest/test-result": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz", + "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==", + "dev": true, + "dependencies": { + "@jest/environment": "^29.7.0", + "@jest/fake-timers": "^29.7.0", + "@jest/globals": "^29.7.0", + "@jest/source-map": "^29.6.3", + "@jest/test-result": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", + "@types/node": "*", "chalk": "^4.0.0", "cjs-module-lexer": "^1.0.0", "collect-v8-coverage": "^1.0.0", - "execa": "^5.0.0", "glob": "^7.1.3", "graceful-fs": "^4.2.9", - "jest-haste-map": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-mock": "^28.1.3", - "jest-regex-util": "^28.0.2", - "jest-resolve": "^28.1.3", - "jest-snapshot": "^28.1.3", - "jest-util": "^28.1.3", + "jest-haste-map": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-mock": "^29.7.0", + "jest-regex-util": "^29.6.3", + "jest-resolve": "^29.7.0", + "jest-snapshot": "^29.7.0", + "jest-util": "^29.7.0", "slash": "^3.0.0", "strip-bom": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runtime/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-runtime/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7666,176 +6597,56 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-runtime/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-runtime/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-runtime/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-runtime/node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, - "node_modules/jest-runtime/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runtime/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-runtime/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-snapshot": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz", - "integrity": "sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz", + "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==", "dev": true, "dependencies": { "@babel/core": "^7.11.6", "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-jsx": "^7.7.2", "@babel/plugin-syntax-typescript": "^7.7.2", - "@babel/traverse": "^7.7.2", "@babel/types": "^7.3.3", - "@jest/expect-utils": "^28.1.3", - "@jest/transform": "^28.1.3", - "@jest/types": "^28.1.3", - "@types/babel__traverse": "^7.0.6", - "@types/prettier": "^2.1.5", + "@jest/expect-utils": "^29.7.0", + "@jest/transform": "^29.7.0", + "@jest/types": "^29.6.3", "babel-preset-current-node-syntax": "^1.0.0", "chalk": "^4.0.0", - "expect": "^28.1.3", + "expect": "^29.7.0", "graceful-fs": "^4.2.9", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-haste-map": "^28.1.3", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3", + "jest-diff": "^29.7.0", + "jest-get-type": "^29.6.3", + "jest-matcher-utils": "^29.7.0", + "jest-message-util": "^29.7.0", + "jest-util": "^29.7.0", "natural-compare": "^1.4.0", - "pretty-format": "^28.1.3", - "semver": "^7.3.5" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/@jest/expect-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz", - "integrity": "sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==", - "dev": true, - "dependencies": { - "jest-get-type": "^28.0.2" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" + "pretty-format": "^29.7.0", + "semver": "^7.5.3" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-snapshot/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -7843,159 +6654,25 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-snapshot/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-snapshot/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-snapshot/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/jest-snapshot/node_modules/diff-sequences": { - "version": "28.1.1", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz", - "integrity": "sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/expect": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz", - "integrity": "sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==", - "dev": true, - "dependencies": { - "@jest/expect-utils": "^28.1.3", - "jest-get-type": "^28.0.2", - "jest-matcher-utils": "^28.1.3", - "jest-message-util": "^28.1.3", - "jest-util": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/jest-diff": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz", - "integrity": "sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "diff-sequences": "^28.1.1", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/jest-matcher-utils": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz", - "integrity": "sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "jest-diff": "^28.1.3", - "jest-get-type": "^28.0.2", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/jest-message-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", - "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", - "dev": true, - "dependencies": { - "@babel/code-frame": "^7.12.13", - "@jest/types": "^28.1.3", - "@types/stack-utils": "^2.0.0", - "chalk": "^4.0.0", - "graceful-fs": "^4.2.9", - "micromatch": "^4.0.4", - "pretty-format": "^28.1.3", - "slash": "^3.0.0", - "stack-utils": "^2.0.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-snapshot/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-util": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.6.2.tgz", - "integrity": "sha512-3eX1qb6L88lJNCFlEADKOkjpXJQyZRiavX1INZ4tRnrBVr2COd3RgcTLyUiEXMNBlDU/cgYq6taUS0fExrWW4w==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz", + "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==", "dev": true, "dependencies": { - "@jest/types": "^29.6.1", + "@jest/types": "^29.6.3", "@types/node": "*", "chalk": "^4.0.0", "ci-info": "^3.2.0", @@ -8007,12 +6684,12 @@ } }, "node_modules/jest-util/node_modules/@jest/types": { - "version": "29.6.1", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.1.tgz", - "integrity": "sha512-tPKQNMPuXgvdOn2/Lg9HNfUvjYVGolt04Hp03f5hAk878uwOLikN+JzeLY0HcVgKgFl9Hs3EIqpu3WX27XNhnw==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^29.6.0", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -8024,50 +6701,38 @@ } }, "node_modules/jest-util/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, "node_modules/jest-validate": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz", - "integrity": "sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz", + "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==", "dev": true, "dependencies": { - "@jest/types": "^28.1.3", + "@jest/types": "^29.6.3", "camelcase": "^6.2.0", "chalk": "^4.0.0", - "jest-get-type": "^28.0.2", + "jest-get-type": "^29.6.3", "leven": "^3.1.0", - "pretty-format": "^28.1.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-validate/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" + "pretty-format": "^29.7.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-validate/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -8075,36 +6740,18 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-validate/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-validate/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-validate/node_modules/ansi-styles": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", - "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, "node_modules/jest-validate/node_modules/camelcase": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", @@ -8117,68 +6764,32 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/jest-validate/node_modules/jest-get-type": { - "version": "28.0.2", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz", - "integrity": "sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==", - "dev": true, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-validate/node_modules/pretty-format": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", - "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", - "dev": true, - "dependencies": { - "@jest/schemas": "^28.1.3", - "ansi-regex": "^5.0.1", - "ansi-styles": "^5.0.0", - "react-is": "^18.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-watcher": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", - "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz", + "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==", "dev": true, "dependencies": { - "@jest/test-result": "^28.1.3", - "@jest/types": "^28.1.3", + "@jest/test-result": "^29.7.0", + "@jest/types": "^29.6.3", "@types/node": "*", "ansi-escapes": "^4.2.1", "chalk": "^4.0.0", - "emittery": "^0.10.2", - "jest-util": "^28.1.3", + "emittery": "^0.13.1", + "jest-util": "^29.7.0", "string-length": "^4.0.1" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, - "node_modules/jest-watcher/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-watcher/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -8186,53 +6797,31 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest-watcher/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest-watcher/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" } }, - "node_modules/jest-watcher/node_modules/jest-util": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", - "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", - "dev": true, - "dependencies": { - "@jest/types": "^28.1.3", - "@types/node": "*", - "chalk": "^4.0.0", - "ci-info": "^3.2.0", - "graceful-fs": "^4.2.9", - "picomatch": "^2.2.3" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest-worker": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", - "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz", + "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==", "dev": true, "dependencies": { "@types/node": "*", + "jest-util": "^29.7.0", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/jest-worker/node_modules/supports-color": { @@ -8250,25 +6839,13 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/jest/node_modules/@jest/schemas": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", - "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", - "dev": true, - "dependencies": { - "@sinclair/typebox": "^0.24.1" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" - } - }, "node_modules/jest/node_modules/@jest/types": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", - "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz", + "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==", "dev": true, "dependencies": { - "@jest/schemas": "^28.1.3", + "@jest/schemas": "^29.6.3", "@types/istanbul-lib-coverage": "^2.0.0", "@types/istanbul-reports": "^3.0.0", "@types/node": "*", @@ -8276,19 +6853,13 @@ "chalk": "^4.0.0" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, - "node_modules/jest/node_modules/@sinclair/typebox": { - "version": "0.24.51", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", - "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==", - "dev": true - }, "node_modules/jest/node_modules/@types/yargs": { - "version": "17.0.24", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz", - "integrity": "sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==", + "version": "17.0.29", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.29.tgz", + "integrity": "sha512-nacjqA3ee9zRF/++a3FUY1suHTFKZeHba2n8WeDw9cCVdmzmHpIxyzOJBcpHvvEmS8E9KqWlSnWHUkOrkhWcvA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -9488,12 +8059,12 @@ } }, "node_modules/pretty-format": { - "version": "29.6.2", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.2.tgz", - "integrity": "sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==", + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, "dependencies": { - "@jest/schemas": "^29.6.0", + "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", "react-is": "^18.0.0" }, @@ -9581,6 +8152,22 @@ "node": ">=6" } }, + "node_modules/pure-rand": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.4.tgz", + "integrity": "sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/dubzzz" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fast-check" + } + ] + }, "node_modules/qs": { "version": "6.5.3", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", @@ -9846,9 +8433,9 @@ } }, "node_modules/resolve.exports": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz", - "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz", + "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==", "dev": true, "engines": { "node": ">=10" @@ -10443,19 +9030,6 @@ "node": ">=8" } }, - "node_modules/supports-hyperlinks": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", - "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", @@ -10508,22 +9082,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/terminal-link": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", - "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", - "dev": true, - "dependencies": { - "ansi-escapes": "^4.2.1", - "supports-hyperlinks": "^2.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -10829,9 +9387,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "funding": [ { @@ -10892,14 +9450,14 @@ } }, "node_modules/v8-to-istanbul": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz", - "integrity": "sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==", + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.3.tgz", + "integrity": "sha512-9lDD+EVI2fjFsMWXc6dy5JJzBsVTcQ2fVkfBvncZ6xJWG9wtBhOldG+mHkSL0+V1K/xgZz0JDO5UT5hFwHUghg==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^1.6.0" + "convert-source-map": "^2.0.0" }, "engines": { "node": ">=10.12.0" diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index cd44b9904c461..cd24a44f92a52 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.1q"; + version = "12.1x"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-dYkeAQBpnETbJiXZSejFPJVhXt3kJBBv6qBKPb7t9fU="; + sha256 = "sha256-MzeTNjGFL8l+8afndjpMqbEKD872ic+AqnpgY2VAPRA="; }; CXXFLAGS = [ diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 2d927f872c1f1..aa2414df1f84d 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.5.1"; + version = "10.6.1"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-YNXsO0iuVyITgvYwLUm83BA2Y+hUcQe9pK9ppy8pVRQ="; + hash = "sha256-O71stl9vLbeNOtW9XeUuKSpB2JmnM4sawN+iFoTJHas="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-oB71R7MUBG7EgVhaWx5oNGLHVGQWhkxO7jJD9eFsc3Y="; + vendorHash = "sha256-g4cUjvFH5F/GfABgG2GKS04XlyJuM+xJ3oQAqT3xjis="; nativeBuildInputs = [ installShellFiles @@ -52,8 +52,8 @@ buildGoModule rec { ]; preBuild = let cliConfigToml = fetchurl { - url = "https://web.archive.org/web/20230523192914/https://developer.fastly.com/api/internal/cli-config"; - hash = "sha256-zgZ3m69dRvuc1S7hHeLxzrM/Z/u0PKUn0XbyQOYO3es="; + url = "https://web.archive.org/web/20231104101556/https://developer.fastly.com/api/internal/cli-config"; + hash = "sha256-Bi5hbmMyFP4Pv2MklwNdkhGLXbI5qf6Ibvj0vWok2tI="; }; in '' cp ${cliConfigToml} ./pkg/config/config.toml diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index bab1b1335d179..d17cbe7c33e53 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -580,12 +580,12 @@ in rec { tilish = mkTmuxPlugin { pluginName = "tilish"; - version = "2020-08-12"; + version = "unstable-2023-09-20"; src = fetchFromGitHub { owner = "jabirali"; repo = "tmux-tilish"; - rev = "73d2404cdc0ef6bd7fbc8982edae0b0e2a4dd860"; - sha256 = "1x58h3bg9d69j40fh8rcjpxvg0i6j04pj8p3jk57l3cghxis5j05"; + rev = "22f7920837d827dc6cb31143ea916afa677c24c1"; + sha256 = "wP3c+p/DM6ve7GUhi0QEzggct7NS4XUa78sVQFSKrfo="; }; meta = with lib; { diff --git a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix index 715d261eea4f5..7f2e8ab81a39e 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/bootstrap-sources.nix @@ -2,12 +2,11 @@ }: rec { - name = "stage0-posix-${version}-${rev}-source"; - # Pinned from https://github.com/oriansj/stage0-posix/commit/3189b5f325b7ef8b88e3edec7c1cde4fce73c76c - version = "unstable-2023-05-02"; - rev = "3189b5f325b7ef8b88e3edec7c1cde4fce73c76c"; + name = "stage0-posix-${version}-source"; + version = "1.6.0"; + rev = "Release_${version}"; outputHashAlgo = "sha256"; - outputHash = "sha256-7Y9+csTwZIQp0WGbagX+Q4f2zavN7AUk1TSBp/H5Xks="; + outputHash = "sha256-epUaShjKiAd749ICvc6rS6WhUkS8R4heKuPdwUjEtsQ="; /* Since `make-minimal-bootstrap-sources` requires nixpkgs and nix it diff --git a/pkgs/os-specific/linux/pam_mktemp/default.nix b/pkgs/os-specific/linux/pam_mktemp/default.nix new file mode 100644 index 0000000000000..04ba58785efab --- /dev/null +++ b/pkgs/os-specific/linux/pam_mktemp/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, pam +, e2fsprogs +}: + +stdenv.mkDerivation rec { + pname = "pam_mktemp"; + version = "1.1.1"; + + src = fetchurl { + url = "https://openwall.com/pam/modules/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-Zs+AwYQ5yjRW25ZALy7qwUsaBQPMHRvn8rFtXwefPz0="; + }; + + patches = [ + (fetchpatch { + name = "inherit_private_prefix_from_home.patch"; + url = "https://git.altlinux.org/gears/p/pam_mktemp.git?p=pam_mktemp.git;a=commitdiff_plain;h=3d2e8ad6da6a44c047bf7a8afa1e1bb2a6e36a55"; + hash = "sha256-xe44fi2xH9jqlStlIR4QPB0KS7spflRdOsvNPEmxJpU"; + }) + (fetchpatch { + name = "allow_private_prefix_to_be_stricter.patch"; + url = "https://git.altlinux.org/gears/p/pam_mktemp.git?p=pam_mktemp.git;a=commitdiff_plain;h=bb2cee0c695d22310e5364c30d74bccb0dbf3205"; + hash = "sha256-TouysUVlNnl+m7lJ2VKPxUTYD2om1Jh5FEJ6NHMAI4U="; + }) + ]; + + patchFlags = "-p2"; + + dontConfigure = true; + + buildInputs = [ pam e2fsprogs ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://www.openwall.com/pam/"; + description = "PAM for login service to provide per-user private directories"; + license = licenses.bsd0; + maintainers = with maintainers; [ wladmis ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index e80185ac5cbb4..b03a285a1d028 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -10,14 +10,14 @@ with lib; stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.1.0"; pname = "tengine"; src = fetchFromGitHub { owner = "alibaba"; repo = pname; rev = version; - hash = "sha256-nUwPT7374dfE/T6yuCUynObq6LxBHDp90Dj2JGwJ4+M="; + hash = "sha256-cClSNBlresMHqJrqSFWvUo589TlwJ2tL5FWJG9QBuis="; }; buildInputs = diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 00432ab5fc6f0..735db1f0b435a 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -23,6 +23,12 @@ buildPythonApplication rec { "doc" ]; + postPatch = '' + # Remove when https://github.com/posativ/isso/pull/973 is available. + substituteInPlace isso/tests/test_comments.py \ + --replace "self.client.delete_cookie('localhost.local', '1')" "self.client.delete_cookie(key='1', domain='localhost')" + ''; + propagatedBuildInputs = [ itsdangerous jinja2 diff --git a/pkgs/servers/mautrix-discord/default.nix b/pkgs/servers/mautrix-discord/default.nix index f2273fa0ec0a6..d7be9a051d31f 100644 --- a/pkgs/servers/mautrix-discord/default.nix +++ b/pkgs/servers/mautrix-discord/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "mautrix-discord"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "discord"; rev = "v${version}"; - hash = "sha256-194AB7r63gijTyeh8mn5N/AgVBeh39YMwdmvuAi3c9k="; + hash = "sha256-hksnD1RWK83JjVIZsKeK8bQobNmzIbm9drgU0VjiqLs="; }; - vendorHash = "sha256-389ewqgpdFNRGAyka+oumx0RVadCSt1BXsXxIGTQwW0="; + vendorHash = "sha256-+dmlJZPc2Tw9G64MeLPY5Rgml3UKEqAtgGI1ImRvMBU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 00cdd26a03176..2fb8c1f5cbb89 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.47.3"; + version = "0.47.6"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-oIGIrEa2iHvvseP3sAcwiUK7ky43scfyaSO7S3G7bEo="; + hash = "sha256-LWF8O6v1x1iX5eJCugQ1noLeUJsVthZ7cGuyW3w6XGg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix index 767f6ebd61d55..7abe243d30363 100644 --- a/pkgs/servers/monitoring/prometheus/systemd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/systemd-exporter.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "systemd_exporter"; - version = "0.5.0"; + version = "0.6.0"; - vendorHash = "sha256-XkwBhj2M1poirPkWzS71NbRTshc8dTKwaHoDfFxpykU="; + vendorHash = "sha256-D5ASUP6XHNeHZqH/ui5GvxWis/NQrRpN/+wkO4fKkA8="; src = fetchFromGitHub { owner = "prometheus-community"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q6rnD8JCtB1zTkUfZt6f2Uyo91uFi3HYI7WFlZdzpBM="; + sha256 = "sha256-zLg4cOZUh50OFPp4mKR/FY0JfzVmXmDFcKkhB6DalGc="; }; ldflags = [ diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 2277c997b7a8d..2b7e3c04735d6 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz"; - hash = "sha256-kUsEdEKwYjyM5G8YKTt90fWzX21hiulRj3W5jK45Keg="; + hash = "sha256-G2kCh5F2WfrSOCr+fEO02mlOSVfV2Oy3uZGNEarLR+M="; }; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/servers/osmocom/osmo-iuh/default.nix b/pkgs/servers/osmocom/osmo-iuh/default.nix index 201a7ee9abf78..9047c74397244 100644 --- a/pkgs/servers/osmocom/osmo-iuh/default.nix +++ b/pkgs/servers/osmocom/osmo-iuh/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "osmo-iuh"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "osmo-iuh"; rev = version; - hash = "sha256-AwLLfG+5JgvFSBddzyUQdPDFZOX1uQyDSyr4O/wTlgs="; + hash = "sha256-rAU2+NxD+j2jntZ7dHvakv2aTsfzAg0+SFDHtSJNpn8="; }; prePatch = '' diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index efa3089e47c7d..a4a6e869f9a3c 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mssql-jdbc"; - version = "12.4.1"; + version = "12.4.2"; src = fetchurl { url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar"; - sha256 = "sha256-Ci59MLU50Dl+rmUstX7c/BdAJJ/GCCYLqcyrxGr2g7E="; + sha256 = "sha256-JGt6SXg4Ok+czMwGpDk9xdVw/WSkNLeBxqghcM3WmRE="; }; dontUnpack = true; diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 4eec452d0f11a..e136f02757d99 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.0.34"; + version = "8.0.35"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-5l0Do8QmGLX7+ZBCrtMyCUAumyeqYsfIdD/9R4jY2x0="; + hash = "sha256-kXxe04cE6ZIRGFzkviTjOowZyRJB7XOvQYGm840VdMI="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 2aa727ca2d144..8a8502ad823b4 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.21.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-0+fMZ5ps0CkBbS+fcxlYrrkQi28tmrKTyl3kPuofqyI="; + hash = "sha256-e4+ZkhncgDIWE5NH2eYun2FeWxz1suM//6T6P3V4nQU="; }; passthru.tests = { @@ -26,12 +26,6 @@ stdenvNoCC.mkDerivation rec { # There's nothing to build. dontBuild = true; - # the data folder is no in this package and thereby declared by an env-var - overrideConfig = pkgs.writeText "constants.local.php" '' - <?php - define('DATA_PATH', getenv('FRESHRSS_DATA_PATH')); - ''; - postPatch = '' patchShebangs cli/*.php app/actualize_script.php ''; @@ -39,8 +33,6 @@ stdenvNoCC.mkDerivation rec { installPhase = '' mkdir -p $out cp -vr * $out/ - - cp $overrideConfig $out/constants.local.php ''; meta = with lib; { diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index b13c41a190533..124f6eec10ae6 100644 --- a/pkgs/test/cross/default.nix +++ b/pkgs/test/cross/default.nix @@ -13,7 +13,7 @@ let compareTest = { emulator, pkgFun, hostPkgs, crossPkgs, exec, args ? [] }: let pkgName = (pkgFun hostPkgs).name; args' = lib.concatStringsSep " " args; - in crossPkgs.runCommand "test-${pkgName}-${crossPkgs.hostPlatform.config}" { + in crossPkgs.runCommand "test-${pkgName}-${crossPkgs.stdenv.hostPlatform.config}" { nativeBuildInputs = [ pkgs.dos2unix ]; } '' # Just in case we are using wine, get rid of that annoying extra @@ -59,12 +59,12 @@ let crossSystem = crossSystemFun system; }; - emulator = crossPkgs.hostPlatform.emulator pkgs; + emulator = crossPkgs.stdenv.hostPlatform.emulator pkgs; # Apply some transformation on windows to get dlls in the right # place. Unfortunately mingw doesn’t seem to be able to do linking # properly. - platformFun = pkg: if crossPkgs.hostPlatform.isWindows then + platformFun = pkg: if crossPkgs.stdenv.hostPlatform.isWindows then pkgs.buildEnv { name = "${pkg.name}-winlinks"; paths = [pkg] ++ pkg.buildInputs; @@ -92,7 +92,7 @@ let }; pkg-config = {platformFun, crossPkgs, emulator}: crossPkgs.runCommand - "test-pkg-config-${crossPkgs.hostPlatform.config}" + "test-pkg-config-${crossPkgs.stdenv.hostPlatform.config}" { depsBuildBuild = [ crossPkgs.pkgsBuildBuild.pkg-config ]; nativeBuildInputs = [ crossPkgs.pkgsBuildHost.pkg-config crossPkgs.buildPackages.zlib ]; @@ -134,6 +134,7 @@ let pkgs.pkgsMusl.stdenv pkgs.pkgsLLVM.stdenv pkgs.pkgsStatic.bash + #pkgs.pkgsCross.gnu64_simplekernel.bash # https://github.com/NixOS/nixpkgs/issues/264989 pkgs.pkgsCross.arm-embedded.stdenv pkgs.pkgsCross.sheevaplug.stdenv # for armv5tel pkgs.pkgsCross.raspberryPi.stdenv # for armv6l diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 595c3413d5e18..06c275edc70c8 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -9,6 +9,8 @@ with pkgs; pkgSets = lib.pipe pkgNames [ (filter (lib.hasPrefix "llvmPackages")) (filter (n: n != "rocmPackages.llvm")) + # Is a throw alias. + (filter (n: n != "llvmPackages_rocm")) (filter (n: n != "llvmPackages_latest")) (filter (n: n != "llvmPackages_git")) ]; diff --git a/pkgs/tools/admin/hop-cli/default.nix b/pkgs/tools/admin/hop-cli/default.nix index 4d9734874e2c9..43705fc722aa8 100644 --- a/pkgs/tools/admin/hop-cli/default.nix +++ b/pkgs/tools/admin/hop-cli/default.nix @@ -6,20 +6,21 @@ , stdenv , CoreServices , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "hop-cli"; - version = "0.2.54"; + version = "0.2.60"; src = fetchFromGitHub { owner = "hopinc"; repo = "cli"; rev = "v${version}"; - hash = "sha256-0BIPN4+XYZgUdxygpKpWZq6VkWWNCFD8v5egXOYfC64="; + hash = "sha256-zNAV9WdtRBlCh7Joky5Dl+cw/FpY1m/WJxUoNikmXvQ="; }; - cargoHash = "sha256-KE7AAyArRang/EZrpgv+vlNZaAP/Y2pCltiPMgZ5vFA="; + cargoHash = "sha256-1QD6mEXRw3NCTBKJyVGK3demLKUdE6smELpvdFSJiWY="; nativeBuildInputs = [ pkg-config @@ -28,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ - CoreServices Security + CoreServices Security SystemConfiguration ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 205a8f42b997c..0cb8be3e4da02 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kics"; - version = "1.7.8"; + version = "1.7.10"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - hash = "sha256-T4b4PO4NcpsosiyRa/78WJ4yYvc1Ez7t7KIbZzSlQAo="; + hash = "sha256-3guudT+PidrgHcJ6/lA/XWHmZXdvjGOhtpoO+9hkYOY="; }; vendorHash = "sha256-gJu3B30IPp8A/xgtE5fzThQAtnFbbzr8ZwucAsObBxs="; diff --git a/pkgs/tools/admin/ossutil/default.nix b/pkgs/tools/admin/ossutil/default.nix index 4e4bb79c9956c..77e3e9afab5ad 100644 --- a/pkgs/tools/admin/ossutil/default.nix +++ b/pkgs/tools/admin/ossutil/default.nix @@ -1,17 +1,17 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - version = "1.7.16"; + version = "1.7.17"; pname = "ossutil"; src = fetchFromGitHub { owner = "aliyun"; repo = "ossutil"; rev = "refs/tags/v${version}"; - hash = "sha256-J6t8QoyCvbGrUX2AkdqugztchP7Cc0jZsrn1+OB2hVY="; + hash = "sha256-5Z0mMgDYexUQAcngeEd0m5J5kRwWTGIS2Q+idBcTV98="; }; - vendorHash = "sha256-oxhi27Zt91S2RwidM+BPati/HWuP8FrZs1X2R2Px5hI="; + vendorHash = "sha256-4a/bNH47sxxwgYYQhHTqyXddJit3VbeM49/4IEfjWsY="; # don't run tests as they require secret access keys that only travis has doCheck = false; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 602e1ff770714..05dbc34c7d9bd 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.5.3"; + version = "6.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-/OfLP5IOYV5j+vJlpM2fK/OdStyqZiEcmHaX2oWi7t0="; + hash = "sha256-lnkple77LqrgUcLOO1YJt+m7LBpcuD/mn5LxEBtUuGk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix index feb5b23df52a6..0a4447bacc4f3 100644 --- a/pkgs/tools/filesystems/zfstools/default.nix +++ b/pkgs/tools/filesystems/zfstools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ruby, zfs }: +{ lib, stdenv, fetchFromGitHub, ruby, zfs, makeWrapper }: stdenv.mkDerivation rec { pname = "zfstools"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ruby ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/bin @@ -20,10 +21,10 @@ stdenv.mkDerivation rec { cp -R lib $out/ for f in $out/bin/*; do - substituteInPlace $f --replace "/usr/bin/env ruby" "ruby -I$out/lib" + wrapProgram $f \ + --set RUBYLIB $out/lib \ + --prefix PATH : ${zfs}/bin done - - sed -e 's|cmd.*=.*"zfs |cmd = "${zfs}/sbin/zfs |g' -i $out/lib/zfstools/{dataset,snapshot}.rb ''; meta = with lib; { diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index 08136f57ef882..04c245dbd9a63 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -1,4 +1,5 @@ { lib, python3Packages, fetchFromGitHub +, ffmpeg-full , gtk3 , pango , gobject-introspection @@ -33,6 +34,8 @@ with python3Packages; buildPythonApplication { outputs = [ "out" "man" ]; + makeWrapperArgs = ["--prefix PATH : ${lib.makeBinPath [ ffmpeg-full ]}"]; + postInstall = '' mkdir -p $man/share/man/man1 cp man/escrotum.1 $man/share/man/man1/ diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 69b5c53bd28e8..aa8e9ac6a9e86 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook, autoPatchelfHoo stdenv.mkDerivation rec { pname = "birdfont"; - version = "2.33.1"; + version = "2.33.3"; src = fetchurl { url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-vFXpZNvsXpz7saRp6ruhvsP50rmJ2Prr2M78+8oxQ9M="; + sha256 = "sha256-NNw7203BtHhNyyQezb3/EP98cTsu7ABDFBnM5Ms2ePY="; }; nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook autoPatchelfHook ]; diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index 1a5af43935df1..a717e9f54da51 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.50.0"; + version = "2.50.4"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-ZQsc1Far3x4WySbSU5wZXN6acirgVu467BGyjbcT5Ks="; + hash = "sha256-q4l0C99CEY3CEw2eXEnz+29z4JGSgqhVKFoaQ7azsZQ="; }; - vendorHash = "sha256-KCFLM8qElbPbmLBCzyThUiqv/BLXsG3eauCBjahMMYk="; + vendorHash = "sha256-7+kmKqMDrGw/lnOL+JS4MRguQNlLaOb47ptX33BEWkM="; postInstall = '' # Name the output the same way as the original build script does diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index db72f76e1a057..801b3737f9b9a 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.2.9"; + version = "5.2.10"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-InnHiaPvSCCtRmWStyrYQMhNQnoG+lhSBe7ECrPFKFc="; + sha256 = "sha256-en/CAmk9Rj2MrUF5vfsZu1fUDJFaAifL7PYgUT3Uu8k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/pokeget-rs/default.nix b/pkgs/tools/misc/pokeget-rs/default.nix index 9dcd70219a443..d6e790595c5dc 100644 --- a/pkgs/tools/misc/pokeget-rs/default.nix +++ b/pkgs/tools/misc/pokeget-rs/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "pokeget-rs"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "talwat"; repo = "pokeget-rs"; rev = version; - hash = "sha256-UAkSMdHukwxDzOU/sIOuTazBbD68ORIGAWuwRxoC+EY="; + hash = "sha256-C7pEe9nScJ/ORJJrUDo6pADKceKoagHGP/X/asR1PcM="; fetchSubmodules = true; }; - cargoHash = "sha256-A5bDZU/L3G2RWbc3Y6KEQAmLS4RuNSG+ROypxINlwLk="; + cargoHash = "sha256-gPPtVFSaaSL0QBXxHpslVdon3XVCVx1E5cfEP1Ffa9g="; meta = with lib; { description = "A better rust version of pokeget"; diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix index 74cd8e4425e9b..92b931fd1d9ee 100644 --- a/pkgs/tools/misc/trillian/default.nix +++ b/pkgs/tools/misc/trillian/default.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "trillian"; - version = "1.5.2"; - vendorHash = "sha256-DlqezeMZsOaCoqvGMiU+fHMq+p3tZ+XBulB/G3BJESM="; + version = "1.5.3"; + vendorHash = "sha256-DsdkTYRQQjTCArD3bo1al8enFzjfT7DVfmjK5KUqPDI="; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m+22UK37IBCo48AgzINxKvudhEwvStz6fLWjE49saIg="; + sha256 = "sha256-fXqoe59JU5efAo5ByJ4027oqHakNCTvAtAq48MJZ9ZE="; }; subPackages = [ diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 0d7b5be4b5a2e..bf0365b399193 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flannel"; - version = "0.22.3"; + version = "0.23.0"; rev = "v${version}"; - vendorHash = "sha256-2P9gEbItK7rCtveXIZkFMcvppjK4GLzTSoLrkMPeCig="; + vendorHash = "sha256-U4mFFxVVLHvgY2YQN1nEsFiTpfBpmhftLoVoGEzb2Fs="; src = fetchFromGitHub { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-sO3iFs6pAmnqpc9+hxx2WZQWOP37/4XS1m5U4nerVLI="; + sha256 = "sha256-8KUfmnDShhb8eFukU/dUo/PCrFlQDBh+gAV2rqqB7mE="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index d8b16aa4f2778..5345d96eb1e61 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kail"; - version = "0.16.1"; + version = "0.17.0"; ldflags = [ "-s" @@ -14,10 +14,10 @@ buildGoModule rec { owner = "boz"; repo = "kail"; rev = "v${version}"; - sha256 = "sha256-x9m0NoZjCf/lBWcSGFbjlJIukL6KIYt56Q1hADS8N9I="; + sha256 = "sha256-i53pW2YcmHDrRPhRI3iUD+YvGCReNgEeSltv4ZNIObo="; }; - vendorHash = "sha256-W+/vIq7qC+6apk+1GOWvmcwyyjFRkndq8X5m/lRYOu4="; + vendorHash = "sha256-haF136u6CmbWGuOlCpnGf9lBEeN92PYM6KBvWVOZ8Ws="; meta = with lib; { description = "Kubernetes log viewer"; diff --git a/pkgs/tools/networking/rabtap/default.nix b/pkgs/tools/networking/rabtap/default.nix index 814d81429c4ef..06aacddbcf6bd 100644 --- a/pkgs/tools/networking/rabtap/default.nix +++ b/pkgs/tools/networking/rabtap/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rabtap"; - version = "1.38.2"; + version = "1.39.0"; src = fetchFromGitHub { owner = "jandelgado"; repo = "rabtap"; rev = "v${version}"; - sha256 = "sha256-l35MHr7NWBlzKcGSDGjHTwGfnDrOpjeJp9/YAp1Areo="; + sha256 = "sha256-/inclOpKYlEGSEH390+GtRiHXotaH+VxqWVAWSf61Xs="; }; - vendorHash = "sha256-sJFMef9VnU6iKGf9UwEK60axLUBkubFWgI+pWKjaWNU="; + vendorHash = "sha256-BrpDafEFDrH243zDHY9EtkVjPvwrmbJVu5TQMHHOWfA="; meta = with lib; { description = "RabbitMQ wire tap and swiss army knife"; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index de0ffe86ec4f1..1bf10ce2c4080 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -14,13 +14,13 @@ let pname = "zerotierone"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-430wdPrSNohM3sXewusjsW3tbE7EFGISGxABZF21yRc="; + sha256 = "sha256-p0zrYgbHTLefj5GTrMnYLytCXZ/nRuqTL+6dEeC+uVw="; }; in stdenv.mkDerivation { diff --git a/pkgs/tools/package-management/libdnf/default.nix b/pkgs/tools/package-management/libdnf/default.nix index 1a2d1521f0f32..739210ce92408 100644 --- a/pkgs/tools/package-management/libdnf/default.nix +++ b/pkgs/tools/package-management/libdnf/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.71.0"; + version = "0.72.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kRpB80ntb5CbqnWpc3M3i7w06CkstPlJfo2X3WsuME8="; + hash = "sha256-Ou7cXJz4g8cx2KjeX+IFRA2m158PGKcb9jCXFuAOKqU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 0f4c544f8f486..4e0782c752dee 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cnspec"; - version = "9.5.0"; + version = "9.5.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-XDsZyDTULetUnV0zFn6ZhP/2MJN0gs/HlvWmdeTa0NU="; + hash = "sha256-nQ6Dd87ZkA+DPUtLnL83+jGcBNOoO6jmqtQXoynMS+8="; }; proxyVendor = true; diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index 6955f08a2264b..36ce6d72ceb80 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gotrue"; - version = "2.99.0"; + version = "2.105.0"; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-OUxiAEPX1mWL4td3xdiK9420i4K9pwNdGqch/5T21BY="; + hash = "sha256-6tFXuVBd7UptoVMSse1Pk9ok6XyGL994pfFkFTyc5I0="; }; - vendorHash = "sha256-r1xJka1ISahaHJOkFwjn/Nrf2EU0iGVosz8PZnH31TE="; + vendorHash = "sha256-cwTwze8WuhL5exaY5HJYDgcxNB9O1QuFpJgZmj6R838="; ldflags = [ "-s" diff --git a/pkgs/tools/security/gowitness/default.nix b/pkgs/tools/security/gowitness/default.nix index a361c141d3a0b..bd9ab97a0f384 100644 --- a/pkgs/tools/security/gowitness/default.nix +++ b/pkgs/tools/security/gowitness/default.nix @@ -1,23 +1,30 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "gowitness"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "sensepost"; - repo = pname; - rev = version; - sha256 = "sha256-rylft6v6Np8xOm2AUtH7e/zDZQ87WNPeerXEtziSrDw="; + repo = "gowitness"; + rev = "refs/tags/${version}"; + hash = "sha256-37OorjzxDu27FNAz4LTtQdFjt0tL9jSb9tGZhlq797Q="; }; - vendorHash = "sha256-l6jdVsKKLqEyFpz7JhkLLjVTWX1pZenlCY5UqSZVMdc="; + vendorHash = "sha256-Exw5NfR3nDYH+hWMPOKuVIRyrVkOJyP7Kwe4jzQwnsI="; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; meta = with lib; { description = "Web screenshot utility"; homepage = "https://github.com/sensepost/gowitness"; + changelog = "https://github.com/sensepost/gowitness/releases/tag/${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/tools/security/hcxdumptool/default.nix index 0633e74e76f30..3e51d300e9a39 100644 --- a/pkgs/tools/security/hcxdumptool/default.nix +++ b/pkgs/tools/security/hcxdumptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxdumptool"; - version = "6.3.1"; + version = "6.3.2"; src = fetchFromGitHub { owner = "ZerBea"; repo = "hcxdumptool"; rev = version; - sha256 = "sha256-FWBr0uDpefu2MCWQZrMfPJ/MUJcmk9fWMzhtTDmC0L0="; + sha256 = "sha256-InMyDUEH135Y1RYJ3z1+RQxPMi7+QMf670S/S2ZL9vg="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 78b564263c78c..8cba4e1e3634b 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vttAIkQzZKkqKer/rnX9irNev3i7y8kfTqO4LH1xANo="; + hash = "sha256-yqpSkKebhX3kszL4mSbKUd9JR7rJizLdrk7tHlh6zlc="; }; - vendorHash = "sha256-cEp/bMOWoAfpFoi9zVcSoYyPwL9hVnoOzRzCPacrSiM="; + vendorHash = "sha256-pekirk3nYXDLzoy4iBJblYvN9fkViyMUsRFC0Dx1r9M="; subPackages = [ "cmd/nuclei/" diff --git a/pkgs/tools/text/dt/default.nix b/pkgs/tools/text/dt/default.nix index 303feb0fe9422..aa478b16dd694 100644 --- a/pkgs/tools/text/dt/default.nix +++ b/pkgs/tools/text/dt/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dt"; - version = "1.2.5"; + version = "1.3.1"; src = fetchFromGitHub { owner = "so-dang-cool"; repo = "dt"; rev = "v${finalAttrs.version}"; - hash = "sha256-i8oMrsPcINVK5kXzrN+lcPqBfxIeed8W+NF7Qd0crrk="; + hash = "sha256-qHfvHf4T0wWnzqp5FfLg7n7te24xc2aMEdTK3Iia8Q0="; }; nativeBuildInputs = [ zig_0_11.hook ]; diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index cc84b33b9f658..dcea374bffe71 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-admonish"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "tommilligan"; repo = pname; rev = "v${version}"; - hash = "sha256-jr77WC6b5PrPANivd6diAFfVqudtviIWBE7I8eFmCfs="; + hash = "sha256-wRRBasHnTelLCiHjjrMmXv/2V3P91n4kZ1aAt1tZx/Y="; }; - cargoHash = "sha256-gBkRA8QRha46y5cp5aY2R+ekdfjUX5tDuNawCwzKFi4="; + cargoHash = "sha256-KAcZyHanmbOKK+55dkINss9uOxk6P+r38M6qftYQwpw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/virtualization/jumppad/default.nix b/pkgs/tools/virtualization/jumppad/default.nix index a993fe9484d26..174fe292f4592 100644 --- a/pkgs/tools/virtualization/jumppad/default.nix +++ b/pkgs/tools/virtualization/jumppad/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "jumppad"; - version = "0.5.51"; + version = "0.5.53"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-Az/rNkGwwrYZfay+KjINjIT2PNsoGDNCwZnXZTeKqM4="; + hash = "sha256-93KTi7m+7zS6hSIF4dA995Z8jUdmE5u3O8ytCLsEqdE="; }; - vendorHash = "sha256-onUs7ZbnzJGbs+Q+1jvqUp9y9ecOxhtcdx/fkxZntmc="; + vendorHash = "sha256-o3jA1gVKW6KUHzy5zZO4aaGVoCBFN96hbK0/usQ32fw="; ldflags = [ "-s" "-w" "-X main.version=${version}" diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index e25fcb3a19bc5..a4f54ec86177b 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -8,29 +8,33 @@ , requests , setuptools , terminaltables +, rich +, openapi3 +, packaging }: let - sha256 = "0r5by5d6wr5zbsaj211s99qg28nr7wm8iri6jxnksx5b375dah6g"; + hash = "sha256-J0L+FTVzYuAqTDOwpoH12lQr03UNo5dsQpd/iUKR40Q="; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.140.0"; - specSha256 = "0ay54m4aa8bmmpjc7s66rfzqzk4w25h48b9a665y29g67ybb432g"; + specVersion = "4.166.0"; + specHash = "sha256-rUwKQt3y/ALZUoW3eJiiIDJYLQpUHO7Abm0h09ra02g="; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; - sha256 = specSha256; + hash = specHash; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "5.26.1"; + version = "5.45.0"; + pyproject = true; src = fetchFromGitHub { owner = "linode"; repo = pname; - rev = version; - inherit sha256; + rev = "v${version}"; + inherit hash; }; patches = [ @@ -40,7 +44,7 @@ buildPythonApplication rec { # remove need for git history prePatch = '' substituteInPlace setup.py \ - --replace "version=get_version()," "version='${version}'," + --replace "version = get_version()" "version='${version}'," ''; propagatedBuildInputs = [ @@ -49,11 +53,15 @@ buildPythonApplication rec { requests setuptools terminaltables + rich + openapi3 + packaging ]; postConfigure = '' python3 -m linodecli bake ${spec} --skip-config cp data-3 linodecli/ + echo "${version}" > baked_version ''; doInstallCheck = true; @@ -69,9 +77,10 @@ buildPythonApplication rec { passthru.updateScript = ./update.sh; meta = with lib; { + mainProgram = "linode-cli"; description = "The Linode Command Line Interface"; homepage = "https://github.com/linode/linode-cli"; license = licenses.bsd3; - maintainers = with maintainers; [ ryantm ]; + maintainers = with maintainers; [ ryantm techknowlogick ]; }; } diff --git a/pkgs/tools/virtualization/linode-cli/remove-update-check.patch b/pkgs/tools/virtualization/linode-cli/remove-update-check.patch index 316d2855b1f45..f26b30edf72d0 100644 --- a/pkgs/tools/virtualization/linode-cli/remove-update-check.patch +++ b/pkgs/tools/virtualization/linode-cli/remove-update-check.patch @@ -1,11 +1,13 @@ ---- a/linodecli/cli.py -+++ b/linodecli/cli.py -@@ -555,7 +555,7 @@ - if self.debug_request: - self.print_response_debug_info(result) - -- if not self.suppress_warnings: -+ if False: - # check the major/minor version API reported against what we were built - # with to see if an upgrade should be available - api_version_higher = False +diff --git a/linodecli/api_request.py b/linodecli/api_request.py +index 4273aa6..3ada5c2 100644 +--- a/linodecli/api_request.py ++++ b/linodecli/api_request.py +@@ -305,7 +305,7 @@ def _attempt_warn_old_version(ctx, result): + file=sys.stderr, + ) + +- if api_version_higher: ++ if False: + # check to see if there is, in fact, a version to upgrade to. If not, don't + # suggest an upgrade (since there's no package anyway) + new_version_exists = False \ No newline at end of file diff --git a/pkgs/tools/virtualization/linode-cli/update.sh b/pkgs/tools/virtualization/linode-cli/update.sh index f232dd1e03b09..8bd0bfe8602ec 100755 --- a/pkgs/tools/virtualization/linode-cli/update.sh +++ b/pkgs/tools/virtualization/linode-cli/update.sh @@ -18,13 +18,13 @@ VERSION=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ | grep -v -e rc -e list \ | cut -d '"' -f4 | sort -rV | head -n 1) -SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linode/linode-cli/archive/refs/tags/${VERSION}.tar.gz) +SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linode/linode-cli/archive/refs/tags/v${VERSION}.tar.gz) setKV () { sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix } setKV specVersion ${SPEC_VERSION} -setKV specSha256 ${SPEC_SHA256} +setKV specHash ${SPEC_SHA256} setKV version ${VERSION} -setKV sha256 ${SHA256} +setKV hash ${SHA256} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d3c866bc34819..1a7bc5b7c4d9b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -275,6 +275,7 @@ mapAliases ({ geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 + go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 git-subset = throw "'git-subset' has been removed in favor of 'git-filter-repo'"; # Added 2023-01-13 gitAndTools = self // { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af609d1e8a3ad..0bda52e084fe3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5514,8 +5514,6 @@ with pkgs; go-2fa = callPackage ../tools/security/2fa { }; - go-dependency-manager = callPackage ../development/tools/gdm { }; - go-neb = callPackage ../applications/networking/instant-messengers/go-neb { }; google-cursor = callPackage ../data/icons/google-cursor { }; @@ -16385,7 +16383,7 @@ with pkgs; hop = callPackage ../development/compilers/hop { }; hop-cli = callPackage ../tools/admin/hop-cli { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; falcon = callPackage ../development/interpreters/falcon { @@ -24564,7 +24562,6 @@ with pkgs; }); poppler_min = poppler.override { # TODO: maybe reduce even more - # this is currently only used by texlive.bin. minimal = true; suffix = "min"; }; @@ -28548,6 +28545,8 @@ with pkgs; pam_ldap = callPackage ../os-specific/linux/pam_ldap { }; + pam_mktemp = callPackage ../os-specific/linux/pam_mktemp { }; + pam_mount = callPackage ../os-specific/linux/pam_mount { }; pam_mysql = callPackage ../os-specific/linux/pam_mysql { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 95c2ea7b41856..ff9aa962be7be 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -832,7 +832,7 @@ let }; ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; - })).overrideScope' liftJaneStreet; + })).overrideScope liftJaneStreet; janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { self = self.janeStreet_0_9_0; @@ -1967,7 +1967,7 @@ in let inherit (pkgs) callPackage; in rec # *and* non-JS OCaml libraries can pull in the same version of JS transitive # dependencies. Remove this once ligo and stanc can be compiled against # janestreet 0.16 libraries. - ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope' (self: super: super // super.janeStreet_0_15); + ocamlPackages_4_14_janeStreet_0_15 = ocamlPackages_4_14.overrideScope (self: super: super // super.janeStreet_0_15); # We still have packages that rely on unsafe-string, which is deprecated in OCaml 4.06.0. # Below are aliases for porting them to the latest versions of the OCaml 4 series. diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 00f517bc57881..b631ee4cf9f88 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -335,6 +335,7 @@ mapAliases ({ pytestrunner = pytest-runner; # added 2021-01-04 python-forecastio = throw "python-forecastio has been removed, as the Dark Sky service was shut down."; # added 2023-04-05 python-igraph = igraph; # added 2021-11-11 + python_docs_theme = python-docs-theme; # added 2023-11-04 python_keyczar = throw "python_keyczar has been removed because it's been archived upstream and deprecated"; # added 2023-05-16 python-lz4 = lz4; # added 2018-06-01 python_magic = python-magic; # added 2022-05-07 @@ -359,6 +360,7 @@ mapAliases ({ Quandl = quandl; # added 2023-02-19 qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01 + radio_beam = radio-beam; # added 2023-11-04 ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21 rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05 recaptcha_client = throw "recaptcha_client has been removed since it is no longer maintained"; # added 2023-10-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 228cabf855d16..5639ff919b943 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1898,6 +1898,8 @@ self: super: with self; { certvalidator = callPackage ../development/python-modules/certvalidator { }; + cf-xarray = callPackage ../development/python-modules/cf-xarray { }; + cffi = callPackage ../development/python-modules/cffi { }; cffsubr = callPackage ../development/python-modules/cffsubr { }; @@ -8431,6 +8433,8 @@ self: super: with self; { openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; + openapi3 = callPackage ../development/python-modules/openapi3 { }; + openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings { openbabel = callPackage ../development/libraries/openbabel { inherit (self) python; }; }; @@ -8665,7 +8669,7 @@ self: super: with self; { pallets-sphinx-themes = callPackage ../development/python-modules/pallets-sphinx-themes { }; - python_docs_theme = callPackage ../development/python-modules/python_docs_theme { }; + python-docs-theme = callPackage ../development/python-modules/python-docs-theme { }; pamela = callPackage ../development/python-modules/pamela { }; @@ -11987,7 +11991,7 @@ self: super: with self; { radian = callPackage ../development/python-modules/radian { }; - radio_beam = callPackage ../development/python-modules/radio_beam { }; + radio-beam = callPackage ../development/python-modules/radio-beam { }; radios = callPackage ../development/python-modules/radios { }; |