From d2c34a858330ae01a9424be3293ddee66fe6a0e7 Mon Sep 17 00:00:00 2001 From: slwst Date: Thu, 9 Feb 2023 16:59:29 -0500 Subject: [PATCH 001/203] maintainers: add slwst --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5625c87f4a6e..ac801bbfd9ab 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13567,6 +13567,15 @@ githubId = 12828415; name = "Michel Weitbrecht"; }; + slwst = { + email = "email@slw.st"; + github = "slwst"; + githubId = 11047377; + name = "slwst"; + keys = [{ + fingerprint = "6CEB 4A2F E6DC C345 1B2B 4733 AD52 C5FB 3EFE CC7A"; + }]; + }; smakarov = { email = "setser200018@gmail.com"; github = "SeTSeR"; From d8747030598e9072b381a96d90a708b9599aac4f Mon Sep 17 00:00:00 2001 From: slwst Date: Thu, 9 Feb 2023 17:56:49 -0500 Subject: [PATCH 002/203] adi1090x-plymouth-themes: init at unstable-2020-12-28 --- .../adi1090x-plymouth-themes/default.nix | 63 ++++ .../themes/adi1090x-plymouth-themes/shas.nix | 322 ++++++++++++++++++ .../themes/adi1090x-plymouth-themes/update.sh | 34 ++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 421 insertions(+) create mode 100644 pkgs/data/themes/adi1090x-plymouth-themes/default.nix create mode 100644 pkgs/data/themes/adi1090x-plymouth-themes/shas.nix create mode 100755 pkgs/data/themes/adi1090x-plymouth-themes/update.sh diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/default.nix b/pkgs/data/themes/adi1090x-plymouth-themes/default.nix new file mode 100644 index 000000000000..10356feed623 --- /dev/null +++ b/pkgs/data/themes/adi1090x-plymouth-themes/default.nix @@ -0,0 +1,63 @@ +{ + stdenv, + fetchurl, + lib, + unzip, + # To select only certain themes, pass `selected_themes` as a list of strings. + # reference ./shas.nix for available themes + selected_themes ? [], +}: let + version = "2020-12-28"; + # this file is generated via ./update.sh + # borrowed from pkgs/data/fonts/nerdfonts + themeShas = import ./shas.nix; + knownThemes = builtins.attrNames themeShas; + selectedThemes = + if (selected_themes == []) + then knownThemes + else let + unknown = lib.subtractLists knownThemes selected_themes; + in + if (unknown != []) + then throw "Unknown theme(s): ${lib.concatStringsSep " " unknown}" + else selected_themes; + srcs = lib.lists.forEach selectedThemes ( + name: (fetchurl { + url = themeShas.${name}.url; + sha256 = themeShas.${name}.sha; + }) + ); +in + stdenv.mkDerivation { + pname = "adi1090x-plymouth-themes"; + inherit version srcs; + + nativeBuildInputs = [ + unzip + ]; + + sourceRoot = "."; + unpackCmd = "tar xzf $curSrc"; + + installPhase = '' + mkdir -p $out/share/plymouth/themes + for theme in ${toString selectedThemes}; do + mv $theme $out/share/plymouth/themes/$theme + done + find $out/share/plymouth/themes/ -name \*.plymouth -exec sed -i "s@\/usr\/@$out\/@" {} \; + ''; + + meta = with lib; { + description = "Plymouth boot themes from adi1090x"; + longDescription = '' + A variety of plymouth boot screens by adi1090x. Using the default value + of `selected_themes` will install all themes (~524M). Consider overriding + this with a list of the string names of each theme to install. Check + ./shas.nix for available themes. + ''; + homepage = "https://github.com/adi1090x/plymouth-themes"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [slwst]; + }; + } diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix b/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix new file mode 100644 index 000000000000..cb128478cdfe --- /dev/null +++ b/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix @@ -0,0 +1,322 @@ +{ + "abstract_ring" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring.tar.gz"; + sha = "133gifr4571b14ci44jmm49j91yhq785yx4b3h6yvx0188liibr2"; + }; + "abstract_ring_alt" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring_alt.tar.gz"; + sha = "157yg2y4vfwjfly2paq2xn1p6h2wrbvvzwy4lbpbhlmhyhrymjvj"; + }; + "alienware" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/alienware.tar.gz"; + sha = "1i3i0gj927drbgivcx3fqj6fqdwm2gqy0wrwfkdqdjyqzq1286a5"; + }; + "angular" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular.tar.gz"; + sha = "06n3ix7k8zpraqc75wy4fnk1bzcyhfajjxjq9kyy470wgsjrw6p4"; + }; + "angular_alt" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular_alt.tar.gz"; + sha = "1l1iy9p0k4a8mcdps30avscjp6wfv20m9zy376r18y7xwcz19qbj"; + }; + "black_hud" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/black_hud.tar.gz"; + sha = "13y32zxcshnfyjxs0r7f1sz010sr6brsaap90im2cb4rlvp0ajsz"; + }; + "blockchain" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/blockchain.tar.gz"; + sha = "1f60nvrk506bqw47g90wzbvn3bp5h1gbi0ll5f3bd6wj77qfk05i"; + }; + "circle" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle.tar.gz"; + sha = "04085lkh4i5diszpr1w5xnhnngp8ba1ckalcjj5s8hm8lk6wd4nc"; + }; + "circle_alt" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_alt.tar.gz"; + sha = "0awbjrd31fv2cb0q7n58h5iji29di8n550bmpz5qdg6xn55baqqx"; + }; + "circle_flow" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_flow.tar.gz"; + sha = "0ffxgjmx5la55dn3nyqgxi8fyd1ci4wckmvfaa6s1kyd7xsk8785"; + }; + "circle_hud" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_hud.tar.gz"; + sha = "0sd28d0ac7wvkwmbrnvg42bccz6y4iyl2wp1pg7awwjxvag0azlf"; + }; + "circuit" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circuit.tar.gz"; + sha = "1jzlr6c47n3zs0f1cafgjy92sks5060d1gs0774kxc0c96bysypg"; + }; + "colorful" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful.tar.gz"; + sha = "18lbyffvhdav5cjh0xnidf09amryf5dcj5rizl9z7ghxpz2z57pr"; + }; + "colorful_loop" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_loop.tar.gz"; + sha = "0qcn19gxl9w2q0w7lihi8wnlwlh8h3k0ddbp3ww9wcw1q0wsy1vi"; + }; + "colorful_sliced" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_sliced.tar.gz"; + sha = "0d9lafg76w2y77ywj1f1p5n1ci2q9jnfqfd16akf6f28h0iz1f9r"; + }; + "connect" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/connect.tar.gz"; + sha = "1a0z59l391xv795d8mhcwa816wlmzyl75pwiizvvra2a0i8g6wz0"; + }; + "cross_hud" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cross_hud.tar.gz"; + sha = "188wj6hkvryawmw4r3bwcsvqxx52h10jb4ddq3jx7sh2rz1kpvwa"; + }; + "cubes" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cubes.tar.gz"; + sha = "0bydagjwfkvbhgr7sv903a7pjkrmrdz6vh22i4qjx5rhzw2wvvsk"; + }; + "cuts" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts.tar.gz"; + sha = "0znz82zzgyqkfprvzhkzv974amcnxqdg38ajsm4d7wlagc52zs0d"; + }; + "cuts_alt" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts_alt.tar.gz"; + sha = "1bgs4v5kkh96m1xh29wjmdxinfsxh4g7lg9fk1nqj87igdg7wwss"; + }; + "cyanide" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cyanide.tar.gz"; + sha = "04aklg9il310iv7zjpan6z4ha7gvh1b0yzgwi91679vm38cg0593"; + }; + "cybernetic" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cybernetic.tar.gz"; + sha = "0ad75fcra24bjzs4pqn89l19wb4rcjph63j71lv60m0rz75vgjfb"; + }; + "dark_planet" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dark_planet.tar.gz"; + sha = "03i2knrfi56f8lbc8hs8rqa4jg432nsmjn74wibb04ppmvm8f47j"; + }; + "darth_vader" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/darth_vader.tar.gz"; + sha = "0mlxy17l1hjf3nq390wc26n4x3c45n5hmks75zkzjz3l5ac1fah6"; + }; + "deus_ex" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/deus_ex.tar.gz"; + sha = "1mllj0xj9g1nn01vcq0xsfcwd0qnmk1s3vj5d03f9qp513k8qzdl"; + }; + "dna" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dna.tar.gz"; + sha = "0xcf4vxd99w3d44bhrdk1yqsfcakix6cd7hdpjsgccgs1jd02hi1"; + }; + "double" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/double.tar.gz"; + sha = "07gxkzqrp0cfisdkq0wqfiai37m2yr2fhcpdpazmzkkxnm4qf25y"; + }; + "dragon" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dragon.tar.gz"; + sha = "0ypr1vyl6zilfzncymlh2s1ivxr7n88kfaygmz2y83l332asjs66"; + }; + "flame" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/flame.tar.gz"; + sha = "0kvly5rgp47a4lby3blb1dird9xwy9y9c8a0wg17qfvz3zr69r0g"; + }; + "glitch" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glitch.tar.gz"; + sha = "0s0kmrw01wj9i7qd7zbwvmfbbh7r3jfkc4522jv44m4rl6r4h84c"; + }; + "glowing" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glowing.tar.gz"; + sha = "19nkbk2cw6j763idz5z7l71lx529xcgyx1dcd9qd356x9ifdw206"; + }; + "green_blocks" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_blocks.tar.gz"; + sha = "0x8pgsyfbchy7z6d4rijsk2nml6fl1xwba0f0h3lw9i6359k7j3j"; + }; + "green_loader" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_loader.tar.gz"; + sha = "00rdpy1gbc4ikxx487w3k27z622z2rjcsi0d18i23s5p3xqd1l3a"; + }; + "hexagon" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon.tar.gz"; + sha = "0yk47hs5qfv09q5df4x6j82ivrxfxh1bxsw8p8x7hcmlb08dh6g6"; + }; + "hexagon_2" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_2.tar.gz"; + sha = "175im23q769s2if3xi8j669r0b5y0dagz8rsbvq7kghznzw4abc2"; + }; + "hexagon_alt" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_alt.tar.gz"; + sha = "1ayhw1gzrb98hf7f77b6ka5wi19ymp3mljhhgm5lx8w8pwawsxnb"; + }; + "hexagon_dots" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots.tar.gz"; + sha = "0pdw9ih9fsxvv394yc5vfj7nlq7mca9w05y0s631gnsdzgqxsyd6"; + }; + "hexagon_dots_alt" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots_alt.tar.gz"; + sha = "0aff3bgpva41b4jk4mp0fxdvli286x4pk3q9ysvps7z7srw4fvvn"; + }; + "hexagon_hud" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_hud.tar.gz"; + sha = "0wpmsffdp59dy2g5ggprgr7l50rf131c7v8pbgpir230lpn10xzi"; + }; + "hexagon_red" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_red.tar.gz"; + sha = "0fgmma5j6fnjykpwplji4rm57d07l9shfpay079gz1nhbhnq3rkl"; + }; + "hexa_retro" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hexa_retro.tar.gz"; + sha = "1cbyhqhv2ysx9w8cpbfidrm0w70wssp4fld0q1g01fgcbg93b7mf"; + }; + "hud" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud.tar.gz"; + sha = "0s01p1n75ckwa69iy5v2z2cg85ipzgx356n4yvdyi1jh9pnl22k9"; + }; + "hud_2" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_2.tar.gz"; + sha = "1bvkl5f0fwi7xzy23pj3p7c98fbz2zk8abz7frxr0pp0xj3ql87i"; + }; + "hud_3" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_3.tar.gz"; + sha = "1n5qqkp0qb4mlpp7g20hpvazgwxw4gjb2p0ys0q2bglb3amzc2xr"; + }; + "hud_space" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_space.tar.gz"; + sha = "0dhajnica048smn5wpwc13ij0n9g6c10a0qxgi4rwiczr7p9vajj"; + }; + "ibm" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ibm.tar.gz"; + sha = "0xri6x716ma3y7d59yn9vm7skw5y53kn6s2ivfrvlfsac9n1zj4m"; + }; + "infinite_seal" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/infinite_seal.tar.gz"; + sha = "0r9plydfdc35s2is1zi3pbx3s0bs5hqkim3laiav8fv3rzq0f3lq"; + }; + "ironman" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ironman.tar.gz"; + sha = "0af6qfdqj0n5qgsxg6nnrs2k8xas6cd18jw96mrwfcckpfz091cm"; + }; + "liquid" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/liquid.tar.gz"; + sha = "0ghavh6nj68kwcgvrnwbabkzn44zq0m2ic1b2cl278d2vffzqv87"; + }; + "loader" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader.tar.gz"; + sha = "1zlba3mra45ii0gahlw8v1vq1j7nbfjq62pcjn43vb40zcc1j873"; + }; + "loader_2" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_2.tar.gz"; + sha = "1yw4n9bw483pl7m3ks2ajgfldslgyc4gb1kw61fszfp5x4l3k4rg"; + }; + "loader_alt" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_alt.tar.gz"; + sha = "1pi97pfhg13wq5s8hai4fd31s6bcfq09r969fl216yxksj8h69wj"; + }; + "lone" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/lone.tar.gz"; + sha = "0413mxr8lqlznbps5c4qgbhm0zpz8dlkbdj67r9gvzi9v020qjgl"; + }; + "metal_ball" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/metal_ball.tar.gz"; + sha = "129q23q992fxfi976px5r68sf8wqbac3zby4yjh97s48zm83rzb5"; + }; + "motion" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/motion.tar.gz"; + sha = "0g84ac8ps69ihic2z7gr4nlwib9ra86il2fdl7rl7w5nc8xzhx1y"; + }; + "optimus" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/optimus.tar.gz"; + sha = "1l4bmbiqqypwqvyhcd561nnxhrq5zif8pmkyk2hdwscbq6rlbc7r"; + }; + "owl" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/owl.tar.gz"; + sha = "03gqqcvp4320qy1d3az1k2a8rj97alk8qzgkz6xg4akz9ccd731y"; + }; + "pie" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pie.tar.gz"; + sha = "1j479l428gq1b2g0g2ybkf81jzad69n59kphm0ns5gfv6khx10ga"; + }; + "pixels" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pixels.tar.gz"; + sha = "13rfdd9v7h0k2wbwr428h2w8dv5vhhbw03wvirlmafsbhmgjz5xs"; + }; + "polaroid" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/polaroid.tar.gz"; + sha = "096iz34hpmicixrdrqaxmx8m83vggm90xqz4zyy5vkpcy3vl60mf"; + }; + "red_loader" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/red_loader.tar.gz"; + sha = "0n2jmfy558rma6knraskb7rgccvnayxh7csl0jaarx2xl9zxzzay"; + }; + "rings" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings.tar.gz"; + sha = "1g9p2cdn1w7dmy2z017xdkv6rm50gdb5qqd8a0y0662fzph5adg0"; + }; + "rings_2" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings_2.tar.gz"; + sha = "07v4mq1lpw9vfzg0rfxmkyfhyhz3nv5zab5kf10bjjgpjq8c9fi3"; + }; + "rog" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog.tar.gz"; + sha = "13lcrsdk1v1xn7fxn54xbk1jkh55kmsf813q1v7x8a2l8p9pl0hp"; + }; + "rog_2" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog_2.tar.gz"; + sha = "0cgc1y1jrb689h9wd7jf3wvf9r996k4ik965v4wclmp9wra5gflk"; + }; + "seal" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal.tar.gz"; + sha = "0ip23x69ljdj1bwxlhvz3fbg3ia47m2aw6d122v2rqhwqasmy40n"; + }; + "seal_2" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_2.tar.gz"; + sha = "1fc91n6ys2fl8xbzdj0ywck87xnyn1gp4jvjk307w49jmkpdzs15"; + }; + "seal_3" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_3.tar.gz"; + sha = "1l2jlxhhaf5whbvbdf31ypcasalx4fsd4yn90xybmjq7b27bz5b2"; + }; + "sliced" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sliced.tar.gz"; + sha = "0363lwq3rwdcz3fg47f6kch150vxspvpjdqzg87aahli30kkjfdi"; + }; + "sphere" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sphere.tar.gz"; + sha = "1zjlwign7f2zd70qkg25adbbmq8ndm9b44gc4pa0ls64i6yfd6fz"; + }; + "spin" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spin.tar.gz"; + sha = "0hwjc4i69zmzw7cpmsrhmx00w5k5y46m317m1imw2ycmhm0jicm5"; + }; + "spinner_alt" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spinner_alt.tar.gz"; + sha = "1ifs9xxd1cxvgjcnqjfw2zxkcapssv10hvchjrlf9nl60ayyp4m4"; + }; + "splash" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/splash.tar.gz"; + sha = "12l8hwzmi68mjqgl384wf1fscvnzwp4a3vmlsb2zcbfwhrs5q717"; + }; + "square" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square.tar.gz"; + sha = "1mpyrivchsj2gr8flwj0g45vb792fvjjb5jmkn9xz1glrxxs7zww"; + }; + "square_hud" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square_hud.tar.gz"; + sha = "1lvv00r5rg8yjwibfqncka1s0p59fnpklhz3v6ifbs7ynlyp0kag"; + }; + "target" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target.tar.gz"; + sha = "1ipsd3rjclmwzg2l4bxpj0mgfl5bwxs1ihf498660zhm0bqqpgpr"; + }; + "target_2" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target_2.tar.gz"; + sha = "16lipy5c0pyyb1idwj1zchfr8g0cy6qr46c87b8g1kv2g96n5cn6"; + }; + "tech_a" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_a.tar.gz"; + sha = "0fn8aib05kmjxnp7j2bmgrs3avaj6bn06kxz55bw8fdg8ihxnxg0"; + }; + "tech_b" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_b.tar.gz"; + sha = "03i8jcvql76mhcq0dqaj2wygfza72fc7c22vfcyp38cx1lm6ilbv"; + }; + "unrap" = { + url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/unrap.tar.gz"; + sha = "08gqwb11539kz5178ga6f96jv82xmyyzv44q6d05ajcw3pxk5j4c"; + }; +} diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/update.sh b/pkgs/data/themes/adi1090x-plymouth-themes/update.sh new file mode 100755 index 000000000000..82eb9916553a --- /dev/null +++ b/pkgs/data/themes/adi1090x-plymouth-themes/update.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash --keep GITHUB_TOKEN -p nix-prefetch jq + +set -eo pipefail + +curl_args=( '--silent' ) + +# optionally takes a GITHUB_TOKEN to overcome api rate limiting. +if [ -n "$GITHUB_TOKEN" ]; then curl_args+=( --header "authorization: Bearer ${GITHUB_TOKEN}" ); fi + +# get last master ref +curl_args+=( --url https://api.github.com/repos/adi1090x/files/commits/master ) +last_ref=$(curl "${curl_args[@]}" | jq -r '.sha' ) + +unset curl_args[-1] +curl_args+=( https://api.github.com/repos/adi1090x/files/git/trees/$last_ref\?recursive=1 ) + +theme_archives=$(curl "${curl_args[@]}" \ + | jq '.tree | map(select(.path| test("^plymouth-themes/themes/pack_.*tar.gz$"))| .path)') + +dirname="$(dirname "$0")" + +printf '{\n' > "$dirname/shas.nix" + +repo_url="https://github.com/adi1090x/files/raw/$last_ref" + +while + read -r file_path +do + name=$(basename $file_path) + printf ' "%s" = {\n url = "%s";\n sha = "%s";\n };\n' "${name%%.*}" "$repo_url/$file_path" "$(nix-prefetch-url "$repo_url/$file_path")" >>"$dirname/shas.nix" +done < <(jq -r '.[]' <<<"$theme_archives") + +printf '}\n' >> "$dirname/shas.nix" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2c26c8dddda..f174bc55f8f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26827,6 +26827,8 @@ with pkgs; adementary-theme = callPackage ../data/themes/adementary { }; + adi1090x-plymouth-themes = callPackage ../data/themes/adi1090x-plymouth-themes { }; + adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { }; adwaita-qt6 = qt6Packages.callPackage ../data/themes/adwaita-qt { From 03ceb367b77c88d99d31af840b15b06b1ee44428 Mon Sep 17 00:00:00 2001 From: "Emil \"AngryAnt\" Johansen" Date: Mon, 27 Mar 2023 15:46:32 +0200 Subject: [PATCH 003/203] lib.toPlist: support for path values --- lib/generators.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/generators.nix b/lib/generators.nix index 4357a0353398..72c66a0bc728 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -355,6 +355,7 @@ rec { # PLIST handling toPlist = {}: v: let isFloat = builtins.isFloat or (x: false); + isPath = x: builtins.typeOf x == "path"; expr = ind: x: with builtins; if x == null then "" else if isBool x then bool ind x else @@ -362,6 +363,7 @@ rec { if isString x then str ind x else if isList x then list ind x else if isAttrs x then attrs ind x else + if isPath x then str ind (toString x) else if isFloat x then float ind x else abort "generators.toPlist: should never happen (v = ${v})"; From 63a8c43d0954cf290aa18ae92738a76f8758d463 Mon Sep 17 00:00:00 2001 From: "Emil \"AngryAnt\" Johansen" Date: Mon, 27 Mar 2023 16:27:07 +0200 Subject: [PATCH 004/203] lib.toPlist: basic test coverage --- lib/tests/misc.nix | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index baa382f3e589..d7173bbf3a3d 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -914,6 +914,75 @@ runTests { expected = "«foo»"; }; + testToPlist = + let + deriv = derivation { name = "test"; builder = "/bin/sh"; system = "aarch64-linux"; }; + in { + expr = mapAttrs (const (generators.toPlist { })) { + value = { + nested.values = rec { + int = 42; + float = 0.1337; + bool = true; + emptystring = ""; + string = "fn\${o}\"r\\d"; + newlinestring = "\n"; + path = /. + "/foo"; + null_ = null; + list = [ 3 4 "test" ]; + emptylist = []; + attrs = { foo = null; "foo b/ar" = "baz"; }; + emptyattrs = {}; + }; + }; + }; + expected = { value = '' + + + + nested + + values + + attrs + + foo b/ar + baz + + bool + + emptyattrs + + + + emptylist + + + + emptystring + + float + 0.133700 + int + 42 + list + + 3 + 4 + test + + newlinestring + + + path + /foo + string + fn''${o}"r\d + + + +''; }; + }; # CLI From e932e98437ea9184365233bad439860c795f65a1 Mon Sep 17 00:00:00 2001 From: "Emil \"AngryAnt\" Johansen" Date: Mon, 27 Mar 2023 17:06:12 +0200 Subject: [PATCH 005/203] lib.toPlist: keep test output in external files for their tab indents --- .editorconfig | 4 +++ lib/tests/misc.nix | 47 +------------------------- lib/tests/test-to-plist-expected.plist | 46 +++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 46 deletions(-) create mode 100644 lib/tests/test-to-plist-expected.plist diff --git a/.editorconfig b/.editorconfig index c9711d519408..ebb66b07945c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -101,3 +101,7 @@ end_of_line = unset insert_final_newline = unset trim_trailing_whitespace = unset charset = unset + +[lib/tests/*.plist] +indent_style = tab +insert_final_newline = unset diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index d7173bbf3a3d..2cb8596703fc 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -936,52 +936,7 @@ runTests { }; }; }; - expected = { value = '' - - - - nested - - values - - attrs - - foo b/ar - baz - - bool - - emptyattrs - - - - emptylist - - - - emptystring - - float - 0.133700 - int - 42 - list - - 3 - 4 - test - - newlinestring - - - path - /foo - string - fn''${o}"r\d - - - -''; }; + expected = { value = builtins.readFile ./test-to-plist-expected.plist; }; }; # CLI diff --git a/lib/tests/test-to-plist-expected.plist b/lib/tests/test-to-plist-expected.plist new file mode 100644 index 000000000000..df0528a60767 --- /dev/null +++ b/lib/tests/test-to-plist-expected.plist @@ -0,0 +1,46 @@ + + + + + nested + + values + + attrs + + foo b/ar + baz + + bool + + emptyattrs + + + + emptylist + + + + emptystring + + float + 0.133700 + int + 42 + list + + 3 + 4 + test + + newlinestring + + + path + /foo + string + fn${o}"r\d + + + + \ No newline at end of file From 80b00d8db6f5b9854d82456be26b14d886c4dfa7 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 2 Apr 2023 14:55:22 +0300 Subject: [PATCH 006/203] team-list: add cuda team --- maintainers/team-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 55d6fa72ec9c..366fe8285f10 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -149,6 +149,15 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + cuda = { + members = [ + SomeoneSerge + ]; + scope = "Maintain CUDA-enabled packages"; + shortName = "Cuda"; + githubTeams = [ "cuda-maintainers" ]; + }; + darwin = { members = [ toonn From c690aac0c68c75288af21f339c3c6762bbad7324 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sun, 2 Apr 2023 15:07:04 +0300 Subject: [PATCH 007/203] cudaPackages: add teams.cuda to maintainers --- pkgs/development/compilers/cudatoolkit/common.nix | 1 + .../compilers/cudatoolkit/redist/build-cuda-redist-package.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 8082756b1edb..d3f1a5b77699 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -311,6 +311,7 @@ backendStdenv.mkDerivation rec { homepage = "https://developer.nvidia.com/cuda-toolkit"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; + maintainers = teams.cuda.members; }; } diff --git a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix index 1b216ee625a8..b9a027456cde 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/build-cuda-redist-package.nix @@ -53,6 +53,7 @@ backendStdenv.mkDerivation { meta = { description = attrs.name; license = lib.licenses.unfree; + maintainers = lib.teams.cuda.members; platforms = lib.optionals (lib.hasAttr arch attrs) [ "x86_64-linux" ]; }; } From 59e41fe872bc2b0037021cd82f2cc9c28bad74d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Mon, 17 Apr 2023 21:17:45 +0200 Subject: [PATCH 008/203] maintainers: add laurent-f1z1 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 712d6d2d2bf8..2f749c49a628 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8569,6 +8569,12 @@ githubId = 621759; name = "Lassulus"; }; + laurent-f1z1 = { + email = "laurent.nixpkgs@fainsin.bzh"; + github = "Laurent2916"; + githubId = 21087104; + name = "Laurent Fainsin"; + }; layus = { email = "layus.on@gmail.com"; github = "layus"; From 587f267c7d99c1ea9049ad04339f9ec3aa2f7ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Tue, 18 Apr 2023 21:38:16 +0200 Subject: [PATCH 009/203] codeberg-pages: init at v4.6.2 --- .../codeberg-pages/default.nix | 30 ++++++++++ .../codeberg-pages/disable_httptest.patch | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 87 insertions(+) create mode 100644 pkgs/development/tools/continuous-integration/codeberg-pages/default.nix create mode 100644 pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch diff --git a/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix b/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix new file mode 100644 index 000000000000..b3d03435715c --- /dev/null +++ b/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitea, buildGoModule }: + +buildGoModule rec { + pname = "codeberg-pages"; + version = "4.6.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "Codeberg"; + repo = "pages-server"; + rev = "ce241fa40adee2b12f8e225db98e09a45bc2acbb"; + sha256 = "sha256-mL2Xs7eyldoZK4zrX6WFlFtwdLN0iVyl1Qh8X6b2u9c="; + }; + + vendorSha256 = "sha256-R/LuZkA2xHmu7SO3BVyK1C6n9U+pYn50kNkyLltn2ng="; + + patches = [ ./disable_httptest.patch ]; + + ldflags = [ "-s" "-w" ]; + + tags = [ "sqlite" "sqlite_unlock_notify" "netgo" ]; + + meta = with lib; { + mainProgram = "codeberg-pages"; + maintainers = with maintainers; [ laurent-f1z1 ]; + license = licenses.eupl12; + homepage = "https://codeberg.org/Codeberg/pages-server"; + description = "Static websites hosting from Gitea repositories"; + }; +} diff --git a/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch b/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch new file mode 100644 index 000000000000..2095b603badc --- /dev/null +++ b/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch @@ -0,0 +1,55 @@ +diff --git a/server/handler/handler_test.go b/server/handler/handler_test.go +deleted file mode 100644 +index 626564a..0000000 +--- a/server/handler/handler_test.go ++++ /dev/null +@@ -1,49 +0,0 @@ +-package handler +- +-import ( +- "net/http/httptest" +- "testing" +- "time" +- +- "codeberg.org/codeberg/pages/server/cache" +- "codeberg.org/codeberg/pages/server/gitea" +- "github.com/rs/zerolog/log" +-) +- +-func TestHandlerPerformance(t *testing.T) { +- giteaClient, _ := gitea.NewClient("https://codeberg.org", "", cache.NewKeyValueCache(), false, false) +- testHandler := Handler( +- "codeberg.page", "raw.codeberg.org", +- giteaClient, +- "https://docs.codeberg.org/pages/raw-content/", +- []string{"/.well-known/acme-challenge/"}, +- []string{"raw.codeberg.org", "fonts.codeberg.org", "design.codeberg.org"}, +- cache.NewKeyValueCache(), +- cache.NewKeyValueCache(), +- ) +- +- testCase := func(uri string, status int) { +- t.Run(uri, func(t *testing.T) { +- req := httptest.NewRequest("GET", uri, nil) +- w := httptest.NewRecorder() +- +- log.Printf("Start: %v\n", time.Now()) +- start := time.Now() +- testHandler(w, req) +- end := time.Now() +- log.Printf("Done: %v\n", time.Now()) +- +- resp := w.Result() +- +- if resp.StatusCode != status { +- t.Errorf("request failed with status code %d", resp.StatusCode) +- } else { +- t.Logf("request took %d milliseconds", end.Sub(start).Milliseconds()) +- } +- }) +- } +- +- testCase("https://mondstern.codeberg.page/", 404) // TODO: expect 200 +- testCase("https://codeberg.page/", 404) // TODO: expect 200 +- testCase("https://example.momar.xyz/", 424) +-} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a33c283133cc..022958490846 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6449,6 +6449,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + codeberg-pages = callPackage ../development/tools/continuous-integration/codeberg-pages { }; + codebraid = callPackage ../tools/misc/codebraid { }; codevis = callPackage ../tools/misc/codevis { }; From 4200374b140c2daed07c3766d1049c931bdcdc06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 20 Apr 2023 18:00:17 +0000 Subject: [PATCH 010/203] xf86_input_wacom: 1.1.0 -> 1.2.0 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 0d4126426c94..7b7687bc3063 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xf86-input-wacom"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "linuxwacom"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-AYjO7B0Z6G1JqpLdvm9LS+ujz7iUp8UwZ9X1WQ/dGk0="; + sha256 = "sha256-PuIfeHlkcoin7w2v822P8uhWBNhYQGuOA7yD62L3qto="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 46f2664b6f89b0e2527e7eee38cea72b24092ea8 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Fri, 31 Mar 2023 17:42:08 +0300 Subject: [PATCH 011/203] faiss: 1.7.2 -> 1.7.4 --- pkgs/development/libraries/science/math/faiss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/faiss/default.nix b/pkgs/development/libraries/science/math/faiss/default.nix index 9d0265a9ce88..2e14b0e0d3a6 100644 --- a/pkgs/development/libraries/science/math/faiss/default.nix +++ b/pkgs/development/libraries/science/math/faiss/default.nix @@ -31,7 +31,7 @@ assert cudaSupport -> nvidia-thrust.cudaSupport; let pname = "faiss"; - version = "1.7.2"; + version = "1.7.4"; inherit (cudaPackages) cudaFlags backendStdenv; inherit (cudaFlags) cudaCapabilities dropDot; @@ -64,7 +64,7 @@ stdenv.mkDerivation { owner = "facebookresearch"; repo = pname; rev = "v${version}"; - hash = "sha256-Tklf5AaqJbOs9qtBZVcxXPLAp+K54EViZLSOvEhmswg="; + hash = "sha256-WSce9X6sLZmGM5F0ZkK54VqpIy8u1VB0e9/l78co29M="; }; buildInputs = [ From df49d775de7b2aa81c98d741506c862f3fbc13a8 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sat, 1 Apr 2023 00:17:07 +0200 Subject: [PATCH 012/203] qt5.qtdatavis3d: init module --- pkgs/development/libraries/qt-5/5.15/default.nix | 3 ++- pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 46a60f5403f4..d39929e481dd 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -143,6 +143,7 @@ let qt3d = callPackage ../modules/qt3d.nix {}; qtcharts = callPackage ../modules/qtcharts.nix {}; qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; + qtdatavis3d = callPackage ../modules/qtdatavis3d.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; qtgamepad = callPackage ../modules/qtgamepad.nix { @@ -206,7 +207,7 @@ let qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtwebview qtx11extras qtxmlpatterns qtlottie + qtwebview qtx11extras qtxmlpatterns qtlottie qtdatavis3d ] ++ lib.optional (!stdenv.isDarwin) qtwayland ++ lib.optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix b/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix new file mode 100644 index 000000000000..80a98f24be14 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtdatavis3d.nix @@ -0,0 +1,9 @@ +{ lib, stdenv, qtModule, qtbase, qtdeclarative }: + +qtModule { + pname = "qtdatavis3d"; + qtInputs = [ qtbase qtdeclarative ]; + outputs = [ "out" "dev" "bin" ]; + # error: use of undeclared identifier 'stat64' + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) "-Dstat64=stat"; +} From be4e7ef905eeae7e927a2b4a9c4167c3b472608f Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Tue, 25 Apr 2023 00:58:04 +0200 Subject: [PATCH 013/203] nixos/qemu-vm: fix diskless VMs Previously, it was possible to run with a tmpfs / with `virtualisation.diskImage = null;`, this was likely broken by my changes in 4b4e4c3ef930c6106918d27a933de1b6965eff2c. It is reintroduced by disabling properly the bootloader for now, as it is complicated to make it work with. --- nixos/modules/virtualisation/qemu-vm.nix | 27 +++++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index cbc58344791d..d413570fadc2 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -264,7 +264,7 @@ let suggestedRootDevice = { "efi_bootloading_with_default_fs" = "${cfg.bootLoaderDevice}2"; "legacy_bootloading_with_default_fs" = "${cfg.bootLoaderDevice}1"; - "direct_boot_with_default_fs" = cfg.bootLoaderDevice; + "direct_boot_with_default_fs" = lookupDriveDeviceName "root" cfg.qemu.drives; # This will enforce a NixOS module type checking error # to ask explicitly the user to set a rootDevice. # As it will look like `rootDevice = lib.mkDefault null;` after @@ -336,14 +336,14 @@ in virtualisation.bootLoaderDevice = mkOption { - type = types.path; - default = lookupDriveDeviceName "root" cfg.qemu.drives; - defaultText = literalExpression ''lookupDriveDeviceName "root" cfg.qemu.drives''; + type = types.nullOr types.path; + default = if cfg.useBootLoader then lookupDriveDeviceName "root" cfg.qemu.drives else null; + defaultText = literalExpression ''if cfg.useBootLoader then lookupDriveDeviceName "root" cfg.qemu.drives else null;''; example = "/dev/vda"; description = lib.mdDoc '' The disk to be used for the boot filesystem. - By default, it is the same disk as the root filesystem. + By default, it is the same disk as the root filesystem if you use a bootloader, otherwise it's null. ''; }; @@ -836,6 +836,16 @@ in Invalid virtualisation.forwardPorts..guest.address: The address must be in the default VLAN (10.0.2.0/24). ''; + } + { assertion = cfg.useBootLoader -> cfg.diskImage != null; + message = + '' + Currently, bootloaders cannot be used with a tmpfs disk image. + It would require some rework in the boot configuration mechanism + to detect the proper boot partition in UEFI scenarios for example. + + If you are interested into this feature, please open an issue or open a pull request. + ''; } ])); @@ -863,7 +873,8 @@ in # legacy and UEFI. In order to avoid this, we have to put "nodev" to force UEFI-only installs. # Otherwise, we set the proper bootloader device for this. # FIXME: make a sense of this mess wrt to multiple ESP present in the system, probably use boot.efiSysMountpoint? - boot.loader.grub.device = mkVMOverride (if cfg.useEFIBoot then "nodev" else cfg.bootLoaderDevice); + boot.loader.grub.enable = cfg.useBootLoader; + boot.loader.grub.device = mkIf cfg.useBootLoader (mkVMOverride (if cfg.useEFIBoot then "nodev" else cfg.bootLoaderDevice)); boot.loader.grub.gfxmodeBios = with cfg.resolution; "${toString x}x${toString y}"; virtualisation.rootDevice = mkDefault suggestedRootDevice; @@ -871,13 +882,13 @@ in boot.loader.supportsInitrdSecrets = mkIf (!cfg.useBootLoader) (mkVMOverride false); - boot.initrd.extraUtilsCommands = lib.mkIf (cfg.useDefaultFilesystems && !config.boot.initrd.systemd.enable) + boot.initrd.extraUtilsCommands = lib.mkIf (cfg.useDefaultFilesystems && !config.boot.initrd.systemd.enable && cfg.diskImage != null) '' # We need mke2fs in the initrd. copy_bin_and_libs ${pkgs.e2fsprogs}/bin/mke2fs ''; - boot.initrd.postDeviceCommands = lib.mkIf (cfg.useDefaultFilesystems && !config.boot.initrd.systemd.enable) + boot.initrd.postDeviceCommands = lib.mkIf (cfg.useDefaultFilesystems && !config.boot.initrd.systemd.enable && cfg.diskImage != null) '' # If the disk image appears to be empty, run mke2fs to # initialise. From d6e84a4574a200de63e8fe86ef8574b507fd366e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 25 Apr 2023 08:48:47 +0000 Subject: [PATCH 014/203] nixosTest: remove hostname limitations --- .../writing-nixos-tests.section.md | 5 +++ nixos/lib/test-driver/test_driver/driver.py | 7 ++++- nixos/lib/testing/driver.nix | 31 +++++++------------ 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index 3de46fda3df6..486a4b64a262 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -130,6 +130,11 @@ starting them in parallel: start_all() ``` +If the hostname of a node contains characters that can't be used in a +Python variable name, those characters will be replaced with +underscores in the variable name, so `nodes.machine-a` will be exposed +to Python as `machine_a`. + ## Machine objects {#ssec-machine-objects} The following methods are available on machine objects: diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index ad52f365737c..ea6ba4b65b56 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -2,6 +2,7 @@ from contextlib import contextmanager from pathlib import Path from typing import Any, Dict, Iterator, List, Union, Optional, Callable, ContextManager import os +import re import tempfile from test_driver.logger import rootlog @@ -28,6 +29,10 @@ def get_tmp_dir() -> Path: return tmp_dir +def pythonize_name(name: str) -> str: + return re.sub(r"^[^A-z_]|[^A-z0-9_]", "_", name) + + class Driver: """A handle to the driver that sets up the environment and runs the tests""" @@ -113,7 +118,7 @@ class Driver: polling_condition=self.polling_condition, Machine=Machine, # for typing ) - machine_symbols = {m.name: m for m in self.machines} + machine_symbols = {pythonize_name(m.name): m for m in self.machines} # If there's exactly one machine, make it available under the name # "machine", even if it's not called that. if len(self.machines) == 1: diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix index fb181c1d7e9a..25759a91dda3 100644 --- a/nixos/lib/testing/driver.nix +++ b/nixos/lib/testing/driver.nix @@ -21,29 +21,20 @@ let in nodesList ++ lib.optional (lib.length nodesList == 1 && !lib.elem "machine" nodesList) "machine"; - # TODO: This is an implementation error and needs fixing - # the testing famework cannot legitimately restrict hostnames further - # beyond RFC1035 - invalidNodeNames = lib.filter - (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) - nodeHostNames; + pythonizeName = name: + let + head = lib.substring 0 1 name; + tail = lib.substring 1 (-1) name; + in + (if builtins.match "[A-z_]" head == null then "_" else head) + + lib.stringAsChars (c: if builtins.match "[A-z0-9_]" c == null then "_" else c) tail; uniqueVlans = lib.unique (builtins.concatLists vlans); vlanNames = map (i: "vlan${toString i}: VLan;") uniqueVlans; - machineNames = map (name: "${name}: Machine;") nodeHostNames; + pythonizedNames = map pythonizeName nodeHostNames; + machineNames = map (name: "${name}: Machine;") pythonizedNames; - withChecks = - if lib.length invalidNodeNames > 0 then - throw '' - Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! - All machines are referenced as python variables in the testing framework which will break the - script when special characters are used. - - This is an IMPLEMENTATION ERROR and needs to be fixed. Meanwhile, - please stick to alphanumeric chars and underscores as separation. - '' - else - lib.warnIf config.skipLint "Linting is disabled"; + withChecks = lib.warnIf config.skipLint "Linting is disabled"; driver = hostPkgs.runCommand "nixos-test-driver-${config.name}" @@ -87,7 +78,7 @@ let ${testDriver}/bin/generate-driver-symbols ${lib.optionalString (!config.skipLint) '' PYFLAKES_BUILTINS="$( - echo -n ${lib.escapeShellArg (lib.concatStringsSep "," nodeHostNames)}, + echo -n ${lib.escapeShellArg (lib.concatStringsSep "," pythonizedNames)}, < ${lib.escapeShellArg "driver-symbols"} )" ${hostPkgs.python3Packages.pyflakes}/bin/pyflakes $out/test-script ''} From 3ec3d283c5c21567b2c1242fc6d3516d4ebb6e5b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 25 Apr 2023 11:59:14 +0200 Subject: [PATCH 015/203] nixos/tests: extra-python-packages -> nixos-test-driver/extra-python-packages Categorizing the tests for the test driver helps with testing the test driver. --- .../development/developing-the-test-driver.chapter.md | 2 ++ nixos/tests/all-tests.nix | 9 ++++++++- .../{ => nixos-test-driver}/extra-python-packages.nix | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) rename nixos/tests/{ => nixos-test-driver}/extra-python-packages.nix (84%) diff --git a/nixos/doc/manual/development/developing-the-test-driver.chapter.md b/nixos/doc/manual/development/developing-the-test-driver.chapter.md index 4b70fe00af47..d64574fa62aa 100644 --- a/nixos/doc/manual/development/developing-the-test-driver.chapter.md +++ b/nixos/doc/manual/development/developing-the-test-driver.chapter.md @@ -25,6 +25,8 @@ These include `pkgs.nixosTest`, `testing-python.nix` and `make-test-python.nix`. ## Testing changes to the test framework {#sec-test-the-test-framework} +We currently have limited unit tests for the framework itself. You may run these with `nix-build -A nixosTests.nixos-test-driver`. + When making significant changes to the test framework, we run the tests on Hydra, to avoid disrupting the larger NixOS project. For this, we use the `python-test-refactoring` branch in the `NixOS/nixpkgs` repository, and its [corresponding Hydra jobset](https://hydra.nixos.org/jobset/nixos/python-test-refactoring). diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 715fe7e51e0f..9257fc607fc9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -66,6 +66,14 @@ let ; in { + + # Testing the test driver + nixos-test-driver = { + extra-python-packages = handleTest ./nixos-test-driver/extra-python-packages.nix {}; + }; + + # NixOS vm tests and non-vm unit tests + _3proxy = runTest ./3proxy.nix; aaaaxy = runTest ./aaaaxy.nix; acme = runTest ./acme.nix; @@ -218,7 +226,6 @@ in { etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; etebase-server = handleTest ./etebase-server.nix {}; etesync-dav = handleTest ./etesync-dav.nix {}; - extra-python-packages = handleTest ./extra-python-packages.nix {}; evcc = handleTest ./evcc.nix {}; fancontrol = handleTest ./fancontrol.nix {}; fcitx5 = handleTest ./fcitx5 {}; diff --git a/nixos/tests/extra-python-packages.nix b/nixos/tests/nixos-test-driver/extra-python-packages.nix similarity index 84% rename from nixos/tests/extra-python-packages.nix rename to nixos/tests/nixos-test-driver/extra-python-packages.nix index 7a48077cf98b..1146bedd996f 100644 --- a/nixos/tests/extra-python-packages.nix +++ b/nixos/tests/nixos-test-driver/extra-python-packages.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ ... }: +import ../make-test-python.nix ({ ... }: { name = "extra-python-packages"; From e207f4a116a64ee5468cd04d4311d5dc0b1e618e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 25 Apr 2023 12:21:38 +0200 Subject: [PATCH 016/203] nixosTests.nixos-test-driver.node-name: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/nixos-test-driver/node-name.nix | 33 +++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 nixos/tests/nixos-test-driver/node-name.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9257fc607fc9..2f0a6a8f6927 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -70,6 +70,7 @@ in { # Testing the test driver nixos-test-driver = { extra-python-packages = handleTest ./nixos-test-driver/extra-python-packages.nix {}; + node-name = runTest ./nixos-test-driver/node-name.nix; }; # NixOS vm tests and non-vm unit tests diff --git a/nixos/tests/nixos-test-driver/node-name.nix b/nixos/tests/nixos-test-driver/node-name.nix new file mode 100644 index 000000000000..31386813a516 --- /dev/null +++ b/nixos/tests/nixos-test-driver/node-name.nix @@ -0,0 +1,33 @@ +{ + name = "nixos-test-driver.node-name"; + nodes = { + "ok" = { }; + + # Valid node name, but not a great host name. + "one_two" = { }; + + # Valid node name, good host name + "a-b" = { }; + + # TODO: would be nice to test these eval failures + # Not allowed by lib/testing/network.nix (yet?) + # "foo.bar" = { }; + # Not allowed. + # "not ok" = { }; # not ok + }; + + testScript = '' + start_all() + + with subtest("python vars exist and machines are reachable through test backdoor"): + ok.succeed("true") + one_two.succeed("true") + a_b.succeed("true") + + with subtest("hostname is derived from the node name"): + ok.succeed("hostname | tee /dev/stderr | grep '^ok$'") + one_two.succeed("hostname | tee /dev/stderr | grep '^onetwo$'") + a_b.succeed("hostname | tee /dev/stderr | grep '^a-b$'") + + ''; +} From b25259e021de4b3969090895e48fd213c4b4b444 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 29 Sep 2022 08:33:44 +0200 Subject: [PATCH 017/203] nixos/stage-1: follow mount options For fileSystems needed for boot which are bind mounts, busybox tend to ignore mount options, so we remount right afterwards --- nixos/modules/system/boot/stage-1-init.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index af57310bda7d..835788dbbc97 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -410,6 +410,11 @@ mountFS() { n=$((n + 1)) done + # For bind mounts, busybox has a tendency to ignore options, which can be a + # security issue (e.g. "nosuid"). Remounting the partition seems to fix the + # issue. + mount "/mnt-root$mountPoint" -o "remount,$optionsPrefixed" + [ "$mountPoint" == "/" ] && [ -f "/mnt-root/etc/NIXOS_LUSTRATE" ] && lustrateRoot "/mnt-root" From 8f94053a21261c894d408c35821b4efa27255c2f Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 25 Apr 2023 13:07:08 +0200 Subject: [PATCH 018/203] nixosTests.early-mount-options: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/early-mount-options.nix | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 nixos/tests/early-mount-options.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 506cba25ba50..25b12e51ba1f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -195,6 +195,7 @@ in { dovecot = handleTest ./dovecot.nix {}; drbd = handleTest ./drbd.nix {}; earlyoom = handleTestOn ["x86_64-linux"] ./earlyoom.nix {}; + early-mount-options = handleTest ./early-mount-options.nix {}; ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {}; ecryptfs = handleTest ./ecryptfs.nix {}; diff --git a/nixos/tests/early-mount-options.nix b/nixos/tests/early-mount-options.nix new file mode 100644 index 000000000000..8be318ae13bc --- /dev/null +++ b/nixos/tests/early-mount-options.nix @@ -0,0 +1,19 @@ +# Test for https://github.com/NixOS/nixpkgs/pull/193469 +import ./make-test-python.nix { + name = "early-mount-options"; + + nodes.machine = { + virtualisation.fileSystems."/var" = { + options = [ "bind" "nosuid" "nodev" "noexec" ]; + device = "/var"; + }; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + + var_mount_info = machine.succeed("findmnt /var -n -o OPTIONS") + options = var_mount_info.strip().split(",") + assert "nosuid" in options and "nodev" in options and "noexec" in options + ''; +} From 9e7091bc6544008d9f766185b0c95c10c7349348 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 26 Apr 2023 18:30:32 +0200 Subject: [PATCH 019/203] ovmf: enable IPv6 by default > At its meeting on 21 April 2023, the RIPE NCC Executive Board resolved to suspend the ability of RIPE NCC members to submit new applications to the IPv4 waiting list until further notice. It's time enough to start using IPv6 everywhere, including UEFI. --- pkgs/applications/virtualization/OVMF/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 5499d7c2fd2a..0d286cd6f366 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -41,7 +41,9 @@ edk2.mkDerivation projectDscPath (finalAttrs: { hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; buildFlags = - lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ] + # IPv6 has no reason to be disabled. + [ "-D NETWORK_IP6_ENABLE=TRUE" ] + ++ lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ] ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"]; From 70ae9b59433de039312e51b5c9f09468bb83bf6d Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 26 Apr 2023 18:31:19 +0200 Subject: [PATCH 020/203] ovmf: add TLS support --- pkgs/applications/virtualization/OVMF/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 0d286cd6f366..06687c8c977a 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -3,6 +3,7 @@ , secureBoot ? false , httpSupport ? false , tpmSupport ? false +, tlsSupport ? false }: assert csmSupport -> seabios != null; @@ -46,6 +47,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { ++ lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ] ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] + ++ lib.optionals tlsSupport [ "-D NETWORK_TLS_ENABLE=TRUE" ] ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Qunused-arguments"; From c449133f880b756011f59e4f1a3e009510ba7be9 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Wed, 26 Apr 2023 18:31:57 +0200 Subject: [PATCH 021/203] ovmf: support debugging --- pkgs/applications/virtualization/OVMF/default.nix | 5 +++++ pkgs/development/compilers/edk2/default.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 06687c8c977a..6e3e9ba0d126 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -4,6 +4,8 @@ , httpSupport ? false , tpmSupport ? false , tlsSupport ? false +, debug ? false +, sourceDebug ? debug }: assert csmSupport -> seabios != null; @@ -44,12 +46,15 @@ edk2.mkDerivation projectDscPath (finalAttrs: { buildFlags = # IPv6 has no reason to be disabled. [ "-D NETWORK_IP6_ENABLE=TRUE" ] + ++ lib.optionals debug [ "-D DEBUG_ON_SERIAL_PORT=TRUE" ] + ++ lib.optionals sourceDebug [ "-D SOURCE_DEBUG_ENABLE=TRUE" ] ++ lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ] ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ] ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] ++ lib.optionals tlsSupport [ "-D NETWORK_TLS_ENABLE=TRUE" ] ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"]; + buildConfig = if debug then "DEBUG" else "RELEASE"; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Qunused-arguments"; env.PYTHON_COMMAND = "python3"; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 41189be5dbd2..878d3f756838 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -116,7 +116,7 @@ edk2 = buildStdenv.mkDerivation { buildPhase = '' runHook preBuild - build -a ${targetArch} -b RELEASE -t ${buildType} -p ${projectDscPath} -n $NIX_BUILD_CORES $buildFlags + build -a ${targetArch} -b ${attrs.buildConfig or "RELEASE"} -t ${buildType} -p ${projectDscPath} -n $NIX_BUILD_CORES $buildFlags runHook postBuild ''; From c289fc341bd947cccac501f2321a8c8aeadcb3bd Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 26 Apr 2023 02:45:27 -0700 Subject: [PATCH 022/203] gcc: disable libsanitizer on mips64n32 On MIPS, libsanitizer appears to have very detailed knowledge of the Linux system call ABI manually encoded, by hand, into the library. This encoding covers the o32 and 64 abis, but does not cover n32. Adding support for n32 would be a major undertaking. Without adding this encoding, builds of gcc will fail with errors including (but not limited to) the following: ``` In file included from ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cpp:21: ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cpp:75:38: error: static assertion failed 75 | COMPILER_CHECK(struct_kernel_stat_sz == sizeof(struct stat)); | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_internal_defs.h:348:44: note: in definition of macro 'COMPILER_CHECK' 348 | #define COMPILER_CHECK(pred) static_assert(pred, "") | ^~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cpp:75:38: note: the comparison reduces to '(144 == 160)' 75 | COMPILER_CHECK(struct_kernel_stat_sz == sizeof(struct stat)); | ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_internal_defs.h:348:44: note: in definition of macro 'COMPILER_CHECK' 348 | #define COMPILER_CHECK(pred) static_assert(pred, "") | ^~~~ ... In file included from ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp:184: ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp: In function '__sanitizer::uptr __sanitizer::internal_mmap(void*, uptr, int, int, int, u64)': ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_syscall_generic.inc:19:24: error: '__NR_mmap2' was not declared in this scope 19 | # define SYSCALL(name) __NR_ ## name | ^~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp:198:27: note: in expansion of macro 'SYSCALL' 198 | return internal_syscall(SYSCALL(mmap2), addr, length, prot, flags, fd, | ^~~~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp: In function 'void __sanitizer::stat64_to_stat(stat64*, stat*)': ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp:279:23: error: 'struct stat64' has no member named 'st_atim'; did you mean 'st_atime'? 279 | out->st_atime = in->st_atime; | ^~~~~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp:280:23: error: 'struct stat64' has no member named 'st_mtim'; did you mean 'st_mtime'? 280 | out->st_mtime = in->st_mtime; | ^~~~~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp:281:23: error: 'struct stat64' has no member named 'st_ctim'; did you mean 'st_ctime'? 281 | out->st_ctime = in->st_ctime; | ^~~~~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp: In function '__sanitizer::uptr __sanitizer::internal_stat(const char*, void*)': ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_syscall_generic.inc:19:24: error: '__NR_stat64' was not declared in this scope 19 | # define SYSCALL(name) __NR_ ## name | ^~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp:353:30: note: in expansion of macro 'SYSCALL' 353 | int res = internal_syscall(SYSCALL(stat64), path, &buf64); | ^~~~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp: In function '__sanitizer::uptr __sanitizer::internal_lstat(const char*, void*)': ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_syscall_generic.inc:19:24: error: '__NR_lstat64' was not declared in this scope 19 | # define SYSCALL(name) __NR_ ## name | ^~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp:378:30: note: in expansion of macro 'SYSCALL' 378 | int res = internal_syscall(SYSCALL(lstat64), path, &buf64); | ^~~~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp: In function '__sanitizer::uptr __sanitizer::internal_fstat(fd_t, void*)': ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_syscall_generic.inc:19:24: error: '__NR_fstat64' was not declared in this scope 19 | # define SYSCALL(name) __NR_ ## name | ^~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp:397:30: note: in expansion of macro 'SYSCALL' 397 | int res = internal_syscall(SYSCALL(fstat64), fd, &buf64); | ^~~~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp: At global scope: ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_linux.cpp:303:13: warning: 'void __sanitizer::kernel_stat_to_stat(kernel_stat*, stat*)' defined but not used [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wunused-function-Wunused-function8;;] 303 | static void kernel_stat_to_stat(struct kernel_stat *in, struct stat *out) { | ^~~~~~~~~~~~~~~~~~~ mv -f .deps/sanitizer_mutex.Tpo .deps/sanitizer_mutex.Plo make[4]: *** [Makefile:617: sanitizer_linux.lo] Error 1 mv -f .deps/sancov_flags.Tpo .deps/sancov_flags.Plo ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_posix.cpp: In function '__sanitizer::fd_t __sanitizer::OpenFile(const char*, FileAccessMode, error_t*)': ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_posix.cpp:162:27: warning: 'flags' may be used uninitialized [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wmaybe-uninitialized-Wmaybe-uninitialized8;;] 162 | fd_t res = internal_open(filename, flags, 0660); | ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~ ../../../../gcc-12.2.0/libsanitizer/sanitizer_common/sanitizer_posix.cpp:156:7: note: 'flags' was declared here 156 | int flags; | ^~~~~ ``` --- pkgs/development/compilers/gcc/common/platform-flags.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix index c0593cd781ed..90153be10516 100644 --- a/pkgs/development/compilers/gcc/common/platform-flags.nix +++ b/pkgs/development/compilers/gcc/common/platform-flags.nix @@ -25,4 +25,5 @@ in lib.concatLists [ "--with-long-double-128" "--with-long-double-format=${gcc.long-double-format or "ieee"}" ])) + (lib.optional targetPlatform.isMips64n32 "--disable-libsanitizer") # libsanitizer does not compile on mips64n32 ] From 416dba1bbc1826abc793eb6c7a62e482e500fec1 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Fri, 28 Apr 2023 11:57:30 +0300 Subject: [PATCH 023/203] faiss.tests: format = "other" now required --- pkgs/development/libraries/science/math/faiss/tests.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/science/math/faiss/tests.nix b/pkgs/development/libraries/science/math/faiss/tests.nix index fdc8d9259e27..bd38dbfe9e31 100644 --- a/pkgs/development/libraries/science/math/faiss/tests.nix +++ b/pkgs/development/libraries/science/math/faiss/tests.nix @@ -11,6 +11,8 @@ buildPythonPackage { pname = "faiss-pytest-suite"; inherit (faiss) version; + format = "other"; + src = "${faiss.src}/tests"; dontBuild = true; From 80e73435af9193522b55f5473c71dd6592491a75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Apr 2023 04:53:02 +0000 Subject: [PATCH 024/203] python310Packages.dvc-objects: 0.21.1 -> 0.21.2 --- pkgs/development/python-modules/dvc-objects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-objects/default.nix b/pkgs/development/python-modules/dvc-objects/default.nix index 652ac0e1c1ed..af3c6af339a9 100644 --- a/pkgs/development/python-modules/dvc-objects/default.nix +++ b/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.21.1"; + version = "0.21.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-JUpK4sAn5ZivjlpHO3XSBXZVDSWkjch/HRqHNrdC7b4="; + hash = "sha256-XKfhjzN69U0qiArXJHeLcdv/sMy0gF33FVrk9DuCGLk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From c96a05a29339df5230385f0cfb9ee0c9a4a29017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sat, 22 Apr 2023 12:10:13 +0200 Subject: [PATCH 025/203] llvmPackages_15.compiler-rt: fix missing builtins Darwin-specific builtins were present on x86-64-darwin, but not on aarch64-darwin. This is the same issue as #186575, but while the fixes were correctly applied to LLVM 15, we were still disabling the build of builtins on aarch64-darwin. Likely just a confusion. --- pkgs/development/compilers/llvm/15/compiler-rt/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index a3f2355c6a0b..fe50b091c765 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -97,8 +97,6 @@ stdenv.mkDerivation { substituteInPlace cmake/builtin-config-ix.cmake \ --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace cmake/builtin-config-ix.cmake \ - --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + lib.optionalString (useLLVM) '' From 88be91f08c8fcf6a5912b83dea31fcee090e0dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Thu, 20 Apr 2023 14:13:22 +0200 Subject: [PATCH 026/203] swiftpm2nix: add support for workspace-state v6 --- pkgs/development/tools/swiftpm2nix/support.nix | 2 +- pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/swiftpm2nix/support.nix b/pkgs/development/tools/swiftpm2nix/support.nix index 94076517ebfc..3c8e597f25ea 100644 --- a/pkgs/development/tools/swiftpm2nix/support.nix +++ b/pkgs/development/tools/swiftpm2nix/support.nix @@ -6,7 +6,7 @@ in rec { # Derive a pin file from workspace state. mkPinFile = workspaceState: - assert workspaceState.version == 5; + assert workspaceState.version >= 5 && workspaceState.version <= 6; json.generate "Package.resolved" { version = 1; object.pins = map (dep: { diff --git a/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh b/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh index 72051b4e448d..db00b1ad2b52 100755 --- a/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh +++ b/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh @@ -12,7 +12,8 @@ if [[ ! -f "$stateFile" ]]; then exit 1 fi -if [[ "$(jq .version $stateFile)" != "5" ]]; then +stateVersion="$(jq .version $stateFile)" +if [[ $stateVersion -lt 5 || $stateVersion -gt 6 ]]; then echo >&2 "Unsupported $stateFile version" exit 1 fi From f85d12198f4a4201d763cc481ccaf7025f0ec6ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Sat, 1 Apr 2023 21:43:12 +0200 Subject: [PATCH 027/203] swift: 5.7.3 -> 5.8 --- .../compilers/swift/compiler/default.nix | 20 +- .../patches/swift-cmake-3.25-compat.patch | 1509 +++++++++++++++++ .../patches/swift-darwin-libcxx-flags.patch | 63 + .../patches/swift-darwin-link-cxxabi.patch | 14 + .../patches/swift-linux-fix-libc-paths.patch | 48 + .../patches/swift-nix-resource-root.patch | 10 +- pkgs/development/compilers/swift/default.nix | 17 +- .../compilers/swift/sourcekit-lsp/default.nix | 2 + .../swift/sourcekit-lsp/generated/default.nix | 15 +- .../generated/workspace-state.json | 47 +- pkgs/development/compilers/swift/sources.nix | 27 +- .../compilers/swift/swift-docc/default.nix | 6 + .../swift/swift-docc/generated/default.nix | 13 +- .../swift-docc/generated/workspace-state.json | 43 +- .../swift/swift-driver/generated/default.nix | 8 +- .../generated/workspace-state.json | 18 +- .../patches/linux-fix-linking.patch | 10 +- .../patches/nix-resource-root.patch | 8 +- .../compilers/swift/swiftpm/cmake-glue.nix | 3 - .../compilers/swift/swiftpm/default.nix | 49 +- .../swift/swiftpm/generated/default.nix | 10 +- .../swiftpm/generated/workspace-state.json | 22 +- .../swiftpm/patches/cmake-fix-quoting.patch | 12 + .../swiftpm/patches/disable-sandbox.patch | 8 +- .../swiftpm/patches/disable-xctest.patch | 29 +- .../swift/swiftpm/patches/fix-clang-cxx.patch | 48 +- .../swiftpm/patches/fix-stdlib-path.patch | 28 +- .../swiftpm/patches/nix-pkgconfig-vars.patch | 28 + .../compilers/swift/wrapper/wrapper.sh | 2 +- 29 files changed, 1911 insertions(+), 206 deletions(-) create mode 100644 pkgs/development/compilers/swift/compiler/patches/swift-cmake-3.25-compat.patch create mode 100644 pkgs/development/compilers/swift/compiler/patches/swift-darwin-libcxx-flags.patch create mode 100644 pkgs/development/compilers/swift/compiler/patches/swift-darwin-link-cxxabi.patch create mode 100644 pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-libc-paths.patch create mode 100644 pkgs/development/compilers/swift/swiftpm/patches/cmake-fix-quoting.patch create mode 100644 pkgs/development/compilers/swift/swiftpm/patches/nix-pkgconfig-vars.patch diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix index 0c0083c334aa..821d61229d8d 100644 --- a/pkgs/development/compilers/swift/compiler/default.nix +++ b/pkgs/development/compilers/swift/compiler/default.nix @@ -99,7 +99,6 @@ let # "clang-builtin-headers" "stdlib" "sdk-overlay" - "parser-lib" "static-mirror-lib" "editor-integration" # "tools" @@ -257,6 +256,7 @@ in stdenv.mkDerivation { ${copySource "llvm-project"} ${copySource "swift"} ${copySource "swift-experimental-string-processing"} + ${copySource "swift-syntax"} ${lib.optionalString (!stdenv.isDarwin) (copySource "swift-corelibs-libdispatch")} @@ -276,9 +276,13 @@ in stdenv.mkDerivation { -e 's|/bin/cp|${coreutils}/bin/cp|g' \ -e 's|/usr/bin/file|${file}/bin/file|g' + patch -p1 -d swift -i ${./patches/swift-cmake-3.25-compat.patch} patch -p1 -d swift -i ${./patches/swift-wrap.patch} patch -p1 -d swift -i ${./patches/swift-nix-resource-root.patch} + patch -p1 -d swift -i ${./patches/swift-linux-fix-libc-paths.patch} patch -p1 -d swift -i ${./patches/swift-linux-fix-linking.patch} + patch -p1 -d swift -i ${./patches/swift-darwin-libcxx-flags.patch} + patch -p1 -d swift -i ${./patches/swift-darwin-link-cxxabi.patch} patch -p1 -d swift -i ${substituteAll { src = ./patches/swift-darwin-plistbuddy-workaround.patch; inherit swiftArch; @@ -287,8 +291,6 @@ in stdenv.mkDerivation { src = ./patches/swift-prevent-sdk-dirs-warning.patch; inherit (builtins) storeDir; }} - substituteInPlace swift/cmake/modules/SwiftConfigureSDK.cmake \ - --replace '/usr/include' "${stdenv.cc.libc_dev}/include" # This patch needs to know the lib output location, so must be substituted # in the same derivation as the compiler. @@ -321,8 +323,8 @@ in stdenv.mkDerivation { ''} # Remove tests for cross compilation, which we don't currently support. - rm swift/test/Interop/Cxx/class/constructors-copy-irgen.swift - rm swift/test/Interop/Cxx/class/constructors-irgen.swift + rm swift/test/Interop/Cxx/class/constructors-copy-irgen-*.swift + rm swift/test/Interop/Cxx/class/constructors-irgen-*.swift # TODO: consider fixing and re-adding. This test fails due to a non-standard "install_prefix". rm swift/validation-test/Python/build_swift.swift @@ -342,7 +344,7 @@ in stdenv.mkDerivation { rm swift/test/Serialization/restrict-swiftmodule-to-revision.swift # This test was flaky in ofborg, see #186476 - rm swift/test/AutoDiff/compiler_crashers_fixed/sr14290-missing-debug-scopes-in-pullback-trampoline.swift + rm swift/test/AutoDiff/compiler_crashers_fixed/issue-56649-missing-debug-scopes-in-pullback-trampoline.swift patchShebangs . @@ -446,7 +448,8 @@ in stdenv.mkDerivation { -DSWIFT_PATH_TO_CMARK_SOURCE=$SWIFT_SOURCE_ROOT/swift-cmark -DSWIFT_PATH_TO_CMARK_BUILD=$SWIFT_BUILD_ROOT/swift-cmark -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE=$SWIFT_SOURCE_ROOT/swift-corelibs-libdispatch - -DEXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing + -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax + -DSWIFT_PATH_TO_STRING_PROCESSING_SOURCE=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents} -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.isDarwin then "ON" else "OFF"} " @@ -501,6 +504,7 @@ in stdenv.mkDerivation { cmakeFlags=" -GNinja -DCMAKE_Swift_COMPILER=$SWIFT_BUILD_ROOT/swift/bin/swiftc + -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax -DTOOLCHAIN_DIR=/var/empty -DSWIFT_NATIVE_LLVM_TOOLS_PATH=${stdenv.cc}/bin @@ -579,7 +583,7 @@ in stdenv.mkDerivation { # Undo the clang and swift wrapping we did for the build. # (This happened via patches to cmake files.) cd $SWIFT_BUILD_ROOT - mv llvm/bin/clang-14{-unwrapped,} + mv llvm/bin/clang-15{-unwrapped,} mv swift/bin/swift-frontend{-unwrapped,} mkdir $out $lib diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-cmake-3.25-compat.patch b/pkgs/development/compilers/swift/compiler/patches/swift-cmake-3.25-compat.patch new file mode 100644 index 000000000000..83c8d95984ff --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-cmake-3.25-compat.patch @@ -0,0 +1,1509 @@ +Upstream PR: https://github.com/apple/swift/pull/65534 + +commit 112681f7f5927588569b225d926ca9f5f9ec98b3 +Author: Stéphan Kochen +Date: Sat Apr 29 20:34:40 2023 +0200 + + build: fix accidental cmake expansions + + As of CMake 3.25, there are now global variables `LINUX=1`, `ANDROID=1`, + etc. These conflict with expressions that used these names as unquoted + strings in positions where CMake accepts 'variable|string', for example: + + - `if(sdk STREQUAL LINUX)` would fail, because `LINUX` is now defined and + expands to 1, where it would previously coerce to a string. + + - `if(${sdk} STREQUAL "LINUX")` would fail if `sdk=LINUX`, because the + left-hand side expands twice. + + In this patch, I looked for a number of patterns to fix up, sometimes a + little defensively: + + - Quoted right-hand side of `STREQUAL` where I was confident it was + intended to be a string literal. + + - Removed manual variable expansion on left-hand side of `STREQUAL`, + `MATCHES` and `IN_LIST` where I was confident it was unintended. + + Fixes #65028. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eaab71fbaf0..45aa5d65dd3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,7 +119,7 @@ else() + if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64|amd64") + set(SWIFT_HOST_VARIANT_ARCH_default "x86_64") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|arm64") +- if(SWIFT_HOST_VARIANT_SDK_default STREQUAL OSX) ++ if(SWIFT_HOST_VARIANT_SDK_default STREQUAL "OSX") + set(SWIFT_HOST_VARIANT_ARCH_default "arm64") + else() + set(SWIFT_HOST_VARIANT_ARCH_default "aarch64") +@@ -336,7 +336,7 @@ set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING + # - MultiThreadedDebug (/MTd) + # - MultiThreadedDLL (/MD) + # - MultiThreadedDebugDLL (/MDd) +-if(CMAKE_BUILD_TYPE STREQUAL Debug) ++if(CMAKE_BUILD_TYPE STREQUAL "Debug") + set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDebugDLL) + else() + set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDLL) +@@ -598,7 +598,7 @@ if(SWIFT_BUILT_STANDALONE) + project(Swift C CXX ASM) + endif() + +-if(MSVC OR "${CMAKE_SIMULATE_ID}" STREQUAL MSVC) ++if(MSVC OR "${CMAKE_SIMULATE_ID}" STREQUAL "MSVC") + include(ClangClCompileRules) + elseif(UNIX) + include(UnixCompileRules) +@@ -627,7 +627,7 @@ if(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY AND "${SWIFT_CONCURRENCY_GLOBAL_EXECUTO + endif() + + set(SWIFT_BUILD_HOST_DISPATCH FALSE) +-if(SWIFT_ENABLE_DISPATCH AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) ++if(SWIFT_ENABLE_DISPATCH AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") + # Only build libdispatch for the host if the host tools are being built and + # specifically if these two libraries that depend on it are built. + if(SWIFT_INCLUDE_TOOLS AND SWIFT_BUILD_SOURCEKIT) +@@ -801,11 +801,11 @@ endif() + # build environment. + if(LLVM_USE_LINKER) + set(SWIFT_USE_LINKER_default "${LLVM_USE_LINKER}") +-elseif(${SWIFT_HOST_VARIANT_SDK} STREQUAL ANDROID) ++elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID") + set(SWIFT_USE_LINKER_default "lld") +-elseif(CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_HOST_SYSTEM_NAME STREQUAL Windows) ++elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + set(SWIFT_USE_LINKER_default "lld") +-elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin) ++elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set(SWIFT_USE_LINKER_default "") + else() + set(SWIFT_USE_LINKER_default "gold") +diff --git a/SwiftCompilerSources/CMakeLists.txt b/SwiftCompilerSources/CMakeLists.txt +index 225e72663a1..d14e0ccecac 100644 +--- a/SwiftCompilerSources/CMakeLists.txt ++++ b/SwiftCompilerSources/CMakeLists.txt +@@ -80,7 +80,7 @@ function(add_swift_compiler_modules_library name) + list(APPEND swift_compile_options "-Xfrontend" "-disable-implicit-string-processing-module-import") + endif() + +- if(CMAKE_BUILD_TYPE STREQUAL Debug) ++ if(CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND swift_compile_options "-g") + else() + list(APPEND swift_compile_options "-O" "-cross-module-optimization") +@@ -98,7 +98,7 @@ function(add_swift_compiler_modules_library name) + set(deployment_version "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}") + set(sdk_path "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}") + set(sdk_option "-sdk" "${sdk_path}") +- if(${BOOTSTRAPPING_MODE} STREQUAL "CROSSCOMPILE-WITH-HOSTLIBS") ++ if(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE-WITH-HOSTLIBS") + # Let the cross-compiled compile don't pick up the compiled stdlib by providing + # an (almost) empty resource dir. + # The compiler will instead pick up the stdlib from the SDK. +@@ -117,7 +117,7 @@ function(add_swift_compiler_modules_library name) + message(ERROR "libc++ not found in the toolchain.") + endif() + endif() +- elseif(${BOOTSTRAPPING_MODE} STREQUAL "CROSSCOMPILE") ++ elseif(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE") + set(sdk_option "-sdk" "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}") + get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY) + set(sdk_option ${sdk_option} "-resource-dir" "${swift_exec_bin_dir}/../lib/swift") +@@ -253,13 +253,13 @@ else() + add_dependencies(importedHeaderDependencies swift-ast-generated-headers) + target_include_directories(importedHeaderDependencies PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../include/swift") + +- if(${BOOTSTRAPPING_MODE} MATCHES "HOSTTOOLS|CROSSCOMPILE") ++ if(BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE") + + if (NOT SWIFT_EXEC_FOR_SWIFT_MODULES) + message(FATAL_ERROR "Need a swift toolchain building swift compiler sources") + endif() + +- if(${BOOTSTRAPPING_MODE} STREQUAL "HOSTTOOLS") ++ if(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS") + if(NOT SWIFT_EXEC_FOR_SWIFT_MODULES STREQUAL CMAKE_Swift_COMPILER) + message(FATAL_ERROR "The Swift compiler (${CMAKE_Swift_COMPILER}) differs from the Swift compiler in SWIFT_NATIVE_SWIFT_TOOLS_PATH (${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/swiftc).") + endif() +@@ -275,11 +275,11 @@ else() + add_swift_compiler_modules_library(swiftCompilerModules + SWIFT_EXEC "${SWIFT_EXEC_FOR_SWIFT_MODULES}") + +- elseif(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*") ++ elseif(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*") + + set(b0_deps swift-frontend-bootstrapping0 symlink-headers-bootstrapping0) + set(b1_deps swift-frontend-bootstrapping1 symlink-headers-bootstrapping1) +- if(${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING") ++ if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING") + list(APPEND b0_deps swiftCore-bootstrapping0) + list(APPEND b1_deps swiftCore-bootstrapping1) + if(CMAKE_BUILD_TYPE STREQUAL "Debug") +@@ -290,7 +290,7 @@ else() + list(APPEND b0_deps swiftDarwin-bootstrapping0) + list(APPEND b1_deps swiftDarwin-bootstrapping1) + endif() +- if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_LIBSTDCXX_PLATFORMS) ++ if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_LIBSTDCXX_PLATFORMS) + list(APPEND b0_deps copy-libstdcxx-modulemap-bootstrapping0 copy-libstdcxx-header-bootstrapping0) + list(APPEND b1_deps copy-libstdcxx-modulemap-bootstrapping1 copy-libstdcxx-header-bootstrapping1) + endif() +diff --git a/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake b/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake +index dd989efe618..3ed37754214 100644 +--- a/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake ++++ b/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake +@@ -21,7 +21,7 @@ macro(configure_build) + # thus allowing the --host-cc build-script argument to work here. + get_filename_component(c_compiler ${CMAKE_C_COMPILER} NAME) + +- if(${c_compiler} STREQUAL "clang") ++ if(c_compiler STREQUAL "clang") + set(CLANG_EXEC ${CMAKE_C_COMPILER}) + else() + if(NOT SWIFT_DARWIN_XCRUN_TOOLCHAIN) +@@ -713,7 +713,7 @@ function(swift_benchmark_compile) + + if(NOT SWIFT_BENCHMARK_BUILT_STANDALONE) + set(stdlib_dependencies "swift-frontend" "swiftCore-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}") +- if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS) ++ if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS) + list(APPEND stdlib_dependencies "swiftDarwin-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}") + endif() + foreach(stdlib_dependency ${UNIVERSAL_LIBRARY_NAMES_${SWIFT_BENCHMARK_COMPILE_PLATFORM}}) +diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake +index 58c7eb1bd4f..96c4fe804f9 100644 +--- a/cmake/modules/AddSwift.cmake ++++ b/cmake/modules/AddSwift.cmake +@@ -63,16 +63,16 @@ function(_set_target_prefix_and_suffix target kind sdk) + precondition(kind MESSAGE "kind is required") + precondition(sdk MESSAGE "sdk is required") + +- if(${sdk} STREQUAL ANDROID) +- if(${kind} STREQUAL STATIC) ++ if(sdk STREQUAL "ANDROID") ++ if(kind STREQUAL "STATIC") + set_target_properties(${target} PROPERTIES PREFIX "lib" SUFFIX ".a") +- elseif(${kind} STREQUAL SHARED) ++ elseif(kind STREQUAL "SHARED") + set_target_properties(${target} PROPERTIES PREFIX "lib" SUFFIX ".so") + endif() +- elseif(${sdk} STREQUAL WINDOWS) +- if(${kind} STREQUAL STATIC) ++ elseif(sdk STREQUAL "WINDOWS") ++ if(kind STREQUAL "STATIC") + set_target_properties(${target} PROPERTIES PREFIX "" SUFFIX ".lib") +- elseif(${kind} STREQUAL SHARED) ++ elseif(kind STREQUAL "SHARED") + set_target_properties(${target} PROPERTIES PREFIX "" SUFFIX ".dll") + endif() + endif() +@@ -115,7 +115,7 @@ function(_add_host_variant_c_compile_link_flags name) + set(DEPLOYMENT_VERSION "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}") + endif() + +- if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID) ++ if(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID") + set(DEPLOYMENT_VERSION ${SWIFT_ANDROID_API_LEVEL}) + endif() + +@@ -151,7 +151,7 @@ function(_add_host_variant_c_compile_link_flags name) + target_compile_options(${name} PRIVATE $<$:--sysroot=${_sysroot}>) + endif() + +- if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID) ++ if(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID") + # Make sure the Android NDK lld is used. + swift_android_tools_path(${SWIFT_HOST_VARIANT_ARCH} tools_path) + target_compile_options(${name} PRIVATE $<$:-B${tools_path}>) +@@ -223,7 +223,7 @@ function(_add_host_variant_c_compile_flags target) + endif() + endif() + +- if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS) ++ if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS") + # MSVC/clang-cl don't support -fno-pic or -fms-compatibility-version. + if(NOT SWIFT_COMPILER_IS_MSVC_LIKE) + target_compile_options(${target} PRIVATE +@@ -276,14 +276,14 @@ function(_add_host_variant_c_compile_flags target) + # NOTE(compnerd) workaround LLVM invoking `add_definitions(-D_DEBUG)` which + # causes failures for the runtime library when cross-compiling due to + # undefined symbols from the standard library. +- if(NOT CMAKE_BUILD_TYPE STREQUAL Debug) ++ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") + target_compile_options(${target} PRIVATE + $<$:-U_DEBUG>) + endif() + endif() + +- if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID) +- if(SWIFT_HOST_VARIANT_ARCH STREQUAL x86_64) ++ if(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID") ++ if(SWIFT_HOST_VARIANT_ARCH STREQUAL "x86_64") + # NOTE(compnerd) Android NDK 21 or lower will generate library calls to + # `__sync_val_compare_and_swap_16` rather than lowering to the CPU's + # `cmpxchg16b` instruction as the `cx16` feature is disabled due to a bug +@@ -317,15 +317,15 @@ function(_add_host_variant_c_compile_flags target) + $<$:-fprofile-instr-generate -fcoverage-mapping>) + endif() + +- if((SWIFT_HOST_VARIANT_ARCH STREQUAL armv7 OR +- SWIFT_HOST_VARIANT_ARCH STREQUAL aarch64) AND +- (SWIFT_HOST_VARIANT_SDK STREQUAL LINUX OR +- SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)) ++ if((SWIFT_HOST_VARIANT_ARCH STREQUAL "armv7" OR ++ SWIFT_HOST_VARIANT_ARCH STREQUAL "aarch64") AND ++ (SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" OR ++ SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")) + target_compile_options(${target} PRIVATE $<$:-funwind-tables>) + endif() + + if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX") +- if(SWIFT_HOST_VARIANT_ARCH STREQUAL x86_64) ++ if(SWIFT_HOST_VARIANT_ARCH STREQUAL "x86_64") + # this is the minimum architecture that supports 16 byte CAS, which is + # necessary to avoid a dependency to libatomic + target_compile_options(${target} PRIVATE $<$:-march=core2>) +@@ -336,7 +336,7 @@ function(_add_host_variant_c_compile_flags target) + # llvm/llvm-project@66395c9, which can cause incompatibilities with the Swift + # frontend if not built the same way. + if("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "armv6|armv7|i686" AND +- NOT (SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID AND SWIFT_ANDROID_API_LEVEL LESS 24)) ++ NOT (SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID" AND SWIFT_ANDROID_API_LEVEL LESS 24)) + target_compile_definitions(${target} PRIVATE + $<$:_LARGEFILE_SOURCE _FILE_OFFSET_BITS=64>) + endif() +@@ -345,19 +345,19 @@ endfunction() + function(_add_host_variant_link_flags target) + _add_host_variant_c_compile_link_flags(${target}) + +- if(SWIFT_HOST_VARIANT_SDK STREQUAL LINUX) ++ if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX") + target_link_libraries(${target} PRIVATE + pthread + dl) + if("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "armv5|armv6|armv7|i686") + target_link_libraries(${target} PRIVATE atomic) + endif() +- elseif(SWIFT_HOST_VARIANT_SDK STREQUAL FREEBSD) ++ elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "FREEBSD") + target_link_libraries(${target} PRIVATE + pthread) +- elseif(SWIFT_HOST_VARIANT_SDK STREQUAL CYGWIN) ++ elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "CYGWIN") + # No extra libraries required. +- elseif(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS) ++ elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS") + # We don't need to add -nostdlib using MSVC or clang-cl, as MSVC and + # clang-cl rely on auto-linking entirely. + if(NOT SWIFT_COMPILER_IS_MSVC_LIKE) +@@ -375,12 +375,12 @@ function(_add_host_variant_link_flags target) + # the Windows SDK on case sensitive file systems. + target_link_directories(${target} PRIVATE + ${CMAKE_BINARY_DIR}/winsdk_lib_${SWIFT_HOST_VARIANT_ARCH}_symlinks) +- elseif(SWIFT_HOST_VARIANT_SDK STREQUAL HAIKU) ++ elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "HAIKU") + target_link_libraries(${target} PRIVATE + bsd) + target_link_options(${target} PRIVATE + "SHELL:-Xlinker -Bsymbolic") +- elseif(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID) ++ elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID") + target_link_libraries(${target} PRIVATE + dl + log +@@ -422,7 +422,7 @@ function(_add_host_variant_link_flags target) + # + # TODO: Evaluate/enable -f{function,data}-sections --gc-sections for bfd, + # gold, and lld. +- if(NOT CMAKE_BUILD_TYPE STREQUAL Debug AND CMAKE_SYSTEM_NAME MATCHES Darwin) ++ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_SYSTEM_NAME MATCHES Darwin) + if (NOT SWIFT_DISABLE_DEAD_STRIPPING) + # See rdar://48283130: This gives 6MB+ size reductions for swift and + # SourceKitService, and much larger size reductions for sil-opt etc. +@@ -446,7 +446,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping) + # RPATH where Swift runtime can be found. + set(swift_runtime_rpath) + +- if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS) ++ if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS) + + set(sdk_dir "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}/usr/lib/swift") + +@@ -529,7 +529,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping) + + elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD") + set(swiftrt "swiftImageRegistrationObject${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_OBJECT_FORMAT}-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}") +- if(${ASRLF_BOOTSTRAPPING_MODE} MATCHES "HOSTTOOLS|CROSSCOMPILE") ++ if(ASRLF_BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE") + # At build time and run time, link against the swift libraries in the + # installed host toolchain. + get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY) +@@ -575,7 +575,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping) + # able to fall back to the SDK directory for libswiftCore et al. + if (BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*") + if (NOT "${bootstrapping}" STREQUAL "1") +- if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS) ++ if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS) + target_link_directories(${target} PRIVATE "${sdk_dir}") + + # Include the abi stable system stdlib in our rpath. +@@ -706,10 +706,10 @@ function(add_swift_host_library name) + if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS) + set_target_properties(${name} PROPERTIES + INSTALL_NAME_DIR "@rpath") +- elseif(SWIFT_HOST_VARIANT_SDK STREQUAL LINUX) ++ elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX") + set_target_properties(${name} PROPERTIES + INSTALL_RPATH "$ORIGIN") +- elseif(SWIFT_HOST_VARIANT_SDK STREQUAL CYGWIN) ++ elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "CYGWIN") + set_target_properties(${name} PROPERTIES + INSTALL_RPATH "$ORIGIN:/usr/lib/swift/cygwin") + elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID") +@@ -731,18 +731,18 @@ function(add_swift_host_library name) + endif() + + # Set compilation and link flags. +- if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS) ++ if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS") + swift_windows_include_for_arch(${SWIFT_HOST_VARIANT_ARCH} + ${SWIFT_HOST_VARIANT_ARCH}_INCLUDE) + target_include_directories(${name} SYSTEM PRIVATE + ${${SWIFT_HOST_VARIANT_ARCH}_INCLUDE}) + +- if(libkind STREQUAL SHARED) ++ if(libkind STREQUAL "SHARED") + target_compile_definitions(${name} PRIVATE + _WINDLL) + endif() + +- if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC) ++ if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC") + swift_windows_get_sdk_vfs_overlay(ASHL_VFS_OVERLAY) + # Both clang and clang-cl on Windows set CMAKE_C_SIMULATE_ID to MSVC. + # We are using CMAKE_C_COMPILER_FRONTEND_VARIANT to detect the correct +@@ -770,7 +770,7 @@ function(add_swift_host_library name) + + set_target_properties(${name} PROPERTIES LINKER_LANGUAGE CXX) + +- if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS) ++ if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS) + target_link_options(${name} PRIVATE + "LINKER:-compatibility_version,1") + if(SWIFT_COMPILER_VERSION) +@@ -856,7 +856,7 @@ function(add_swift_host_tool executable) + add_dependencies(${executable} ${LLVM_COMMON_DEPENDS}) + endif() + +- if(NOT ${ASHT_BOOTSTRAPPING} STREQUAL "") ++ if(NOT "${ASHT_BOOTSTRAPPING}" STREQUAL "") + # Strip the "-bootstrapping" suffix from the target name to get the base + # executable name. + string(REGEX REPLACE "-bootstrapping.*" "" executable_filename ${executable}) +@@ -891,7 +891,7 @@ function(add_swift_host_tool executable) + BINARY_DIR ${out_bin_dir} + LIBRARY_DIR ${out_lib_dir}) + +- if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS) ++ if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS") + swift_windows_include_for_arch(${SWIFT_HOST_VARIANT_ARCH} + ${SWIFT_HOST_VARIANT_ARCH}_INCLUDE) + target_include_directories(${executable} SYSTEM PRIVATE +@@ -913,8 +913,8 @@ function(add_swift_host_tool executable) + + if(SWIFT_SWIFT_PARSER) + set(extra_relative_rpath "") +- if(NOT ${ASHT_BOOTSTRAPPING} STREQUAL "") +- if (${executable} MATCHES "-bootstrapping") ++ if(NOT "${ASHT_BOOTSTRAPPING}" STREQUAL "") ++ if(executable MATCHES "-bootstrapping") + set(extra_relative_rpath "../") + endif() + endif() +@@ -938,7 +938,7 @@ function(add_swift_host_tool executable) + target_link_options(${executable} PRIVATE "${lto_codegen_only_link_options}") + endif() + +- if(NOT ${ASHT_SWIFT_COMPONENT} STREQUAL "no_component") ++ if(NOT ASHT_SWIFT_COMPONENT STREQUAL "no_component") + add_dependencies(${ASHT_SWIFT_COMPONENT} ${executable}) + swift_install_in_component(TARGETS ${executable} + RUNTIME +diff --git a/cmake/modules/Libdispatch.cmake b/cmake/modules/Libdispatch.cmake +index f0ea3577a2b..3fb0ecdce89 100644 +--- a/cmake/modules/Libdispatch.cmake ++++ b/cmake/modules/Libdispatch.cmake +@@ -1,13 +1,13 @@ + include(ExternalProject) + +-if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) +- if(CMAKE_C_COMPILER_ID STREQUAL Clang AND ++if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") ++ if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND + CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.8 + OR LLVM_USE_SANITIZER) + set(SWIFT_LIBDISPATCH_C_COMPILER ${CMAKE_C_COMPILER}) + set(SWIFT_LIBDISPATCH_CXX_COMPILER ${CMAKE_CXX_COMPILER}) +- elseif(${CMAKE_SYSTEM_NAME} STREQUAL ${CMAKE_HOST_SYSTEM_NAME}) +- if(CMAKE_SYSTEM_NAME STREQUAL Windows) ++ elseif(CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME) ++ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR AND + TARGET clang) + set(SWIFT_LIBDISPATCH_C_COMPILER +@@ -29,7 +29,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) + message(SEND_ERROR "libdispatch requires a newer clang compiler (${CMAKE_C_COMPILER_VERSION} < 3.9)") + endif() + +- if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS) ++ if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS") + set(LIBDISPATCH_RUNTIME_DIR bin) + else() + set(LIBDISPATCH_RUNTIME_DIR lib) +@@ -40,7 +40,7 @@ set(DISPATCH_SDKS) + + # Build the host libdispatch if needed. + if(SWIFT_BUILD_HOST_DISPATCH) +- if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) ++ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") + if(NOT "${SWIFT_HOST_VARIANT_SDK}" IN_LIST SWIFT_SDKS) + list(APPEND DISPATCH_SDKS "${SWIFT_HOST_VARIANT_SDK}") + endif() +@@ -52,20 +52,20 @@ foreach(sdk ${SWIFT_SDKS}) + # Darwin targets have libdispatch available, do not build it. + # Wasm/WASI doesn't support libdispatch yet. + # See https://github.com/apple/swift/issues/54533 for more details. +- if(NOT "${sdk}" IN_LIST SWIFT_DARWIN_PLATFORMS AND NOT "${sdk}" STREQUAL WASI) ++ if(NOT "${sdk}" IN_LIST SWIFT_DARWIN_PLATFORMS AND NOT "${sdk}" STREQUAL "WASI") + list(APPEND DISPATCH_SDKS "${sdk}") + endif() + endforeach() + + foreach(sdk ${DISPATCH_SDKS}) + set(ARCHS ${SWIFT_SDK_${sdk}_ARCHITECTURES}) +- if(${sdk} STREQUAL "${SWIFT_HOST_VARIANT_SDK}") ++ if(sdk STREQUAL "${SWIFT_HOST_VARIANT_SDK}") + if(NOT "${SWIFT_HOST_VARIANT_ARCH}" IN_LIST ARCHS) + list(APPEND ARCHS "${SWIFT_HOST_VARIANT_ARCH}") + endif() + endif() + +- if(sdk STREQUAL ANDROID) ++ if(sdk STREQUAL "ANDROID") + set(SWIFT_LIBDISPATCH_COMPILER_CMAKE_ARGS) + else() + set(SWIFT_LIBDISPATCH_COMPILER_CMAKE_ARGS -DCMAKE_C_COMPILER=${SWIFT_LIBDISPATCH_C_COMPILER};-DCMAKE_CXX_COMPILER=${SWIFT_LIBDISPATCH_CXX_COMPILER}) +diff --git a/cmake/modules/SwiftComponents.cmake b/cmake/modules/SwiftComponents.cmake +index 6816b75e8a4..2ec225140dc 100644 +--- a/cmake/modules/SwiftComponents.cmake ++++ b/cmake/modules/SwiftComponents.cmake +@@ -82,7 +82,7 @@ list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "clang-builtin-headers-in-clang-resou + # This conflicts with LLVM itself when doing unified builds. + list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "llvm-toolchain-dev-tools") + # The sourcekit install variants are currently mutually exclusive. +-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ++if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "sourcekit-inproc") + else() + list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "sourcekit-xpc-service") +diff --git a/cmake/modules/SwiftConfigureSDK.cmake b/cmake/modules/SwiftConfigureSDK.cmake +index d4cb352d658..5dd258cdd24 100644 +--- a/cmake/modules/SwiftConfigureSDK.cmake ++++ b/cmake/modules/SwiftConfigureSDK.cmake +@@ -232,7 +232,7 @@ macro(configure_sdk_darwin + SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES) # result + + # Determine whether this is a simulator SDK. +- if ( ${xcrun_name} MATCHES "simulator" ) ++ if(xcrun_name MATCHES "simulator") + set(SWIFT_SDK_${prefix}_IS_SIMULATOR TRUE) + else() + set(SWIFT_SDK_${prefix}_IS_SIMULATOR FALSE) +@@ -378,11 +378,11 @@ macro(configure_sdk_unix name architectures) + message(FATAL_ERROR "unknown arch for ${prefix}: ${arch}") + endif() + elseif("${prefix}" STREQUAL "FREEBSD") +- if(NOT arch STREQUAL x86_64) ++ if(NOT arch STREQUAL "x86_64") + message(FATAL_ERROR "unsupported arch for FreeBSD: ${arch}") + endif() + +- if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL FreeBSD) ++ if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") + message(WARNING "CMAKE_SYSTEM_VERSION will not match target") + endif() + +@@ -391,7 +391,7 @@ macro(configure_sdk_unix name architectures) + + set(SWIFT_SDK_FREEBSD_ARCH_x86_64_TRIPLE "x86_64-unknown-freebsd${freebsd_system_version}") + elseif("${prefix}" STREQUAL "OPENBSD") +- if(NOT arch STREQUAL amd64) ++ if(NOT arch STREQUAL "amd64") + message(FATAL_ERROR "unsupported arch for OpenBSD: ${arch}") + endif() + +@@ -404,17 +404,17 @@ macro(configure_sdk_unix name architectures) + set(SWIFT_SDK_OPENBSD_ARCH_${arch}_PATH "${CMAKE_SYSROOT}${SWIFT_SDK_OPENBSD_ARCH_${arch}_PATH}" CACHE INTERNAL "sysroot path" FORCE) + endif() + elseif("${prefix}" STREQUAL "CYGWIN") +- if(NOT arch STREQUAL x86_64) ++ if(NOT arch STREQUAL "x86_64") + message(FATAL_ERROR "unsupported arch for cygwin: ${arch}") + endif() + set(SWIFT_SDK_CYGWIN_ARCH_x86_64_TRIPLE "x86_64-unknown-windows-cygnus") + elseif("${prefix}" STREQUAL "HAIKU") +- if(NOT arch STREQUAL x86_64) ++ if(NOT arch STREQUAL "x86_64") + message(FATAL_ERROR "unsupported arch for Haiku: ${arch}") + endif() + set(SWIFT_SDK_HAIKU_ARCH_x86_64_TRIPLE "x86_64-unknown-haiku") + elseif("${prefix}" STREQUAL "WASI") +- if(NOT arch STREQUAL wasm32) ++ if(NOT arch STREQUAL "wasm32") + message(FATAL_ERROR "unsupported arch for WebAssembly: ${arch}") + endif() + set(SWIFT_SDK_WASI_ARCH_wasm32_PATH "${SWIFT_WASI_SYSROOT_PATH}") +@@ -459,7 +459,7 @@ macro(configure_sdk_windows name environment architectures) + get_threading_package(${prefix} "win32" SWIFT_SDK_${prefix}_THREADING_PACKAGE) + + foreach(arch ${architectures}) +- if(arch STREQUAL armv7) ++ if(arch STREQUAL "armv7") + set(SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE + "thumbv7-unknown-windows-${environment}") + else() +diff --git a/cmake/modules/SwiftWindowsSupport.cmake b/cmake/modules/SwiftWindowsSupport.cmake +index 6216b82c12b..a3432476658 100644 +--- a/cmake/modules/SwiftWindowsSupport.cmake ++++ b/cmake/modules/SwiftWindowsSupport.cmake +@@ -2,13 +2,13 @@ + include(SwiftUtils) + + function(swift_windows_arch_spelling arch var) +- if(${arch} STREQUAL i686) ++ if(arch STREQUAL "i686") + set(${var} x86 PARENT_SCOPE) +- elseif(${arch} STREQUAL x86_64) ++ elseif(arch STREQUAL "x86_64") + set(${var} x64 PARENT_SCOPE) +- elseif(${arch} STREQUAL armv7) ++ elseif(arch STREQUAL "armv7") + set(${var} arm PARENT_SCOPE) +- elseif(${arch} STREQUAL aarch64) ++ elseif(arch STREQUAL "aarch64") + set(${var} arm64 PARENT_SCOPE) + else() + message(FATAL_ERROR "do not know MSVC spelling for ARCH: `${arch}`") +@@ -33,7 +33,7 @@ function(swift_windows_lib_for_arch arch var) + # a directory called "Lib" rather than VS2017 which normalizes the layout and + # places them in a directory named "lib". + if(IS_DIRECTORY "${VCToolsInstallDir}/Lib") +- if(${ARCH} STREQUAL x86) ++ if(ARCH STREQUAL "x86") + list(APPEND paths "${VCToolsInstallDir}/Lib/") + else() + list(APPEND paths "${VCToolsInstallDir}/Lib/${ARCH}") +diff --git a/include/swift/AST/CMakeLists.txt b/include/swift/AST/CMakeLists.txt +index 869d96ba13b..050695f65c6 100644 +--- a/include/swift/AST/CMakeLists.txt ++++ b/include/swift/AST/CMakeLists.txt +@@ -1,4 +1,4 @@ +-if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows) ++if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + set(SWIFT_GYB_FLAGS --line-directive "^\"#line %(line)d \\\"%(file)s\\\"^\"") + else() + set(SWIFT_GYB_FLAGS --line-directive "\'#line" "%(line)d" "\"%(file)s\"\'") +diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt +index a0011d8a68c..13363dea4aa 100644 +--- a/lib/AST/CMakeLists.txt ++++ b/lib/AST/CMakeLists.txt +@@ -125,7 +125,7 @@ add_swift_host_library(swiftAST STATIC + ) + + if(SWIFT_FORCE_OPTIMIZED_TYPECHECKER) +- if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC OR CMAKE_CXX_SIMULATE_ID STREQUAL MSVC) ++ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") + target_compile_options(swiftAST PRIVATE /O2 /Ob2) + else() + target_compile_options(swiftAST PRIVATE -O3) +diff --git a/lib/Migrator/CMakeLists.txt b/lib/Migrator/CMakeLists.txt +index 1dfd089d21a..228baa470ed 100644 +--- a/lib/Migrator/CMakeLists.txt ++++ b/lib/Migrator/CMakeLists.txt +@@ -23,7 +23,7 @@ set(outputs) + foreach(input ${datafiles}) + set(source "${CMAKE_CURRENT_SOURCE_DIR}/${input}") + set(dest "${output_dir}/${input}") +- if(CMAKE_SYSTEM_NAME STREQUAL Windows) ++ if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + set(CMAKE_SYMLINK_COMMAND copy) + else() + set(CMAKE_SYMLINK_COMMAND create_symlink) +diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt +index b46a4b217c3..b8550c96b2a 100644 +--- a/lib/Parse/CMakeLists.txt ++++ b/lib/Parse/CMakeLists.txt +@@ -1,6 +1,6 @@ + + +-if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows) ++if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + set(SWIFT_GYB_FLAGS --line-directive "^\"#line %(line)d \\\"%(file)s\\\"^\"") + else() + set(SWIFT_GYB_FLAGS --line-directive "\'#line" "%(line)d" "\"%(file)s\"\'") +diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt +index c0e3608d07a..bf70a33782d 100644 +--- a/lib/Sema/CMakeLists.txt ++++ b/lib/Sema/CMakeLists.txt +@@ -74,7 +74,7 @@ add_swift_host_library(swiftSema STATIC + TypeChecker.cpp + IDETypeCheckingRequests.cpp) + if(SWIFT_FORCE_OPTIMIZED_TYPECHECKER) +- if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC OR CMAKE_CXX_SIMULATE_ID STREQUAL MSVC) ++ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC") + target_compile_options(swiftSema PRIVATE /O2 /Ob2) + else() + target_compile_options(swiftSema PRIVATE -O3) +diff --git a/lib/SwiftRemoteMirror/CMakeLists.txt b/lib/SwiftRemoteMirror/CMakeLists.txt +index f774297e51c..da2248de9f7 100644 +--- a/lib/SwiftRemoteMirror/CMakeLists.txt ++++ b/lib/SwiftRemoteMirror/CMakeLists.txt +@@ -3,6 +3,6 @@ add_swift_host_library(swiftRemoteMirror STATIC + target_link_libraries(swiftRemoteMirror PRIVATE + swiftDemangling) + +-if(CMAKE_SYSTEM_NAME STREQUAL Windows) ++if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + target_compile_definitions(swiftRemoteMirror PRIVATE _LIB) + endif() +diff --git a/stdlib/cmake/modules/AddSwiftStdlib.cmake b/stdlib/cmake/modules/AddSwiftStdlib.cmake +index 25a79d145fb..781d6fd33cf 100644 +--- a/stdlib/cmake/modules/AddSwiftStdlib.cmake ++++ b/stdlib/cmake/modules/AddSwiftStdlib.cmake +@@ -249,7 +249,7 @@ function(_add_target_variant_c_compile_flags) + # NOTE(compnerd) workaround LLVM invoking `add_definitions(-D_DEBUG)` which + # causes failures for the runtime library when cross-compiling due to + # undefined symbols from the standard library. +- if(NOT CMAKE_BUILD_TYPE STREQUAL Debug) ++ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND result "-U_DEBUG") + endif() + endif() +@@ -258,7 +258,7 @@ function(_add_target_variant_c_compile_flags) + # uses a spin lock for this, so to get reasonable behavior we have to + # implement it ourselves using _InterlockedCompareExchange128. + # clang-cl requires us to enable the `cx16` feature to use this intrinsic. +- if(CFLAGS_ARCH STREQUAL x86_64) ++ if(CFLAGS_ARCH STREQUAL "x86_64") + if(SWIFT_COMPILER_IS_MSVC_LIKE) + list(APPEND result /clang:-mcx16) + else() +@@ -287,7 +287,7 @@ function(_add_target_variant_c_compile_flags) + endif() + + if("${CFLAGS_SDK}" STREQUAL "LINUX") +- if(${CFLAGS_ARCH} STREQUAL x86_64) ++ if("${CFLAGS_ARCH}" STREQUAL "x86_64") + # this is the minimum architecture that supports 16 byte CAS, which is necessary to avoid a dependency to libatomic + list(APPEND result "-march=core2") + endif() +@@ -493,7 +493,7 @@ function(_add_target_variant_link_flags) + else() + set(linker "${SWIFT_USE_LINKER}") + endif() +- if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows) ++ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + list(APPEND result "-fuse-ld=${linker}.exe") + else() + list(APPEND result "-fuse-ld=${linker}") +@@ -506,8 +506,8 @@ function(_add_target_variant_link_flags) + # + # TODO: Evaluate/enable -f{function,data}-sections --gc-sections for bfd, + # gold, and lld. +- if(NOT CMAKE_BUILD_TYPE STREQUAL Debug) +- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ++ if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") ++ if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + # See rdar://48283130: This gives 6MB+ size reductions for swift and + # SourceKitService, and much larger size reductions for sil-opt etc. + list(APPEND result "-Wl,-dead_strip") +@@ -969,7 +969,7 @@ function(add_swift_target_library_single target name) + endif() + + set(INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS}) +- if(${libkind} STREQUAL "SHARED") ++ if(libkind STREQUAL "SHARED") + list(APPEND INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS + ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS_SHARED_ONLY}) + endif() +@@ -991,7 +991,7 @@ function(add_swift_target_library_single target name) + # target_sources(${target} + # PRIVATE + # $) +- if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS) ++ if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS") + set(extension .obj) + else() + set(extension .o) +@@ -1059,8 +1059,8 @@ function(add_swift_target_library_single target name) + set_target_properties("${target}" PROPERTIES + LIBRARY_OUTPUT_DIRECTORY ${swiftlib_prefix}/${output_sub_dir} + ARCHIVE_OUTPUT_DIRECTORY ${swiftlib_prefix}/${output_sub_dir}) +- if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS AND SWIFTLIB_SINGLE_IS_STDLIB_CORE +- AND libkind STREQUAL SHARED) ++ if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS" AND SWIFTLIB_SINGLE_IS_STDLIB_CORE ++ AND libkind STREQUAL "SHARED") + add_custom_command(TARGET ${target} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_if_different $ ${swiftlib_prefix}/${output_sub_dir}) + endif() +@@ -1264,8 +1264,8 @@ function(add_swift_target_library_single target name) + MACCATALYST_BUILD_FLAVOR "${SWIFTLIB_SINGLE_MACCATALYST_BUILD_FLAVOR}" + ) + +- if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS) +- if(libkind STREQUAL SHARED) ++ if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS") ++ if(libkind STREQUAL "SHARED") + list(APPEND c_compile_flags -D_WINDLL) + endif() + endif() +@@ -1324,13 +1324,13 @@ function(add_swift_target_library_single target name) + endif() + + # Set compilation and link flags. +- if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS) ++ if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS") + swift_windows_include_for_arch(${SWIFTLIB_SINGLE_ARCHITECTURE} + ${SWIFTLIB_SINGLE_ARCHITECTURE}_INCLUDE) + target_include_directories(${target} SYSTEM PRIVATE + ${${SWIFTLIB_SINGLE_ARCHITECTURE}_INCLUDE}) + +- if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC) ++ if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC") + swift_windows_get_sdk_vfs_overlay(SWIFTLIB_SINGLE_VFS_OVERLAY) + target_compile_options(${target} PRIVATE + "SHELL:-Xclang -ivfsoverlay -Xclang ${SWIFTLIB_SINGLE_VFS_OVERLAY}") +@@ -1347,7 +1347,7 @@ function(add_swift_target_library_single target name) + ${c_compile_flags}) + target_link_options(${target} PRIVATE + ${link_flags}) +- if(${SWIFTLIB_SINGLE_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS) ++ if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_DARWIN_PLATFORMS) + target_link_options(${target} PRIVATE + "LINKER:-compatibility_version,1") + if(SWIFT_COMPILER_VERSION) +@@ -1380,7 +1380,7 @@ function(add_swift_target_library_single target name) + list(APPEND swiftlib_link_flags_all "-Xlinker -no_warn_inits") + endif() + +- if(${SWIFTLIB_SINGLE_SDK} IN_LIST SWIFT_APPLE_PLATFORMS) ++ if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_APPLE_PLATFORMS) + # In the past, we relied on unsetting globally + # CMAKE_OSX_ARCHITECTURES to ensure that CMake + # would not add the -arch flag. This is no longer +@@ -1403,7 +1403,7 @@ function(add_swift_target_library_single target name) + # doing so will result in incorrect symbol resolution and linkage. We created + # import library targets when the library was added. Use that to adjust the + # link libraries. +- if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS AND NOT CMAKE_SYSTEM_NAME STREQUAL Windows) ++ if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS" AND NOT CMAKE_SYSTEM_NAME STREQUAL "Windows") + foreach(library_list LINK_LIBRARIES PRIVATE_LINK_LIBRARIES) + set(import_libraries) + foreach(library ${SWIFTLIB_SINGLE_${library_list}}) +@@ -1415,7 +1415,7 @@ function(add_swift_target_library_single target name) + set(import_library ${library}) + if(TARGET ${library}) + get_target_property(type ${library} TYPE) +- if(${type} STREQUAL "SHARED_LIBRARY") ++ if(type STREQUAL "SHARED_LIBRARY") + set(import_library ${library}_IMPLIB) + endif() + endif() +@@ -1744,7 +1744,7 @@ function(add_swift_target_library name) + list(APPEND SWIFTLIB_SWIFT_MODULE_DEPENDS Core) + + # swiftSwiftOnoneSupport does not depend on itself, obviously. +- if(NOT ${name} STREQUAL swiftSwiftOnoneSupport) ++ if(NOT name STREQUAL "swiftSwiftOnoneSupport") + # All Swift code depends on the SwiftOnoneSupport in non-optimized mode, + # except for the standard library itself. + is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" optimized) +@@ -1851,7 +1851,7 @@ function(add_swift_target_library name) + + # Collect architecture agnostic SDK module dependencies + set(swiftlib_module_depends_flattened ${SWIFTLIB_SWIFT_MODULE_DEPENDS}) +- if(${sdk} STREQUAL OSX) ++ if(sdk STREQUAL "OSX") + if(DEFINED maccatalyst_build_flavor AND NOT maccatalyst_build_flavor STREQUAL "macos-like") + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_MACCATALYST}) +@@ -1863,70 +1863,70 @@ function(add_swift_target_library name) + endif() + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_OSX}) +- elseif(${sdk} STREQUAL IOS OR ${sdk} STREQUAL IOS_SIMULATOR) ++ elseif(sdk STREQUAL "IOS" OR sdk STREQUAL "IOS_SIMULATOR") + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_IOS}) +- elseif(${sdk} STREQUAL TVOS OR ${sdk} STREQUAL TVOS_SIMULATOR) ++ elseif(sdk STREQUAL "TVOS" OR sdk STREQUAL "TVOS_SIMULATOR") + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_TVOS}) +- elseif(${sdk} STREQUAL WATCHOS OR ${sdk} STREQUAL WATCHOS_SIMULATOR) ++ elseif(sdk STREQUAL "WATCHOS" OR sdk STREQUAL "WATCHOS_SIMULATOR") + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WATCHOS}) +- elseif(${sdk} STREQUAL FREESTANDING) ++ elseif(sdk STREQUAL "FREESTANDING") + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_FREESTANDING}) +- elseif(${sdk} STREQUAL FREEBSD) ++ elseif(sdk STREQUAL "FREEBSD") + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_FREEBSD}) +- elseif(${sdk} STREQUAL OPENBSD) ++ elseif(sdk STREQUAL "OPENBSD") + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_OPENBSD}) +- elseif(${sdk} STREQUAL LINUX OR ${sdk} STREQUAL ANDROID) ++ elseif(sdk STREQUAL "LINUX" OR sdk STREQUAL "ANDROID") + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_LINUX}) +- elseif(${sdk} STREQUAL CYGWIN) ++ elseif(sdk STREQUAL "CYGWIN") + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_CYGWIN}) +- elseif(${sdk} STREQUAL HAIKU) ++ elseif(sdk STREQUAL "HAIKU") + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_HAIKU}) +- elseif(${sdk} STREQUAL WASI) ++ elseif(sdk STREQUAL "WASI") + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WASI}) +- elseif(${sdk} STREQUAL WINDOWS) ++ elseif(sdk STREQUAL "WINDOWS") + list(APPEND swiftlib_module_depends_flattened + ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WINDOWS}) + endif() + + # Collect architecture agnostic SDK framework dependencies + set(swiftlib_framework_depends_flattened ${SWIFTLIB_FRAMEWORK_DEPENDS}) +- if(${sdk} STREQUAL OSX) ++ if(sdk STREQUAL "OSX") + list(APPEND swiftlib_framework_depends_flattened + ${SWIFTLIB_FRAMEWORK_DEPENDS_OSX}) +- elseif(${sdk} STREQUAL IOS OR ${sdk} STREQUAL IOS_SIMULATOR OR +- ${sdk} STREQUAL TVOS OR ${sdk} STREQUAL TVOS_SIMULATOR) ++ elseif(sdk STREQUAL "IOS" OR sdk STREQUAL "IOS_SIMULATOR" OR ++ sdk STREQUAL "TVOS" OR sdk STREQUAL "TVOS_SIMULATOR") + list(APPEND swiftlib_framework_depends_flattened + ${SWIFTLIB_FRAMEWORK_DEPENDS_IOS_TVOS}) + endif() + + # Collect architecture agnostic swift compiler flags + set(swiftlib_swift_compile_flags_all ${SWIFTLIB_SWIFT_COMPILE_FLAGS}) +- if(${sdk} STREQUAL OSX) ++ if(sdk STREQUAL "OSX") + list(APPEND swiftlib_swift_compile_flags_all + ${SWIFTLIB_SWIFT_COMPILE_FLAGS_OSX}) +- elseif(${sdk} STREQUAL IOS OR ${sdk} STREQUAL IOS_SIMULATOR) ++ elseif(sdk STREQUAL "IOS" OR sdk STREQUAL "IOS_SIMULATOR") + list(APPEND swiftlib_swift_compile_flags_all + ${SWIFTLIB_SWIFT_COMPILE_FLAGS_IOS}) +- elseif(${sdk} STREQUAL TVOS OR ${sdk} STREQUAL TVOS_SIMULATOR) ++ elseif(sdk STREQUAL "TVOS" OR sdk STREQUAL "TVOS_SIMULATOR") + list(APPEND swiftlib_swift_compile_flags_all + ${SWIFTLIB_SWIFT_COMPILE_FLAGS_TVOS}) +- elseif(${sdk} STREQUAL WATCHOS OR ${sdk} STREQUAL WATCHOS_SIMULATOR) ++ elseif(sdk STREQUAL "WATCHOS" OR sdk STREQUAL "WATCHOS_SIMULATOR") + list(APPEND swiftlib_swift_compile_flags_all + ${SWIFTLIB_SWIFT_COMPILE_FLAGS_WATCHOS}) +- elseif(${sdk} STREQUAL LINUX) ++ elseif(sdk STREQUAL "LINUX") + list(APPEND swiftlib_swift_compile_flags_all + ${SWIFTLIB_SWIFT_COMPILE_FLAGS_LINUX}) +- elseif(${sdk} STREQUAL WINDOWS) ++ elseif(sdk STREQUAL "WINDOWS") + # FIXME: https://github.com/apple/swift/issues/44614 + # static and shared are not mutually exclusive; however since we do a + # single build of the sources, this doesn't work for building both +@@ -1945,7 +1945,7 @@ function(add_swift_target_library name) + + # Collect architecture agnostic SDK linker flags + set(swiftlib_link_flags_all ${SWIFTLIB_LINK_FLAGS}) +- if(${sdk} STREQUAL IOS_SIMULATOR AND ${name} STREQUAL swiftMediaPlayer) ++ if(sdk STREQUAL "IOS_SIMULATOR" AND name STREQUAL "swiftMediaPlayer") + # message("DISABLING AUTOLINK FOR swiftMediaPlayer") + list(APPEND swiftlib_link_flags_all "-Xlinker" "-ignore_auto_link") + endif() +@@ -1959,8 +1959,8 @@ function(add_swift_target_library name) + # back to supported targets and libraries only. This is needed for ELF + # targets only; however, RemoteMirror needs to build with undefined + # symbols. +- if(${SWIFT_SDK_${sdk}_OBJECT_FORMAT} STREQUAL ELF AND +- NOT ${name} STREQUAL swiftRemoteMirror) ++ if(SWIFT_SDK_${sdk}_OBJECT_FORMAT STREQUAL "ELF" AND ++ NOT name STREQUAL "swiftRemoteMirror") + list(APPEND swiftlib_link_flags_all "-Wl,-z,defs") + endif() + # Setting back linker flags which are not supported when making Android build on macOS cross-compile host. +@@ -2067,22 +2067,22 @@ function(add_swift_target_library name) + set(swiftlib_link_flags_all ${SWIFTLIB_LINK_FLAGS}) + + # Collect architecture agnostic c compiler flags +- if(${sdk} STREQUAL OSX) ++ if(sdk STREQUAL "OSX") + list(APPEND swiftlib_c_compile_flags_all + ${SWIFTLIB_C_COMPILE_FLAGS_OSX}) +- elseif(${sdk} STREQUAL IOS OR ${sdk} STREQUAL IOS_SIMULATOR) ++ elseif(sdk STREQUAL "IOS" OR sdk STREQUAL "IOS_SIMULATOR") + list(APPEND swiftlib_c_compile_flags_all + ${SWIFTLIB_C_COMPILE_FLAGS_IOS}) +- elseif(${sdk} STREQUAL TVOS OR ${sdk} STREQUAL TVOS_SIMULATOR) ++ elseif(sdk STREQUAL "TVOS" OR sdk STREQUAL "TVOS_SIMULATOR") + list(APPEND swiftlib_c_compile_flags_all + ${SWIFTLIB_C_COMPILE_FLAGS_TVOS}) +- elseif(${sdk} STREQUAL WATCHOS OR ${sdk} STREQUAL WATCHOS_SIMULATOR) ++ elseif(sdk STREQUAL "WATCHOS" OR sdk STREQUAL "WATCHOS_SIMULATOR") + list(APPEND swiftlib_c_compile_flags_all + ${SWIFTLIB_C_COMPILE_FLAGS_WATCHOS}) +- elseif(${sdk} STREQUAL LINUX) ++ elseif(sdk STREQUAL "LINUX") + list(APPEND swiftlib_c_compile_flags_all + ${SWIFTLIB_C_COMPILE_FLAGS_LINUX}) +- elseif(${sdk} STREQUAL WINDOWS) ++ elseif(sdk STREQUAL "WINDOWS") + list(APPEND swiftlib_c_compile_flags_all + ${SWIFTLIB_C_COMPILE_FLAGS_WINDOWS}) + endif() +@@ -2124,7 +2124,7 @@ function(add_swift_target_library name) + endif() + + # Setting back linker flags which are not supported when making Android build on macOS cross-compile host. +- if(SWIFTLIB_SHARED AND ${sdk} STREQUAL ANDROID) ++ if(SWIFTLIB_SHARED AND sdk STREQUAL "ANDROID") + list(APPEND swiftlib_link_flags_all "-shared") + # TODO: Instead of `lib${name}.so` find variable or target property which already have this value. + list(APPEND swiftlib_link_flags_all "-Wl,-soname,lib${name}.so") +@@ -2181,7 +2181,7 @@ function(add_swift_target_library name) + add_dependencies(${VARIANT_NAME} clang) + endif() + +- if(sdk STREQUAL WINDOWS) ++ if(sdk STREQUAL "WINDOWS") + if(SWIFT_COMPILER_IS_MSVC_LIKE) + if (SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY MATCHES MultiThreadedDebugDLL) + target_compile_options(${VARIANT_NAME} PRIVATE /MDd /D_DLL /D_DEBUG) +@@ -2326,7 +2326,7 @@ function(add_swift_target_library name) + set(optional_arg "OPTIONAL") + endif() + +- if(sdk STREQUAL WINDOWS AND CMAKE_SYSTEM_NAME STREQUAL Windows) ++ if(sdk STREQUAL "WINDOWS" AND CMAKE_SYSTEM_NAME STREQUAL "Windows") + add_dependencies(${SWIFTLIB_INSTALL_IN_COMPONENT} ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH}) + swift_install_in_component(TARGETS ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH} + RUNTIME +@@ -2357,7 +2357,7 @@ function(add_swift_target_library name) + PERMISSIONS ${file_permissions} + "${optional_arg}") + endif() +- if(sdk STREQUAL WINDOWS) ++ if(sdk STREQUAL "WINDOWS") + foreach(arch ${SWIFT_SDK_WINDOWS_ARCHITECTURES}) + if(TARGET ${name}-windows-${arch}_IMPLIB) + get_target_property(import_library ${name}-windows-${arch}_IMPLIB IMPORTED_LOCATION) +@@ -2558,13 +2558,13 @@ function(_add_swift_target_executable_single name) + ${SWIFTEXE_SINGLE_DEPENDS}) + llvm_update_compile_flags("${name}") + +- if(SWIFTEXE_SINGLE_SDK STREQUAL WINDOWS) ++ if(SWIFTEXE_SINGLE_SDK STREQUAL "WINDOWS") + swift_windows_include_for_arch(${SWIFTEXE_SINGLE_ARCHITECTURE} + ${SWIFTEXE_SINGLE_ARCHITECTURE}_INCLUDE) + target_include_directories(${name} SYSTEM PRIVATE + ${${SWIFTEXE_SINGLE_ARCHITECTURE}_INCLUDE}) + +- if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC) ++ if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC") + # MSVC doesn't support -Xclang. We don't need to manually specify + # the dependent libraries as `cl` does so. + target_compile_options(${name} PRIVATE +@@ -2584,7 +2584,7 @@ function(_add_swift_target_executable_single name) + if (SWIFT_PARALLEL_LINK_JOBS) + set_property(TARGET ${name} PROPERTY JOB_POOL_LINK swift_link_job_pool) + endif() +- if(${SWIFTEXE_SINGLE_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS) ++ if(SWIFTEXE_SINGLE_SDK IN_LIST SWIFT_DARWIN_PLATFORMS) + set_target_properties(${name} PROPERTIES + BUILD_WITH_INSTALL_RPATH YES + INSTALL_RPATH "@executable_path/../lib/swift/${SWIFT_SDK_${SWIFTEXE_SINGLE_SDK}_LIB_SUBDIR}") +@@ -2596,7 +2596,7 @@ function(_add_swift_target_executable_single name) + # NOTE(compnerd) use the C linker language to invoke `clang` rather than + # `clang++` as we explicitly link against the C++ runtime. We were previously + # actually passing `-nostdlib++` to avoid the C++ runtime linkage. +- if(${SWIFTEXE_SINGLE_SDK} STREQUAL ANDROID) ++ if(SWIFTEXE_SINGLE_SDK STREQUAL "ANDROID") + set_property(TARGET "${name}" PROPERTY + LINKER_LANGUAGE "C") + else() +@@ -2666,7 +2666,7 @@ function(add_swift_target_executable name) + EXCLUDE_FROM_ALL TRUE) + endif() + +- if(${sdk} IN_LIST SWIFT_APPLE_PLATFORMS) ++ if(sdk IN_LIST SWIFT_APPLE_PLATFORMS) + # In the past, we relied on unsetting globally + # CMAKE_OSX_ARCHITECTURES to ensure that CMake would + # not add the -arch flag +diff --git a/stdlib/cmake/modules/SwiftSource.cmake b/stdlib/cmake/modules/SwiftSource.cmake +index d5d57dfd18a..39c2e07860f 100644 +--- a/stdlib/cmake/modules/SwiftSource.cmake ++++ b/stdlib/cmake/modules/SwiftSource.cmake +@@ -730,7 +730,7 @@ function(_compile_swift_files + + set(line_directive_tool "${SWIFT_SOURCE_DIR}/utils/line-directive") + +- if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows) ++ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + set(HOST_EXECUTABLE_SUFFIX .exe) + endif() + if(SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER) +@@ -748,7 +748,7 @@ function(_compile_swift_files + "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/swiftc${HOST_EXECUTABLE_SUFFIX}" + "${SWIFTFILE_BOOTSTRAPPING}") + +- if(NOT ${SWIFTFILE_BOOTSTRAPPING} STREQUAL "") ++ if(NOT "${SWIFTFILE_BOOTSTRAPPING}" STREQUAL "") + set(target_suffix "-bootstrapping${SWIFTFILE_BOOTSTRAPPING}") + endif() + +@@ -786,7 +786,7 @@ function(_compile_swift_files + # When building the stdlib with bootstrapping, the compiler needs + # to pick up the stdlib from the previous bootstrapping stage, because the + # stdlib in the current stage is not built yet. +- if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_APPLE_PLATFORMS) ++ if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_APPLE_PLATFORMS) + set(set_environment_args "${CMAKE_COMMAND}" "-E" "env" "DYLD_LIBRARY_PATH=${bs_lib_dir}") + elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD") + set(set_environment_args "${CMAKE_COMMAND}" "-E" "env" "LD_LIBRARY_PATH=${bs_lib_dir}") +diff --git a/stdlib/public/Concurrency/CMakeLists.txt b/stdlib/public/Concurrency/CMakeLists.txt +index ff614adce76..76e0694a731 100644 +--- a/stdlib/public/Concurrency/CMakeLists.txt ++++ b/stdlib/public/Concurrency/CMakeLists.txt +@@ -26,14 +26,14 @@ set(SWIFT_RUNTIME_CONCURRENCY_C_FLAGS) + set(SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS) + + set(swift_concurrency_private_link_libraries) +-if(CMAKE_SYSTEM_NAME STREQUAL Windows) ++if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + list(APPEND swift_concurrency_private_link_libraries Synchronization) + endif() + + set(swift_concurrency_incorporate_object_libraries_so swiftThreading) + + if("${SWIFT_CONCURRENCY_GLOBAL_EXECUTOR}" STREQUAL "dispatch") +- if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) ++ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") + include_directories(AFTER + ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE}) + +@@ -61,7 +61,7 @@ endif() + + # Don't emit extended frame info on platforms other than darwin, system + # backtracer and system debugger are unlikely to support it. +-if(CMAKE_SYSTEM_NAME STREQUAL Darwin) ++if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + list(APPEND SWIFT_RUNTIME_CONCURRENCY_C_FLAGS + "-fswift-async-fp=${swift_concurrency_async_fp_mode}") + list(APPEND SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS +diff --git a/stdlib/public/Cxx/std/CMakeLists.txt b/stdlib/public/Cxx/std/CMakeLists.txt +index f24d08b6b62..b805b2ed6cb 100644 +--- a/stdlib/public/Cxx/std/CMakeLists.txt ++++ b/stdlib/public/Cxx/std/CMakeLists.txt +@@ -1,6 +1,6 @@ + set(libstdcxx_modulemap_target_list) + foreach(sdk ${SWIFT_SDKS}) +- if(NOT ${sdk} IN_LIST SWIFT_LIBSTDCXX_PLATFORMS) ++ if(NOT sdk IN_LIST SWIFT_LIBSTDCXX_PLATFORMS) + continue() + endif() + +@@ -86,7 +86,7 @@ foreach(sdk ${SWIFT_SDKS}) + COMPONENT sdk-overlay) + endif() + +- if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*") ++ if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*") + foreach(bootstrapping "0" "1") + get_bootstrapping_path(bootstrapping_dir ${module_dir} ${bootstrapping}) + set(libstdcxx_modulemap_out_bootstrapping "${bootstrapping_dir}/libstdcxx.modulemap") +diff --git a/stdlib/public/Platform/CMakeLists.txt b/stdlib/public/Platform/CMakeLists.txt +index 9063931bd20..757a89eb760 100644 +--- a/stdlib/public/Platform/CMakeLists.txt ++++ b/stdlib/public/Platform/CMakeLists.txt +@@ -42,8 +42,8 @@ set(swiftDarwin_common_options + DEPENDS ${darwin_depends}) + + +-if(${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING" AND +- ${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS) ++if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING" AND ++ SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS) + + set(swiftDarwin_common_bootstrapping_options + ${swiftDarwin_common_options} +@@ -179,7 +179,7 @@ foreach(sdk ${SWIFT_SDKS}) + # with its own native sysroot, create a native modulemap without a sysroot + # prefix. This is the one we'll install instead. + if(NOT "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${arch}_PATH}" STREQUAL "/" AND +- NOT (${sdk} STREQUAL ANDROID AND NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")) ++ NOT (sdk STREQUAL "ANDROID" AND NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL "")) + set(glibc_sysroot_relative_modulemap_out "${module_dir}/sysroot-relative-modulemaps/glibc.modulemap") + + handle_gyb_source_single(glibc_modulemap_native_target +diff --git a/stdlib/public/SwiftOnoneSupport/CMakeLists.txt b/stdlib/public/SwiftOnoneSupport/CMakeLists.txt +index 50efa52b7e1..cf6f09bcf69 100644 +--- a/stdlib/public/SwiftOnoneSupport/CMakeLists.txt ++++ b/stdlib/public/SwiftOnoneSupport/CMakeLists.txt +@@ -10,7 +10,7 @@ set(swiftOnoneSupport_common_options + SWIFT_COMPILE_FLAGS "-parse-stdlib" "-Xllvm" "-sil-inline-generics=false" "-Xfrontend" "-validate-tbd-against-ir=none" "-Xfrontend" "-check-onone-completeness" "-Xfrontend" "-disable-access-control" "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}" "${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}" + LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}") + +-if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND ${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING") ++if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING") + + set(swiftOnoneSupport_common_bootstrapping_options + SHARED +diff --git a/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt b/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt +index c54b2cf84b2..f925940d8a2 100644 +--- a/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt ++++ b/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt +@@ -152,7 +152,7 @@ if(NOT SWIFT_BUILT_STANDALONE) + endforeach() + endif() + +-if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*") ++if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*") + foreach(bootstrapping "0" "1") + get_bootstrapping_path(outdir ${SWIFTLIB_DIR} ${bootstrapping}) + set(target_name "symlink-headers-bootstrapping${bootstrapping}") +diff --git a/stdlib/public/core/CMakeLists.txt b/stdlib/public/core/CMakeLists.txt +index c2217c9f294..be0d826b29d 100644 +--- a/stdlib/public/core/CMakeLists.txt ++++ b/stdlib/public/core/CMakeLists.txt +@@ -251,18 +251,18 @@ set(swift_core_framework_depends) + set(swift_core_private_link_libraries) + set(swift_stdlib_compile_flags "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}") + +-if(SWIFT_PRIMARY_VARIANT_SDK STREQUAL CYGWIN) ++if(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "CYGWIN") + # TODO(compnerd) cache this variable to permit re-configuration + execute_process(COMMAND "cygpath" "-u" "$ENV{SYSTEMROOT}" OUTPUT_VARIABLE ENV_SYSTEMROOT) + list(APPEND swift_core_private_link_libraries "${ENV_SYSTEMROOT}/system32/psapi.dll") +-elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL FREEBSD) ++elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "FREEBSD") + find_library(EXECINFO_LIBRARY execinfo) + list(APPEND swift_core_private_link_libraries ${EXECINFO_LIBRARY}) +-elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL LINUX) ++elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "LINUX") + if(SWIFT_BUILD_STATIC_STDLIB) + list(APPEND swift_core_private_link_libraries) + endif() +-elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL WINDOWS) ++elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "WINDOWS") + list(APPEND swift_core_private_link_libraries shell32;DbgHelp;Synchronization) + endif() + +@@ -331,7 +331,7 @@ set(swiftCore_common_options + set(swiftCore_common_dependencies + copy_shim_headers "${SWIFTLIB_DIR}/shims" ${GROUP_INFO_JSON_FILE}) + +-if(${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING") ++if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING") + + set(b0_deps symlink-headers-bootstrapping0) + set(b1_deps symlink-headers-bootstrapping1) +diff --git a/stdlib/public/runtime/CMakeLists.txt b/stdlib/public/runtime/CMakeLists.txt +index e46c37d626b..db503543b6b 100644 +--- a/stdlib/public/runtime/CMakeLists.txt ++++ b/stdlib/public/runtime/CMakeLists.txt +@@ -163,7 +163,7 @@ foreach(sdk ${SWIFT_SDKS}) + # set(swiftrtObject "$") + set(swiftrtObject ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/swiftImageRegistrationObject${SWIFT_SDK_${sdk}_OBJECT_FORMAT}-${arch_suffix}.dir/SwiftRT-${SWIFT_SDK_${sdk}_OBJECT_FORMAT}.cpp${CMAKE_C_OUTPUT_EXTENSION}) + +- if(sdk STREQUAL WINDOWS) ++ if(sdk STREQUAL "WINDOWS") + set(extension .obj) + else() + set(extension .o) +@@ -209,12 +209,12 @@ foreach(sdk ${SWIFT_SDKS}) + + # Generate the static-stdlib-args.lnk file used by -static-stdlib option for + # 'GenericUnix' (eg linux) +- if(${SWIFT_SDK_${sdk}_OBJECT_FORMAT} STREQUAL ELF) ++ if(SWIFT_SDK_${sdk}_OBJECT_FORMAT STREQUAL "ELF") + string(TOLOWER "${sdk}" lowercase_sdk) + set(libpthread -lpthread) + set(concurrency_libs) + set(android_libraries) +- if(${sdk} STREQUAL ANDROID) ++ if(sdk STREQUAL "ANDROID") + set(android_libraries -llog) + set(libpthread) + elseif(SWIFT_CONCURRENCY_USES_DISPATCH) +diff --git a/stdlib/toolchain/legacy_layouts/CMakeLists.txt b/stdlib/toolchain/legacy_layouts/CMakeLists.txt +index ad18c6b1b32..96da3906821 100644 +--- a/stdlib/toolchain/legacy_layouts/CMakeLists.txt ++++ b/stdlib/toolchain/legacy_layouts/CMakeLists.txt +@@ -55,7 +55,7 @@ foreach(sdk ${SWIFT_SDKS}) + endforeach() + endforeach() + +-if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*") ++if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*") + # The resource dir for bootstrapping0 may be used explicitly + # to cross compile for other architectures, so we would need + # to have all the legacy layouts in there +diff --git a/tools/SourceKit/CMakeLists.txt b/tools/SourceKit/CMakeLists.txt +index f87720f9c80..6c0c0800bc4 100644 +--- a/tools/SourceKit/CMakeLists.txt ++++ b/tools/SourceKit/CMakeLists.txt +@@ -82,7 +82,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") + # Add deployment target to C/C++ compiler and linker flags. + # FIXME: CMAKE_OSX_DEPLOYMENT_TARGET falls over when used for iOS versions. + if (XCODE) +- if (${SOURCEKIT_DEPLOYMENT_OS} MATCHES "^macosx") ++ if (SOURCEKIT_DEPLOYMENT_OS MATCHES "^macosx") + set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET ${SOURCEKIT_DEPLOYMENT_TARGET}) + else() + set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${SOURCEKIT_DEPLOYMENT_TARGET}) +@@ -101,7 +101,7 @@ if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") + endif() + + if(SWIFT_BUILD_HOST_DISPATCH) +- if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS) ++ if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS") + set(SOURCEKIT_RUNTIME_DIR bin) + else() + set(SOURCEKIT_RUNTIME_DIR lib) +@@ -114,7 +114,7 @@ if(SWIFT_BUILD_HOST_DISPATCH) + DESTINATION ${SOURCEKIT_RUNTIME_DIR} + COMPONENT sourcekit-inproc) + endif() +- if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS) ++ if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS") + swift_install_in_component(FILES + $ + $ +diff --git a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake +index 14d9a99a13a..bc26b263848 100644 +--- a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake ++++ b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake +@@ -8,7 +8,7 @@ function(add_sourcekit_default_compiler_flags target) + _add_host_variant_link_flags(${target}) + + # Set compilation and link flags. +- if(${SWIFT_HOST_VARIANT_SDK} STREQUAL WINDOWS) ++ if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS") + swift_windows_include_for_arch(${SWIFT_HOST_VARIANT_ARCH} + ${SWIFT_HOST_VARIANT_ARCH}_INCLUDE) + target_include_directories(${target} SYSTEM PRIVATE +@@ -30,7 +30,7 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES) + endif() + endif() + +- if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS) ++ if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS) + + # Lists of rpaths that we are going to add to our executables. + # +@@ -118,7 +118,7 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES) + + elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD" AND HAS_SWIFT_MODULES AND ASKD_BOOTSTRAPPING_MODE) + set(swiftrt "swiftImageRegistrationObject${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_OBJECT_FORMAT}-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}") +- if(${ASKD_BOOTSTRAPPING_MODE} MATCHES "HOSTTOOLS|CROSSCOMPILE") ++ if(ASKD_BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE") + # At build time and run time, link against the swift libraries in the + # installed host toolchain. + get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY) +@@ -163,7 +163,7 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES) + # able to fall back to the SDK directory for libswiftCore et al. + if (BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*") + if (NOT "${bootstrapping}" STREQUAL "1") +- if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS) ++ if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS) + target_link_directories(${target} PRIVATE "${sdk_dir}") + + # Include the abi stable system stdlib in our rpath. +diff --git a/tools/SourceKit/lib/Support/CMakeLists.txt b/tools/SourceKit/lib/Support/CMakeLists.txt +index c4e2cbcd31e..a47b2347a12 100644 +--- a/tools/SourceKit/lib/Support/CMakeLists.txt ++++ b/tools/SourceKit/lib/Support/CMakeLists.txt +@@ -9,7 +9,7 @@ target_link_libraries(SourceKitSupport PRIVATE + swiftBasic + clangBasic + clangRewrite) +-if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) ++if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_link_libraries(SourceKitSupport INTERFACE + dispatch + BlocksRuntime) +diff --git a/tools/SourceKit/tools/complete-test/CMakeLists.txt b/tools/SourceKit/tools/complete-test/CMakeLists.txt +index ec3437650a0..d1b3fe3b36a 100644 +--- a/tools/SourceKit/tools/complete-test/CMakeLists.txt ++++ b/tools/SourceKit/tools/complete-test/CMakeLists.txt +@@ -7,13 +7,13 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY) + else() + target_link_libraries(complete-test PRIVATE sourcekitd) + endif() +-if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) ++if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_link_libraries(complete-test PRIVATE + dispatch + BlocksRuntime) + endif() + +-if(CMAKE_SYSTEM_NAME STREQUAL Darwin) ++if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set_target_properties(complete-test PROPERTIES + INSTALL_RPATH "@executable_path/../lib") + target_link_options(complete-test PRIVATE +diff --git a/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt b/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt +index d4a3a77df2a..f537ad74544 100644 +--- a/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt ++++ b/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt +@@ -7,7 +7,7 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY) + else() + target_link_libraries(sourcekitd-repl PRIVATE sourcekitd) + endif() +-if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) ++if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_link_libraries(sourcekitd-repl PRIVATE + dispatch + BlocksRuntime) +@@ -15,7 +15,7 @@ endif() + target_link_libraries(sourcekitd-repl PRIVATE + libedit) + +-if(CMAKE_SYSTEM_NAME STREQUAL Darwin) ++if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set_target_properties(sourcekitd-repl PROPERTIES + INSTALL_RPATH "@executable_path/../lib") + target_link_options(sourcekitd-repl PRIVATE +diff --git a/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt b/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt +index 91c28f371c4..e5f7aa5c9fb 100644 +--- a/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt ++++ b/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt +@@ -17,7 +17,7 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY) + else() + target_link_libraries(sourcekitd-test PRIVATE sourcekitd) + endif() +-if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) ++if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") + target_link_libraries(sourcekitd-test PRIVATE + dispatch + BlocksRuntime) +@@ -25,7 +25,7 @@ endif() + + add_dependencies(sourcekitd-test sourcekitdTestOptionsTableGen) + +-if(CMAKE_SYSTEM_NAME STREQUAL Darwin) ++if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + set_target_properties(sourcekitd-test PROPERTIES + INSTALL_RPATH "@executable_path/../lib") + target_link_options(sourcekitd-test PRIVATE +diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt +index 4521356ffc6..ab6dad7b273 100644 +--- a/tools/driver/CMakeLists.txt ++++ b/tools/driver/CMakeLists.txt +@@ -10,7 +10,7 @@ function(add_swift_parser_link_libraries target) + endif() + endfunction() + +-if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*") ++if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*") + + # Bootstrapping - level 0 + # For more information on how bootstrapping works, see docs/SwiftInTheCompiler.md +diff --git a/tools/libSwiftScan/CMakeLists.txt b/tools/libSwiftScan/CMakeLists.txt +index f11c2a99758..93beb4629b0 100644 +--- a/tools/libSwiftScan/CMakeLists.txt ++++ b/tools/libSwiftScan/CMakeLists.txt +@@ -8,7 +8,7 @@ add_swift_host_library(libSwiftScan SHARED + libSwiftScan.cpp + c-include-check.c) + +-if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS) ++if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS) + # Workaround for a linker crash related to autolinking: rdar://77839981 + set_property(TARGET libSwiftScan APPEND_STRING PROPERTY + LINK_FLAGS " -lobjc ") +diff --git a/unittests/Basic/CMakeLists.txt b/unittests/Basic/CMakeLists.txt +index 547751e6cac..10b413ce732 100644 +--- a/unittests/Basic/CMakeLists.txt ++++ b/unittests/Basic/CMakeLists.txt +@@ -49,6 +49,6 @@ target_link_libraries(SwiftBasicTests + LLVMTestingSupport + ) + +-if(SWIFT_HOST_VARIANT STREQUAL windows) ++if(SWIFT_HOST_VARIANT STREQUAL "windows") + target_link_libraries(SwiftBasicTests PRIVATE Synchronization) + endif() +diff --git a/unittests/Threading/CMakeLists.txt b/unittests/Threading/CMakeLists.txt +index 5e0f27c089d..239630d038c 100644 +--- a/unittests/Threading/CMakeLists.txt ++++ b/unittests/Threading/CMakeLists.txt +@@ -14,7 +14,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND + swiftCore${SWIFT_PRIMARY_VARIANT_SUFFIX} + ) + +- if(SWIFT_HOST_VARIANT STREQUAL windows) ++ if(SWIFT_HOST_VARIANT STREQUAL "windows") + target_link_libraries(SwiftThreadingTests PRIVATE Synchronization) + endif() + endif() +diff --git a/unittests/runtime/CMakeLists.txt b/unittests/runtime/CMakeLists.txt +index 79df463c0ed..cef40263785 100644 +--- a/unittests/runtime/CMakeLists.txt ++++ b/unittests/runtime/CMakeLists.txt +@@ -63,7 +63,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND + list(APPEND PLATFORM_TARGET_LINK_LIBRARIES + ${EXECINFO_LIBRARY} + ) +- elseif(SWIFT_HOST_VARIANT STREQUAL windows) ++ elseif(SWIFT_HOST_VARIANT STREQUAL "windows") + list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp;Synchronization) + endif() + +diff --git a/unittests/runtime/LongTests/CMakeLists.txt b/unittests/runtime/LongTests/CMakeLists.txt +index 592e532f8cf..37b5e00714e 100644 +--- a/unittests/runtime/LongTests/CMakeLists.txt ++++ b/unittests/runtime/LongTests/CMakeLists.txt +@@ -30,7 +30,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND + list(APPEND PLATFORM_TARGET_LINK_LIBRARIES + ${EXECINFO_LIBRARY} + ) +- elseif(SWIFT_HOST_VARIANT STREQUAL windows) ++ elseif(SWIFT_HOST_VARIANT STREQUAL "windows") + list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp;Synchronization) + endif() + +diff --git a/utils/api_checker/CMakeLists.txt b/utils/api_checker/CMakeLists.txt +index e664a73ddd9..fea720f6095 100644 +--- a/utils/api_checker/CMakeLists.txt ++++ b/utils/api_checker/CMakeLists.txt +@@ -16,7 +16,7 @@ set(SWIFTLIB_DIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/swift") + set(dest "${SWIFTLIB_DIR}/${framework}") + set(source "${CMAKE_CURRENT_SOURCE_DIR}/${framework}") + +-if(CMAKE_SYSTEM_NAME STREQUAL Windows) ++if(CMAKE_SYSTEM_NAME STREQUAL "Windows") + set(CMAKE_SYMLINK_COMMAND copy) + else() + set(CMAKE_SYMLINK_COMMAND create_symlink) diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-darwin-libcxx-flags.patch b/pkgs/development/compilers/swift/compiler/patches/swift-darwin-libcxx-flags.patch new file mode 100644 index 000000000000..c2b5adafa592 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-darwin-libcxx-flags.patch @@ -0,0 +1,63 @@ +On Darwin, the SDK is a directory of stubs, and libc++ lives separately. We +need to patch the CMake files in several places to make the build for C++ +interop succeed. The required flags can be read from cc-wrapper support files. + +--- a/SwiftCompilerSources/CMakeLists.txt ++++ b/SwiftCompilerSources/CMakeLists.txt +@@ -105,18 +105,11 @@ function(add_swift_compiler_modules_library name) + get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY) + set(sdk_option ${sdk_option} "-resource-dir" "${swift_exec_bin_dir}/../bootstrapping0/lib/swift") + endif() +- if(NOT EXISTS "${sdk_path}/usr/include/c++") +- # Darwin SDKs in Xcode 12 or older do not include libc++, which prevents clang from finding libc++ when invoked +- # from ClangImporter. This results in build errors. To workaround this, let's explicitly pass the path to libc++ +- # to clang. +- message(WARNING "Building with an outdated Darwin SDK: libc++ missing from the ${SWIFT_HOST_VARIANT_SDK} SDK. Will use libc++ from the toolchain.") +- get_filename_component(absolute_libcxx_path "${CMAKE_C_COMPILER}/../../include/c++/v1" REALPATH) +- if (EXISTS "${absolute_libcxx_path}") +- set(sdk_option ${sdk_option} "-Xcc" "-isystem" "-Xcc" "${absolute_libcxx_path}") +- else() +- message(ERROR "libc++ not found in the toolchain.") +- endif() +- endif() ++ file(READ "$ENV{NIX_CC}/nix-support/libcxx-cxxflags" nix_libcxx_cxxflags) ++ separate_arguments(nix_libcxx_cxxflags) ++ foreach(nix_libcxx_cxxflag ${nix_libcxx_cxxflags}) ++ set(sdk_option ${sdk_option} "-Xcc" "${nix_libcxx_cxxflag}") ++ endforeach() + elseif(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE") + set(sdk_option "-sdk" "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}") + get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY) +--- a/cmake/modules/SwiftConfigureSDK.cmake ++++ b/cmake/modules/SwiftConfigureSDK.cmake +@@ -270,6 +270,18 @@ macro(configure_sdk_darwin + # Add this to the list of known SDKs. + list(APPEND SWIFT_CONFIGURED_SDKS "${prefix}") + ++ set(cxx_overlay_opt "") ++ if("${prefix}" STREQUAL "OSX") ++ file(READ "$ENV{NIX_CC}/nix-support/libcxx-cxxflags" nix_libcxx_cxxflags) ++ separate_arguments(nix_libcxx_cxxflags) ++ foreach(nix_libcxx_cxxflag ${nix_libcxx_cxxflags}) ++ set(cxx_overlay_opt ${cxx_overlay_opt} "-Xcc" "${nix_libcxx_cxxflag}") ++ endforeach() ++ endif() ++ set(SWIFT_SDK_${prefix}_CXX_OVERLAY_SWIFT_COMPILE_FLAGS ++ ${cxx_overlay_opt} ++ CACHE STRING "Extra flags for compiling the C++ overlay") ++ + _report_sdk("${prefix}") + endmacro() + +--- a/stdlib/public/Cxx/std/CMakeLists.txt ++++ b/stdlib/public/Cxx/std/CMakeLists.txt +@@ -145,6 +145,9 @@ add_swift_target_library(swiftstd STATIC NO_LINK_NAME IS_STDLIB + SWIFT_COMPILE_FLAGS_LINUX + ${SWIFT_SDK_LINUX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS} + ++ SWIFT_COMPILE_FLAGS_OSX ++ ${SWIFT_SDK_OSX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS} ++ + LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}" + TARGET_SDKS ALL_APPLE_PLATFORMS LINUX + INSTALL_IN_COMPONENT compiler diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-darwin-link-cxxabi.patch b/pkgs/development/compilers/swift/compiler/patches/swift-darwin-link-cxxabi.patch new file mode 100644 index 000000000000..dad9b3285dc1 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-darwin-link-cxxabi.patch @@ -0,0 +1,14 @@ +This patches the stdlib backdeploy static lib to have its users link c++abi. +Without this, later steps that try to link this fail looking for global +new/delete operators (__Znwm/__ZdlPv). + +--- a/stdlib/toolchain/Compatibility56/Overrides.cpp ++++ b/stdlib/toolchain/Compatibility56/Overrides.cpp +@@ -23,6 +23,7 @@ + using namespace swift; + + __asm__ (".linker_option \"-lc++\""); ++__asm__ (".linker_option \"-lc++abi\""); + + #define OVERRIDE(name, ret, attrs, ccAttrs, namespace, typedArgs, namedArgs) \ + Override_ ## name name; diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-libc-paths.patch b/pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-libc-paths.patch new file mode 100644 index 000000000000..02cdeb368bb7 --- /dev/null +++ b/pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-libc-paths.patch @@ -0,0 +1,48 @@ +This code injects an LLVM modulemap for glibc and libstdc++ by overriding +specific VFS paths. In order to do that, it needs to know the actual locations +of glibc and libstdc++, but it only searches `-sysroot` and fails. Here we +patch it to also consider `-idirafter` and `-isystem` as added by cc-wrapper. + +--- a/lib/ClangImporter/ClangIncludePaths.cpp ++++ b/lib/ClangImporter/ClangIncludePaths.cpp +@@ -120,6 +120,7 @@ static clang::driver::Driver createClangDriver(const ASTContext &ctx) { + /// \return a path without dots (`../`, './'). + static llvm::Optional + findFirstIncludeDir(const llvm::opt::InputArgList &args, ++ const llvm::opt::ArgList &DriverArgs, + const ArrayRef expectedFileNames) { + // C++ stdlib paths are added as `-internal-isystem`. + std::vector includeDirs = +@@ -128,6 +129,14 @@ findFirstIncludeDir(const llvm::opt::InputArgList &args, + llvm::append_range(includeDirs, + args.getAllArgValues( + clang::driver::options::OPT_internal_externc_isystem)); ++ // Nix adds the C stdlib include path using `-idirafter`. ++ llvm::append_range(includeDirs, ++ DriverArgs.getAllArgValues( ++ clang::driver::options::OPT_idirafter)); ++ // Nix adds the C++ stdlib include path using `-isystem`. ++ llvm::append_range(includeDirs, ++ DriverArgs.getAllArgValues( ++ clang::driver::options::OPT_isystem)); + + for (const auto &includeDir : includeDirs) { + Path dir(includeDir); +@@ -193,7 +202,7 @@ getGlibcFileMapping(ASTContext &ctx) { + // Ideally we would check that all of the headers referenced from the + // modulemap are present. + Path glibcDir; +- if (auto dir = findFirstIncludeDir(parsedIncludeArgs, ++ if (auto dir = findFirstIncludeDir(parsedIncludeArgs, clangDriverArgs, + {"inttypes.h", "unistd.h", "stdint.h"})) { + glibcDir = dir.value(); + } else { +@@ -251,7 +260,7 @@ getLibStdCxxFileMapping(ASTContext &ctx) { + auto parsedStdlibArgs = parseClangDriverArgs(clangDriver, stdlibArgStrings); + + Path cxxStdlibDir; +- if (auto dir = findFirstIncludeDir(parsedStdlibArgs, ++ if (auto dir = findFirstIncludeDir(parsedStdlibArgs, clangDriverArgs, + {"cstdlib", "string", "vector"})) { + cxxStdlibDir = dir.value(); + } else { diff --git a/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch b/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch index a68326c580b1..b67286a5d1c3 100644 --- a/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch +++ b/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch @@ -7,15 +7,15 @@ second (ToolChains.cpp) happens when Swift is used to link the final product. --- a/lib/ClangImporter/ClangImporter.cpp +++ b/lib/ClangImporter/ClangImporter.cpp -@@ -68,6 +68,7 @@ +@@ -73,6 +73,7 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/Memory.h" #include "llvm/Support/Path.h" +#include "llvm/Support/Process.h" + #include "llvm/Support/VirtualFileSystem.h" #include "llvm/Support/YAMLParser.h" - #include "llvm/Support/YAMLTraits.h" #include -@@ -809,6 +810,17 @@ importer::addCommonInvocationArguments( +@@ -786,6 +787,17 @@ importer::addCommonInvocationArguments( const std::string &overrideResourceDir = importerOpts.OverrideResourceDir; if (overrideResourceDir.empty()) { @@ -33,7 +33,7 @@ second (ToolChains.cpp) happens when Swift is used to link the final product. llvm::SmallString<128> resourceDir(searchPathOpts.RuntimeResourcePath); // Adjust the path to refer to our copy of the Clang resource directory -@@ -824,6 +836,7 @@ importer::addCommonInvocationArguments( +@@ -801,6 +813,7 @@ importer::addCommonInvocationArguments( // Set the Clang resource directory to the path we computed. invocationArgStrs.push_back("-resource-dir"); invocationArgStrs.push_back(std::string(resourceDir.str())); @@ -43,7 +43,7 @@ second (ToolChains.cpp) happens when Swift is used to link the final product. invocationArgStrs.push_back(overrideResourceDir); --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp -@@ -1372,10 +1372,20 @@ void ToolChain::getClangLibraryPath(const ArgList &Args, +@@ -1393,10 +1393,20 @@ void ToolChain::getClangLibraryPath(const ArgList &Args, SmallString<128> &LibPath) const { const llvm::Triple &T = getTriple(); diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index e8eb4d738ca9..3012c9a2f177 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -2,7 +2,7 @@ , pkgs , newScope , darwin -, llvmPackages_latest +, llvmPackages_15 , overrideCC }: @@ -15,20 +15,21 @@ let # Re-export this so we can rely on the minimum Swift SDK elsewhere. apple_sdk = pkgs.darwin.apple_sdk_11_0; - # Our current Clang on Darwin is v11, but we need at least v12. The - # following applies the newer Clang with the same libc overrides as - # `apple_sdk.stdenv`. + # Swift builds its own Clang for internal use. We wrap that clang with a + # cc-wrapper derived from the clang configured below. Because cc-wrapper + # applies a specific resource-root, the two versions are best matched, or + # we'll often run into compilation errors. # - # If 'latest' becomes an issue, recommend replacing it with v14, which is - # currently closest to the official Swift builds. + # The following selects the correct Clang version, matching the version + # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`. clang = if pkgs.stdenv.isDarwin then - llvmPackages_latest.clang.override rec { + llvmPackages_15.clang.override rec { libc = apple_sdk.Libsystem; bintools = pkgs.bintools.override { inherit libc; }; } else - llvmPackages_latest.clang; + llvmPackages_15.clang; # Overrides that create a useful environment for swift packages, allowing # packaging with `swiftPackages.callPackage`. These are similar to diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix index deb82de20add..d279fc400cb0 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -6,6 +6,7 @@ , swiftpm2nix , Foundation , XCTest +, pkg-config , sqlite , ncurses , CryptoKit @@ -31,6 +32,7 @@ stdenv.mkDerivation { buildInputs = [ Foundation XCTest + pkg-config sqlite ncursesInput ] diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix index fbc898142f78..d753f378946a 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix +++ b/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix @@ -2,15 +2,16 @@ { workspaceStateFile = ./workspace-state.json; hashes = { - "indexstore-db" = "05d7l3fgcvbw8plaky3pgjm03x20a63z9r14njxg5qm2zcp5m6jx"; + "indexstore-db" = "0lf96m82s8f6lv67wbcnm9ii01fgw4bsr4vn2xp07ydfj1iqy8il"; "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw"; "swift-collections" = "1k6sjx5rqmp3gklny77b480hyzy6gkhpi23r0s8ljfbrcwawgnan"; - "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313"; - "swift-driver" = "1lcb5wqragc74nd0fjnk47lyph9hs0i9cps1mplvp2i91yzjqk05"; - "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h"; - "swift-package-manager" = "0a3vahdkj35n0dkinwcgybgfb9dnq2lq1nknn874r38xbj3mhlff"; + "swift-crypto" = "0kllp7j0hd8k67l9b9zr2c3ddc5bvshldchzivhcz3q31qvq9ag8"; + "swift-driver" = "0cbvddj54k3sbw0vzlmzhccs7h43hi5kq6i3n2i0mysz3bf0c6zg"; + "swift-llbuild" = "106vnssh6pgy5s9dnq1hi1c9v2wkfydqgncg5dy7c9n23iisjy3s"; + "swift-package-manager" = "1d1ngh7da42dm0rwkw7jzxa63a1rpc88wimm85w2j59cm446pk9k"; + "swift-syntax" = "05394mzznmcrw246lyzsjsn1fmilj98jgkjyyxr2ynhnbgzp2jl2"; "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7"; - "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz"; - "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45"; + "swift-tools-support-core" = "1qvblyiazv58qwyxgyk2dh5ymbab3y70vm2q81qs6rmv43hs8ciz"; + "Yams" = "0b4lprxl4f6yqq0djnp394mxgmsxm2pljr7fh4f6ihdhnpwfsfvl"; }; } diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json b/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json index af73c7553946..b2659770cc7a 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json +++ b/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json @@ -12,8 +12,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "9305648b0a8700434fa2e55eeacf7c7f4402a0d5" + "branch": "release/5.8", + "revision": "6caa12ab3bb6245eee4e09dce7677e64720c6545" }, "name": "sourceControlCheckout" }, @@ -63,8 +63,8 @@ }, "state": { "checkoutState": { - "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5", - "version": "1.1.7" + "revision": "75ec60b8b4cc0f085c3ac414f3dca5625fa3588e", + "version": "2.2.4" }, "name": "sourceControlCheckout" }, @@ -80,8 +80,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "82b274af66cfbb8f3131677676517b34d01e30fd" + "branch": "release/5.8", + "revision": "7cfe0c0b6e6297efe88a3ce34e6138ee7eda969e" }, "name": "sourceControlCheckout" }, @@ -97,8 +97,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b" + "branch": "release/5.8", + "revision": "dccfc2e127a34b89a849407594cf2d604b598ba9" }, "name": "sourceControlCheckout" }, @@ -114,13 +114,30 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "c6e40adbfc78acc60ca464ae482b56442f9f34f4" + "branch": "release/5.8", + "revision": "6651d98a4ce3c6faa82768256ca286412bf4a04d" }, "name": "sourceControlCheckout" }, "subpath": "swift-package-manager" }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-syntax", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-syntax.git", + "name": "SwiftSyntax" + }, + "state": { + "checkoutState": { + "branch": "release/5.8", + "revision": "cd793adf5680e138bf2bcbaacc292490175d0dcd" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-syntax" + }, { "basedOn": null, "packageRef": { @@ -148,8 +165,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3" + "branch": "release/5.8", + "revision": "ac4871e01ef338cb95b5d28328cab0ec1dfae935" }, "name": "sourceControlCheckout" }, @@ -165,8 +182,8 @@ }, "state": { "checkoutState": { - "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", - "version": "4.0.6" + "revision": "f47ba4838c30dbd59998a4e4c87ab620ff959e8a", + "version": "5.0.5" }, "name": "sourceControlCheckout" }, @@ -174,5 +191,5 @@ } ] }, - "version": 5 + "version": 6 } diff --git a/pkgs/development/compilers/swift/sources.nix b/pkgs/development/compilers/swift/sources.nix index c3b2fb60a7fc..739fe8254f30 100644 --- a/pkgs/development/compilers/swift/sources.nix +++ b/pkgs/development/compilers/swift/sources.nix @@ -5,20 +5,21 @@ let # These packages are all part of the Swift toolchain, and have a single # upstream version that should match. We also list the hashes here so a basic # version upgrade touches only this file. - version = "5.7.3"; + version = "5.8"; hashes = { - llvm-project = "sha256-IDtLPe0sXamnmovbFVKvmDMnci4u/A0urAPjWTYwJCo="; - sourcekit-lsp = "sha256-BT6+VCBSupKOg2mXo6HlkvNRc8pVZU772Mj3LKFamsU="; - swift = "sha256-essP2eIp1sLuROqk0OKGBPfJnvnyAW0moMk0cX1IVQQ="; - swift-cmark = "sha256-f0BoTs4HYdx/aJ9HIGCWMalhl8PvClWD6R4QK3qSgAw="; - swift-corelibs-foundation = "sha256-g78zKSq/b/pVFAD2k2SoMpzJQIpkxMvZOaSz5JPaQmA="; - swift-corelibs-libdispatch = "sha256-1qbXiC1k9+T+L6liqXKg6EZXqem6KEEx8OctuL4Kb2o="; - swift-corelibs-xctest = "sha256-qLUO9/3tkJWorDMEHgHd8VC3ovLLq/UWXJWMtb6CMN0="; - swift-docc = "sha256-WlXJMAnrlVPCM+iCIhG0Gyho76BsC2yVBEpX3m/WiIQ="; - swift-docc-render-artifact = "sha256-ttdurN/K7OX+I4577jG3YGeRs+GLUTc7BiiEZGmFD+s="; - swift-driver = "sha256-BUwsvw8pirvprUFfliLQMMHr6SHTSgeaJYc9lTEvi9E="; - swift-experimental-string-processing = "sha256-W0cQBkdR3A0hrV75Wwm0YULUDVg1bjT0O5w5VGBYDJs="; - swift-package-manager = "sha256-zlFYh1wdjUwOsnbagKnAtqXl3vKPcRtnA7YMORtUeyg="; + llvm-project = "sha256-0xwSAwwkzFgYO3mY1rHqV8TCeH2NpM7m3VUkCDqjcdE="; + sourcekit-lsp = "sha256-XDGq64LbpgBrRy3IvZNgsoLUePXECK5p10vQ8cUKeGE="; + swift = "sha256-EY2IImBCVLiUutvDQjNUiInwCNxZsCu1mZzYSjNd4+A="; + swift-cmark = "sha256-6xkO9kN6eXMAigjk+KyIgVhTyC50BxmkZmD4+9z6nz8="; + swift-corelibs-foundation = "sha256-yRjjxJRy1eTM9VG7/Fn60UMghPavsaoueH0V8cjaIyM="; + swift-corelibs-libdispatch = "sha256-XOAWuaGqWJtxhGIPXYT3PIvk5OK0rkY4g1IOybJUlm4="; + swift-corelibs-xctest = "sha256-uwxQhKUQ1xp5ao6kfkdlYOvMr6yAb5IaBIdOfoyf+n8="; + swift-docc = "sha256-k1ygYDZwF4Jo7iOkHxc/3NzfgN+8XNCks5aizxBgPjM="; + swift-docc-render-artifact = "sha256-vdSyICXOjlNSjZXzPRxa/5305pg6PG4xww9GYEV9m10="; + swift-driver = "sha256-7xsG3Bpf+wqisCMaPEuEg8CjGYO/0r8BX3pMUmRrezE="; + swift-experimental-string-processing = "sha256-ioXG6pQKjlAc2oF38Z7TGighyZN8w2ZAAtFUq83Ow6Q="; + swift-package-manager = "sha256-xd6ZpeXfMoHyVrJxz6XcDLPKBvc2nl1lgWXuLrJdq+E="; + swift-syntax = "sha256-gkpx/1sWWi9y917OJ1GSNFYXrJb6e2qI4JlV+38laRQ="; }; # Create fetch derivations. diff --git a/pkgs/development/compilers/swift/swift-docc/default.nix b/pkgs/development/compilers/swift/swift-docc/default.nix index f85512f84071..1c8cf4f3736f 100644 --- a/pkgs/development/compilers/swift/swift-docc/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/default.nix @@ -28,6 +28,12 @@ stdenv.mkDerivation { configurePhase = generated.configure; + # We only install the docc binary, so don't need the other products. + # This works around a failure building generate-symbol-graph: + # Sources/generate-symbol-graph/main.swift:13:18: error: module 'SwiftDocC' was not compiled for testing + # TODO: Figure out the cause. It doesn't seem to happen outside Nixpkgs. + swiftpmFlags = "--product docc"; + # TODO: Tests depend on indexstore-db being provided by an existing Swift # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc. #doCheck = true; diff --git a/pkgs/development/compilers/swift/swift-docc/generated/default.nix b/pkgs/development/compilers/swift/swift-docc/generated/default.nix index bcd873a44f89..47822ca40bb4 100644 --- a/pkgs/development/compilers/swift/swift-docc/generated/default.nix +++ b/pkgs/development/compilers/swift/swift-docc/generated/default.nix @@ -2,14 +2,13 @@ { workspaceStateFile = ./workspace-state.json; hashes = { - "swift-argument-parser" = "070gip241dgn3d0nxgwxva4vp6kbnf11g01q5yaq6kmflcmz58f2"; - "swift-cmark" = "0xfchdgls3070z16in8ks69y8fpiajmyk7lmp5h7ym7164isa6bb"; - "swift-crypto" = "0h054rq14jyg94aiymmp37vqz60a13dlczp5g09pln724j4ypv92"; + "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw"; + "swift-cmark" = "1qswlh6j9mlfq8qj7xfqspla7w7rrzvplgcs4mgllgi012yfgwnp"; + "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313"; "swift-docc-plugin" = "11d6nhi139yzk1lxxrixsbgyj1bnvmh40wj30y725q83nqq49ljh"; - "swift-docc-symbolkit" = "14hb2wc09hisf2r2yny17z28z0m58cf4lnqaczad2x2hk4s1iayi"; - "swift-lmdb" = "1m5y6x2vs1wflcv2c57rx87gh12sy0hkwy5iy9inxmda2mcs8qcb"; - "swift-markdown" = "09270bfrwlp904cma29hsbhr1p25v8kwgvhcfi7lg2av7aaknd97"; + "swift-docc-symbolkit" = "14w37wzbx1mygfwm4iv0ypj120n1axhk627rg5a7v8j0ln511r7s"; + "swift-lmdb" = "0azmc24mnxn4pbda8w8v7hy3h0gqqm4br43pnr7lc4sfj3dcv43m"; + "swift-markdown" = "1l4ydc0xyv88gnyc33p61qavdh8cv98c548n1icphrfd6i78yygw"; "swift-nio" = "04bvay94b34ynmlvgyl9a7f431l3cf8k2zr483spv8mvyh1hxiqn"; - "swift-nio-ssl" = "1ak4aldilmz0pnfgbwq1x4alr38nfyvx2pz7p2vi2plf82da80g5"; }; } diff --git a/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json b/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json index ced9a6df956c..699de93f7907 100644 --- a/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json +++ b/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json @@ -12,8 +12,8 @@ }, "state": { "checkoutState": { - "revision": "d2930e8fcf9c33162b9fcc1d522bc975e2d4179b", - "version": "1.0.1" + "revision": "e394bf350e38cb100b6bc4172834770ede1b7232", + "version": "1.0.3" }, "name": "sourceControlCheckout" }, @@ -29,8 +29,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7-gfm", - "revision": "792c1c3326327515ce9bf64c44196b7f4daab9a6" + "branch": "gfm", + "revision": "eb9a6a357b6816c68f4b194eaa5b67f3cd1fa5c3" }, "name": "sourceControlCheckout" }, @@ -46,8 +46,8 @@ }, "state": { "checkoutState": { - "revision": "9680b7251cd2be22caaed8f1468bd9e8915a62fb", - "version": "1.1.2" + "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5", + "version": "1.1.7" }, "name": "sourceControlCheckout" }, @@ -80,8 +80,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "8682202025906dce29a8b04f9263f40ba87b89d8" + "branch": "main", + "revision": "b45d1f2ed151d057b54504d653e0da5552844e34" }, "name": "sourceControlCheckout" }, @@ -97,8 +97,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "6ea45a7ebf6d8f72bd299dfcc3299e284bbb92ee" + "branch": "main", + "revision": "584941b1236b15bad74d8163785d389c028b1ad8" }, "name": "sourceControlCheckout" }, @@ -114,8 +114,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "d6cd065a7e4b6c3fad615dcd39890e095a2f63a2" + "branch": "main", + "revision": "d491147940587dbadfb3472354f4d0c6e063e061" }, "name": "sourceControlCheckout" }, @@ -137,25 +137,8 @@ "name": "sourceControlCheckout" }, "subpath": "swift-nio" - }, - { - "basedOn": null, - "packageRef": { - "identity": "swift-nio-ssl", - "kind": "remoteSourceControl", - "location": "https://github.com/apple/swift-nio-ssl.git", - "name": "swift-nio-ssl" - }, - "state": { - "checkoutState": { - "revision": "2e74773972bd6254c41ceeda827f229bccbf1c0f", - "version": "2.15.0" - }, - "name": "sourceControlCheckout" - }, - "subpath": "swift-nio-ssl" } ] }, - "version": 5 + "version": 6 } diff --git a/pkgs/development/compilers/swift/swift-driver/generated/default.nix b/pkgs/development/compilers/swift/swift-driver/generated/default.nix index 760e8156c43f..cb6f3cca078e 100644 --- a/pkgs/development/compilers/swift/swift-driver/generated/default.nix +++ b/pkgs/development/compilers/swift/swift-driver/generated/default.nix @@ -2,10 +2,10 @@ { workspaceStateFile = ./workspace-state.json; hashes = { - "swift-argument-parser" = "11did5snqj8chcbdbiyx84mpif940ls2pr1iikwivvfp63i248hm"; - "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h"; + "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw"; + "swift-llbuild" = "106vnssh6pgy5s9dnq1hi1c9v2wkfydqgncg5dy7c9n23iisjy3s"; "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7"; - "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz"; - "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45"; + "swift-tools-support-core" = "1qvblyiazv58qwyxgyk2dh5ymbab3y70vm2q81qs6rmv43hs8ciz"; + "Yams" = "11abhcfkmqm3cmh7vp7rqzvxd1zj02j2866a2pp6v9m89456xb76"; }; } diff --git a/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json b/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json index f9e893abb7c3..09f0b7398d97 100644 --- a/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json +++ b/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json @@ -12,8 +12,8 @@ }, "state": { "checkoutState": { - "revision": "e1465042f195f374b94f915ba8ca49de24300a0d", - "version": "1.0.2" + "revision": "e394bf350e38cb100b6bc4172834770ede1b7232", + "version": "1.0.3" }, "name": "sourceControlCheckout" }, @@ -29,8 +29,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b" + "branch": "release/5.8", + "revision": "dccfc2e127a34b89a849407594cf2d604b598ba9" }, "name": "sourceControlCheckout" }, @@ -63,8 +63,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3" + "branch": "release/5.8", + "revision": "ac4871e01ef338cb95b5d28328cab0ec1dfae935" }, "name": "sourceControlCheckout" }, @@ -80,8 +80,8 @@ }, "state": { "checkoutState": { - "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", - "version": "4.0.6" + "revision": "01835dc202670b5bb90d07f3eae41867e9ed29f6", + "version": "5.0.1" }, "name": "sourceControlCheckout" }, @@ -89,5 +89,5 @@ } ] }, - "version": 5 + "version": 6 } diff --git a/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch b/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch index c0cfe2b7d225..8f91b3a234b5 100644 --- a/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch +++ b/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch @@ -1,14 +1,14 @@ --- a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift +++ b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift -@@ -9,6 +9,7 @@ - // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors +@@ -10,6 +10,7 @@ // //===----------------------------------------------------------------------===// + +import Foundation - import TSCBasic import SwiftOptions -@@ -116,7 +117,20 @@ extension GenericUnixToolchain { + import func TSCBasic.lookupExecutablePath +@@ -120,7 +121,20 @@ extension GenericUnixToolchain { // just using `clang` and avoid a dependency on the C++ runtime. let clangTool: Tool = parsedOptions.hasArgument(.enableExperimentalCxxInterop) ? .clangxx : .clang @@ -30,7 +30,7 @@ if let toolsDirPath = parsedOptions.getLastArgument(.toolsDirectory) { // FIXME: What if this isn't an absolute path? let toolsDir = try AbsolutePath(validating: toolsDirPath.asSingle) -@@ -132,6 +146,7 @@ extension GenericUnixToolchain { +@@ -136,6 +150,7 @@ extension GenericUnixToolchain { commandLine.appendFlag("-B") commandLine.appendPath(toolsDir) } diff --git a/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch b/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch index 6c3ae87d68c9..8c24db5aad1d 100644 --- a/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch +++ b/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch @@ -4,15 +4,15 @@ there, but we also here patch a check to try locate it via NIX_CC. --- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift +++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift -@@ -9,6 +9,7 @@ - // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors +@@ -10,6 +10,7 @@ // //===----------------------------------------------------------------------===// + +import Foundation - import TSCBasic import SwiftOptions -@@ -24,6 +25,13 @@ extension Toolchain { + import protocol TSCBasic.FileSystem +@@ -26,6 +27,13 @@ extension Toolchain { for targetInfo: FrontendTargetInfo, parsedOptions: inout ParsedOptions ) throws -> VirtualPath { diff --git a/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix b/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix index f297eafd389b..252040dd3ec0 100644 --- a/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix +++ b/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix @@ -57,9 +57,6 @@ in lib.mapAttrs mkInstallScript { ''; Yams = '' - add_library(CYaml SHARED IMPORTED) - set_property(TARGET CYaml PROPERTY IMPORTED_LOCATION "@out@/lib/libCYaml@sharedLibExt@") - add_library(Yams SHARED IMPORTED) set_property(TARGET Yams PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libYams@sharedLibExt@") ''; diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index 3025672563d2..b5abb8bf0336 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -8,6 +8,7 @@ , swiftpm2nix , Foundation , XCTest +, pkg-config , sqlite , ncurses , substituteAll @@ -38,13 +39,12 @@ let propagatedBuildInputs = [ Foundation ]; patches = [ ./patches/cmake-disable-rpath.patch + ./patches/cmake-fix-quoting.patch ./patches/disable-index-store.patch ./patches/disable-sandbox.patch + ./patches/disable-xctest.patch ./patches/fix-clang-cxx.patch - (substituteAll { - src = ./patches/disable-xctest.patch; - inherit (builtins) storeDir; - }) + ./patches/nix-pkgconfig-vars.patch (substituteAll { src = ./patches/fix-stdlib-path.patch; inherit (builtins) storeDir; @@ -60,6 +60,21 @@ let --replace \ 'librariesPath = applicationPath.parentDirectory' \ "librariesPath = AbsolutePath(\"$out\")" + + # Fix case-sensitivity issues. + # Upstream PR: https://github.com/apple/swift-package-manager/pull/6500 + substituteInPlace Sources/CMakeLists.txt \ + --replace \ + 'packageCollectionsSigning' \ + 'PackageCollectionsSigning' + substituteInPlace Sources/PackageCollectionsSigning/CMakeLists.txt \ + --replace \ + 'SubjectPublickeyInfo' \ + 'SubjectPublicKeyInfo' + substituteInPlace Sources/PackageCollections/CMakeLists.txt \ + --replace \ + 'FilepackageCollectionsSourcesStorage' \ + 'FilePackageCollectionsSourcesStorage' ''; }; @@ -67,12 +82,15 @@ let runtimeDeps = [ git ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun - # vtool is used to determine a minimum deployment target. This is part of - # cctools, but adding that as a build input puts an unwrapped linker in - # PATH, and breaks builds. This small derivation exposes just vtool. - (runCommandLocal "vtool" { } '' + # These tools are part of cctools, but adding that as a build input puts + # an unwrapped linker in PATH, and breaks builds. This small derivation + # exposes just the tools we need: + # - vtool is used to determine a minimum deployment target. + # - libtool is used to build static libraries. + (runCommandLocal "swiftpm-cctools" { } '' mkdir -p $out/bin ln -s ${cctools}/bin/vtool $out/bin/vtool + ln -s ${cctools}/bin/libtool $out/bin/libtool '') ]; @@ -282,6 +300,12 @@ let swift-tools-support-core ]; + postPatch = '' + # Tries to link against CYaml, but that's private. + substituteInPlace Sources/SwiftDriver/CMakeLists.txt \ + --replace CYaml "" + ''; + postInstall = cmakeGlue.SwiftDriver + '' # Swift modules are not installed. mkdir -p $out/${swiftModuleSubdir} @@ -294,8 +318,11 @@ let src = generated.sources.swift-crypto; postPatch = '' + # Fix use of hardcoded tool paths on Darwin. substituteInPlace CMakeLists.txt \ --replace /usr/bin/ar $NIX_CC/bin/ar + substituteInPlace CMakeLists.txt \ + --replace /usr/bin/ranlib $NIX_CC/bin/ranlib ''; postInstall = cmakeGlue.SwiftCrypto + '' @@ -313,6 +340,7 @@ let buildInputs = [ llbuild + sqlite swift-argument-parser swift-collections swift-crypto @@ -342,6 +370,7 @@ in stdenv.mkDerivation (commonAttrs // { ]; buildInputs = [ ncursesInput + pkg-config sqlite XCTest ] @@ -385,10 +414,10 @@ in stdenv.mkDerivation (commonAttrs // { mkdir -p $out/bin $out/lib/swift - cp $binPath/swift-package $out/bin/ + cp $binPath/swift-package-manager $out/bin/swift-package wrapProgram $out/bin/swift-package \ --prefix PATH : ${lib.makeBinPath runtimeDeps} - for tool in swift-build swift-test swift-run swift-package-collection; do + for tool in swift-build swift-test swift-run swift-package-collection swift-experimental-destination; do ln -s $out/bin/swift-package $out/bin/$tool done diff --git a/pkgs/development/compilers/swift/swiftpm/generated/default.nix b/pkgs/development/compilers/swift/swiftpm/generated/default.nix index 45d09093c62c..dbcd0f18e71f 100644 --- a/pkgs/development/compilers/swift/swiftpm/generated/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/generated/default.nix @@ -4,11 +4,11 @@ hashes = { "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw"; "swift-collections" = "1k6sjx5rqmp3gklny77b480hyzy6gkhpi23r0s8ljfbrcwawgnan"; - "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313"; - "swift-driver" = "1lcb5wqragc74nd0fjnk47lyph9hs0i9cps1mplvp2i91yzjqk05"; - "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h"; + "swift-crypto" = "0kllp7j0hd8k67l9b9zr2c3ddc5bvshldchzivhcz3q31qvq9ag8"; + "swift-driver" = "0cbvddj54k3sbw0vzlmzhccs7h43hi5kq6i3n2i0mysz3bf0c6zg"; + "swift-llbuild" = "106vnssh6pgy5s9dnq1hi1c9v2wkfydqgncg5dy7c9n23iisjy3s"; "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7"; - "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz"; - "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45"; + "swift-tools-support-core" = "1qvblyiazv58qwyxgyk2dh5ymbab3y70vm2q81qs6rmv43hs8ciz"; + "Yams" = "0b4lprxl4f6yqq0djnp394mxgmsxm2pljr7fh4f6ihdhnpwfsfvl"; }; } diff --git a/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json b/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json index 48a6350ece96..187df519fb7b 100644 --- a/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json +++ b/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json @@ -46,8 +46,8 @@ }, "state": { "checkoutState": { - "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5", - "version": "1.1.7" + "revision": "75ec60b8b4cc0f085c3ac414f3dca5625fa3588e", + "version": "2.2.4" }, "name": "sourceControlCheckout" }, @@ -63,8 +63,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "82b274af66cfbb8f3131677676517b34d01e30fd" + "branch": "release/5.8", + "revision": "7cfe0c0b6e6297efe88a3ce34e6138ee7eda969e" }, "name": "sourceControlCheckout" }, @@ -80,8 +80,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b" + "branch": "release/5.8", + "revision": "dccfc2e127a34b89a849407594cf2d604b598ba9" }, "name": "sourceControlCheckout" }, @@ -114,8 +114,8 @@ }, "state": { "checkoutState": { - "branch": "release/5.7", - "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3" + "branch": "release/5.8", + "revision": "ac4871e01ef338cb95b5d28328cab0ec1dfae935" }, "name": "sourceControlCheckout" }, @@ -131,8 +131,8 @@ }, "state": { "checkoutState": { - "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", - "version": "4.0.6" + "revision": "f47ba4838c30dbd59998a4e4c87ab620ff959e8a", + "version": "5.0.5" }, "name": "sourceControlCheckout" }, @@ -140,5 +140,5 @@ } ] }, - "version": 5 + "version": 6 } diff --git a/pkgs/development/compilers/swift/swiftpm/patches/cmake-fix-quoting.patch b/pkgs/development/compilers/swift/swiftpm/patches/cmake-fix-quoting.patch new file mode 100644 index 000000000000..04f51e9ec835 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/cmake-fix-quoting.patch @@ -0,0 +1,12 @@ +--- a/Sources/PackageCollectionsSigning/CMakeLists.txt ++++ b/Sources/PackageCollectionsSigning/CMakeLists.txt +@@ -43,6 +43,7 @@ target_link_libraries(PackageCollectionsSigning PUBLIC + PackageCollectionsModel + TSCBasic) + target_link_libraries(PackageCollectionsSigning PRIVATE +- PackageCollectionsSigningLibc +- $<$:SHELL:-Xlinker -framework -Xlinker Security>) ++ PackageCollectionsSigningLibc) ++target_link_options(PackageCollectionsSigning PRIVATE ++ "$<$:SHELL:-Xlinker -framework -Xlinker Security>") + diff --git a/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch b/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch index 406e1d68d0e4..0c76d59f9dfb 100644 --- a/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch +++ b/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch @@ -2,13 +2,13 @@ Nix may already sandbox the build, in which case sandbox_apply will fail. --- a/Sources/Basics/Sandbox.swift +++ b/Sources/Basics/Sandbox.swift -@@ -30,12 +30,14 @@ public enum Sandbox { +@@ -33,12 +33,14 @@ public enum Sandbox { readOnlyDirectories: [AbsolutePath] = [] - ) -> [String] { + ) throws -> [String] { #if os(macOS) + let env = ProcessInfo.processInfo.environment + if env["NIX_BUILD_TOP"] == nil || env["IN_NIX_SHELL"] != nil { - let profile = macOSSandboxProfile(strictness: strictness, writableDirectories: writableDirectories, readOnlyDirectories: readOnlyDirectories) + let profile = try macOSSandboxProfile(strictness: strictness, writableDirectories: writableDirectories, readOnlyDirectories: readOnlyDirectories) return ["/usr/bin/sandbox-exec", "-p", profile] + command - #else + } @@ -17,5 +17,5 @@ Nix may already sandbox the build, in which case sandbox_apply will fail. return command - #endif } - + /// Basic strictness level of a sandbox applied to a command line. diff --git a/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch b/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch index e24d154d2987..b587393dc2a2 100644 --- a/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch +++ b/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch @@ -1,21 +1,21 @@ XCTest is not fully open-source, only the Swift library parts. We don't have a command-line runner available, so disable support. ---- a/Sources/Commands/TestingSupport.swift -+++ b/Sources/Commands/TestingSupport.swift -@@ -60,7 +60,7 @@ enum TestingSupport { +--- a/Sources/Commands/Utilities/TestingSupport.swift ++++ b/Sources/Commands/Utilities/TestingSupport.swift +@@ -72,7 +72,7 @@ enum TestingSupport { /// - Returns: Array of TestSuite - static func getTestSuites(fromTestAt path: AbsolutePath, swiftTool: SwiftTool, swiftOptions: SwiftToolOptions) throws -> [TestSuite] { + static func getTestSuites(fromTestAt path: AbsolutePath, swiftTool: SwiftTool, enableCodeCoverage: Bool, sanitizers: [Sanitizer]) throws -> [TestSuite] { // Run the correct tool. - #if os(macOS) + #if false let data: String = try withTemporaryFile { tempFile in - let args = [try TestingSupport.xctestHelperPath(swiftTool: swiftTool).pathString, path.pathString, tempFile.path.pathString] - var env = try TestingSupport.constructTestEnvironment(toolchain: try swiftTool.getToolchain(), options: swiftOptions, buildParameters: swiftTool.buildParametersForTest()) + let args = [try Self.xctestHelperPath(swiftTool: swiftTool).pathString, path.pathString, tempFile.path.pathString] + var env = try Self.constructTestEnvironment( --- a/Sources/swiftpm-xctest-helper/main.swift +++ b/Sources/swiftpm-xctest-helper/main.swift -@@ -9,8 +9,11 @@ - */ +@@ -11,8 +11,11 @@ + //===----------------------------------------------------------------------===// #if os(macOS) -import XCTest @@ -27,7 +27,7 @@ command-line runner available, so disable support. /// A helper tool to get list of tests from a XCTest Bundle on macOS. /// -@@ -132,6 +135,7 @@ do { +@@ -134,6 +137,7 @@ do { exit(1) } @@ -35,14 +35,3 @@ command-line runner available, so disable support. #else #if os(Windows) ---- a/Sources/PackageModel/Destination.swift -+++ b/Sources/PackageModel/Destination.swift -@@ -174,7 +174,7 @@ public struct Destination: Encodable, Equatable { - arguments: ["/usr/bin/xcrun", "--sdk", "macosx", "--show-sdk-platform-path"], - environment: environment).spm_chomp() - -- if let platformPath = platformPath, !platformPath.isEmpty { -+ if let platformPath = platformPath, !platformPath.isEmpty && !platformPath.starts(with: "@storeDir@") { - // For XCTest framework. - let fwk = AbsolutePath(platformPath).appending( - components: "Developer", "Library", "Frameworks") diff --git a/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch b/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch index 60c4e33eb154..93c43c664ed3 100644 --- a/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch +++ b/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch @@ -2,9 +2,20 @@ Swiftpm may invoke clang, not clang++, to compile C++. Our cc-wrapper also doesn't pick up the arguments that enable C++ compilation in this case. Patch swiftpm to properly invoke clang++. +--- a/Sources/Build/BuildPlan.swift ++++ b/Sources/Build/BuildPlan.swift +@@ -2089,7 +2089,7 @@ public class BuildPlan: SPMBuildCore.BuildPlan { + for target in dependencies.staticTargets { + if case let target as ClangTarget = target.underlyingTarget, target.isCXX { + if buildParameters.hostTriple.isDarwin() { +- buildProduct.additionalFlags += ["-lc++"] ++ buildProduct.additionalFlags += ["-lc++", "-lc++abi"] + } else if buildParameters.hostTriple.isWindows() { + // Don't link any C++ library. + } else { --- a/Sources/Build/LLBuildManifestBuilder.swift +++ b/Sources/Build/LLBuildManifestBuilder.swift -@@ -782,7 +782,7 @@ extension LLBuildManifestBuilder { +@@ -786,7 +786,7 @@ extension LLBuildManifestBuilder { args += ["-c", path.source.pathString, "-o", path.object.pathString] @@ -13,21 +24,10 @@ swiftpm to properly invoke clang++. args.insert(clangCompiler, at: 0) let objectFileNode: Node = .file(path.object) ---- a/Sources/PackageModel/Destination.swift -+++ b/Sources/PackageModel/Destination.swift -@@ -153,7 +153,7 @@ public struct Destination: Encodable, Equatable { - - var extraCPPFlags: [String] = [] - #if os(macOS) -- extraCPPFlags += ["-lc++"] -+ extraCPPFlags += ["-lc++", "-lc++abi"] - #elseif os(Windows) - extraCPPFlags += [] - #else --- a/Sources/PackageModel/Toolchain.swift +++ b/Sources/PackageModel/Toolchain.swift -@@ -20,7 +20,7 @@ public protocol Toolchain { - var macosSwiftStdlib: AbsolutePath { get } +@@ -23,7 +23,7 @@ public protocol Toolchain { + var macosSwiftStdlib: AbsolutePath { get throws } /// Path of the `clang` compiler. - func getClangCompiler() throws -> AbsolutePath @@ -46,7 +46,7 @@ swiftpm to properly invoke clang++. private let environment: EnvironmentVariables -@@ -150,29 +150,31 @@ public final class UserToolchain: Toolchain { +@@ -196,29 +196,31 @@ public final class UserToolchain: Toolchain { } /// Returns the path to clang compiler tool. @@ -70,7 +70,7 @@ swiftpm to properly invoke clang++. // Then, check the toolchain. + let tool = isCXX ? "clang++" : "clang"; do { -- if let toolPath = try? UserToolchain.getTool("clang", binDir: self.destination.binDir) { +- if let toolPath = try? UserToolchain.getTool("clang", binDir: self.destination.toolchainBinDir) { - self._clangCompiler = toolPath + if let toolPath = try? UserToolchain.getTool(tool, binDir: self.destination.binDir) { + self._clangCompiler[isCXX] = toolPath @@ -88,18 +88,18 @@ swiftpm to properly invoke clang++. --- a/Sources/SPMBuildCore/BuildParameters.swift +++ b/Sources/SPMBuildCore/BuildParameters.swift -@@ -342,7 +342,7 @@ private struct _Toolchain: Encodable { +@@ -394,7 +394,7 @@ private struct _Toolchain: Encodable { public func encode(to encoder: Encoder) throws { var container = encoder.container(keyedBy: CodingKeys.self) try container.encode(toolchain.swiftCompilerPath, forKey: .swiftCompiler) - try container.encode(toolchain.getClangCompiler(), forKey: .clangCompiler) + try container.encode(toolchain.getClangCompiler(isCXX: false), forKey: .clangCompiler) - try container.encode(toolchain.extraCCFlags, forKey: .extraCCFlags) - try container.encode(toolchain.extraCPPFlags, forKey: .extraCPPFlags) + try container.encode(toolchain.extraFlags.cCompilerFlags, forKey: .extraCCFlags) + // Maintaining `extraCPPFlags` key for compatibility with older encoding. --- a/Sources/XCBuildSupport/XcodeBuildSystem.swift +++ b/Sources/XCBuildSupport/XcodeBuildSystem.swift -@@ -172,7 +172,7 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem { +@@ -182,7 +182,7 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem { // Generate a table of any overriding build settings. var settings: [String: String] = [:] // An error with determining the override should not be fatal here. @@ -107,15 +107,15 @@ swiftpm to properly invoke clang++. + settings["CC"] = try? buildParameters.toolchain.getClangCompiler(isCXX: false).pathString // Always specify the path of the effective Swift compiler, which was determined in the same way as for the native build system. settings["SWIFT_EXEC"] = buildParameters.toolchain.swiftCompilerPath.pathString - settings["LIBRARY_SEARCH_PATHS"] = "$(inherited) \(buildParameters.toolchain.toolchainLibDir.pathString)" + settings["LIBRARY_SEARCH_PATHS"] = "$(inherited) \(try buildParameters.toolchain.toolchainLibDir.pathString)" --- a/Tests/BuildTests/MockBuildTestHelper.swift +++ b/Tests/BuildTests/MockBuildTestHelper.swift -@@ -15,7 +15,7 @@ struct MockToolchain: PackageModel.Toolchain { +@@ -23,7 +23,7 @@ struct MockToolchain: PackageModel.Toolchain { #else - let extraCPPFlags: [String] = ["-lstdc++"] + let extraFlags = BuildFlags(cxxCompilerFlags: ["-lstdc++"]) #endif - func getClangCompiler() throws -> AbsolutePath { + func getClangCompiler(isCXX: Bool) throws -> AbsolutePath { - return AbsolutePath("/fake/path/to/clang") + return AbsolutePath(path: "/fake/path/to/clang") } diff --git a/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch b/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch index 327ccf37e425..6c9c21cfb98e 100644 --- a/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch +++ b/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch @@ -4,20 +4,22 @@ necessary for back-deployment of some features. --- a/Sources/PackageModel/Toolchain.swift +++ b/Sources/PackageModel/Toolchain.swift -@@ -43,10 +43,16 @@ extension Toolchain { - } +@@ -53,12 +53,18 @@ extension Toolchain { - public var macosSwiftStdlib: AbsolutePath { -+ if swiftCompilerPath.pathString.starts(with: "@storeDir@") { -+ return AbsolutePath("@swiftLib@/lib/swift/macosx") -+ } - return AbsolutePath("../../lib/swift/macosx", relativeTo: resolveSymlinks(swiftCompilerPath)) + public var macosSwiftStdlib: AbsolutePath { + get throws { ++ if swiftCompilerPath.pathString.starts(with: "@storeDir@") { ++ return AbsolutePath("@swiftLib@/lib/swift/macosx") ++ } + return try AbsolutePath(validating: "../../lib/swift/macosx", relativeTo: resolveSymlinks(swiftCompilerPath)) + } } public var toolchainLibDir: AbsolutePath { -+ if swiftCompilerPath.pathString.starts(with: "@storeDir@") { -+ return AbsolutePath("@swiftLib@/lib") -+ } - // FIXME: Not sure if it's better to base this off of Swift compiler or our own binary. - return AbsolutePath("../../lib", relativeTo: resolveSymlinks(swiftCompilerPath)) - } + get throws { ++ if swiftCompilerPath.pathString.starts(with: "@storeDir@") { ++ return AbsolutePath("@swiftLib@/lib") ++ } + // FIXME: Not sure if it's better to base this off of Swift compiler or our own binary. + return try AbsolutePath(validating: "../../lib", relativeTo: resolveSymlinks(swiftCompilerPath)) + } diff --git a/pkgs/development/compilers/swift/swiftpm/patches/nix-pkgconfig-vars.patch b/pkgs/development/compilers/swift/swiftpm/patches/nix-pkgconfig-vars.patch new file mode 100644 index 000000000000..e032ce80bf90 --- /dev/null +++ b/pkgs/development/compilers/swift/swiftpm/patches/nix-pkgconfig-vars.patch @@ -0,0 +1,28 @@ +Swift parses .pc files manually, but this means it bypasses our pkg-config +wrapper. That wrapper normally takes care of introducing the correct +PKG_CONFIG_PATH for cross compiling. + +--- a/Sources/PackageLoading/PkgConfig.swift ++++ b/Sources/PackageLoading/PkgConfig.swift +@@ -123,14 +123,17 @@ public struct PkgConfig { + + private static var envSearchPaths: [AbsolutePath] { + get throws { +- if let configPath = ProcessEnv.vars["PKG_CONFIG_PATH"] { ++ var result: [AbsolutePath] = [] ++ for envVar in ["PKG_CONFIG_PATH", "PKG_CONFIG_PATH_FOR_TARGET"] { ++ if let configPath = ProcessEnv.vars[envVar] { + #if os(Windows) +- return try configPath.split(separator: ";").map({ try AbsolutePath(validating: String($0)) }) ++ result += try configPath.split(separator: ";").map({ try AbsolutePath(validating: String($0)) }) + #else +- return try configPath.split(separator: ":").map({ try AbsolutePath(validating: String($0)) }) ++ result += try configPath.split(separator: ":").map({ try AbsolutePath(validating: String($0)) }) + #endif + } +- return [] ++ } ++ return result + } + } + } diff --git a/pkgs/development/compilers/swift/wrapper/wrapper.sh b/pkgs/development/compilers/swift/wrapper/wrapper.sh index 0c56e63b6f29..0ac066d340d6 100644 --- a/pkgs/development/compilers/swift/wrapper/wrapper.sh +++ b/pkgs/development/compilers/swift/wrapper/wrapper.sh @@ -105,7 +105,7 @@ dontLink=$isFrontend for p in "${params[@]}"; do case "$p" in - -enable-cxx-interop) + -enable-cxx-interop | -enable-experimental-cxx-interop) isCxx=1 ;; esac done From bbdaf29ab4283b4dc16840d59414e8fe36b71949 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Mon, 1 May 2023 22:32:55 +0100 Subject: [PATCH 028/203] tensorflow-lite: mark with knownVulnerabilities --- .../science/math/tensorflow-lite/default.nix | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix index a15b3512aec3..3426b0149ae0 100644 --- a/pkgs/development/libraries/science/math/tensorflow-lite/default.nix +++ b/pkgs/development/libraries/science/math/tensorflow-lite/default.nix @@ -176,5 +176,28 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ cpcloud ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; + knownVulnerabilities = [ + # at least some of + "CVE-2023-27579" + "CVE-2023-25801" + "CVE-2023-25676" + "CVE-2023-25675" + "CVE-2023-25674" + "CVE-2023-25673" + "CVE-2023-25671" + "CVE-2023-25670" + "CVE-2023-25669" + "CVE-2023-25668" + "CVE-2023-25667" + "CVE-2023-25665" + "CVE-2023-25666" + "CVE-2023-25664" + "CVE-2023-25663" + "CVE-2023-25662" + "CVE-2023-25660" + "CVE-2023-25659" + "CVE-2023-25658" + # and many many more + ]; }; } From 5333d97bdc62f120dc259bd6bca605af41ee5ff5 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 2 May 2023 12:45:21 +0200 Subject: [PATCH 029/203] discord-development: init at {0.0.216,0.0.8778} --- .../instant-messengers/discord/default.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 21 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 205bc0d0f9f4..001d1be96930 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,10 +4,12 @@ let stable = "0.0.26"; ptb = "0.0.42"; canary = "0.0.151"; + development = "0.0.216"; } else { stable = "0.0.273"; ptb = "0.0.59"; canary = "0.0.283"; + development = "0.0.8778"; }; version = versions.${branch}; srcs = rec { @@ -24,6 +26,10 @@ let url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; sha256 = "sha256-ZN+lEGtSajgYsyMoGRmyTZCpUGVmb9LKgVv89NA4m7U="; }; + development = fetchurl { + url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; + sha256 = "sha256-lQnIQC7Wek7OYDzZvLIJfb8I4oATD8pSB+mjQMPyqYQ="; + }; }; x86_64-darwin = { stable = fetchurl { @@ -38,6 +44,10 @@ let url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; sha256 = "0mqpk1szp46mih95x42ld32rrspc6jx1j7qdaxf01whzb3d4pi9l"; }; + development = fetchurl { + url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; + sha256 = "sha256-K4rlShYhmsjT2QHjb6+IbCXJFK+9REIx/gW68bcVSVc="; + }; }; aarch64-darwin = x86_64-darwin; }; @@ -83,6 +93,11 @@ let binaryName = if stdenv.isLinux then "DiscordCanary" else desktopName; desktopName = "Discord Canary"; }; + development = rec { + pname = "discord-development"; + binaryName = if stdenv.isLinux then "DiscordDevelopment" else desktopName; + desktopName = "Discord Development"; + }; } ); in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 962af829b632..a2e95fa3fd0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39780,6 +39780,12 @@ with pkgs; branch = "canary"; }; + discord-development = import ../applications/networking/instant-messengers/discord { + inherit lib stdenv; + inherit (pkgs) callPackage fetchurl; + branch = "development"; + }; + golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah { }; golden-cheetah-bin = callPackage ../applications/misc/golden-cheetah-bin {}; From 985e990c456bdf54e1f9c7e1022117ec46c9b047 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 2 May 2023 12:45:39 +0200 Subject: [PATCH 030/203] discord: add jopejoe1 as maintainer --- .../networking/instant-messengers/discord/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 001d1be96930..17f0ee8eb92a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -59,7 +59,7 @@ let downloadPage = "https://discordapp.com/download"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ MP2E artturin infinidoge ]; + maintainers = with maintainers; [ MP2E artturin infinidoge jopejoe1 ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; package = From 72bf1b54e557d45ed0633e2f91b38371b3e12fed Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 2 May 2023 12:47:42 +0200 Subject: [PATCH 031/203] discord: add comment about callPackage not working with override https://github.com/NixOS/nixpkgs/pull/179906 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2e95fa3fd0a..283d900544be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39760,14 +39760,13 @@ with pkgs; mpvc = callPackage ../applications/misc/mpvc { }; + # Overriding does not work when using callPackage on discord using import instead. (https://github.com/NixOS/nixpkgs/pull/179906) discord = import ../applications/networking/instant-messengers/discord { inherit lib stdenv; inherit (pkgs) callPackage fetchurl; branch = "stable"; }; - discordo = callPackage ../applications/networking/discordo/default.nix { }; - discord-ptb = import ../applications/networking/instant-messengers/discord { inherit lib stdenv; inherit (pkgs) callPackage fetchurl; @@ -39786,6 +39785,9 @@ with pkgs; branch = "development"; }; + + discordo = callPackage ../applications/networking/discordo/default.nix { }; + golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah { }; golden-cheetah-bin = callPackage ../applications/misc/golden-cheetah-bin {}; From 09e96177dacd5c78e4c45a887664dff1e2d2e13b Mon Sep 17 00:00:00 2001 From: Dominik Schrempf Date: Tue, 2 May 2023 21:09:59 +0200 Subject: [PATCH 032/203] kodiPackages.infotagger: init at 0.0.7 --- .../video/kodi/addons/infotagger/default.nix | 28 +++++++++++++++++++ pkgs/top-level/kodi-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/video/kodi/addons/infotagger/default.nix diff --git a/pkgs/applications/video/kodi/addons/infotagger/default.nix b/pkgs/applications/video/kodi/addons/infotagger/default.nix new file mode 100644 index 000000000000..da4528ed0afc --- /dev/null +++ b/pkgs/applications/video/kodi/addons/infotagger/default.nix @@ -0,0 +1,28 @@ +{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript }: +buildKodiAddon rec { + pname = "infotagger"; + namespace = "script.module.infotagger"; + version = "0.0.7"; + + src = fetchFromGitHub { + owner = "jurialmunkey"; + repo = namespace; + rev = "v${version}"; + hash = "sha256-Us7ud0QORGn+ALB4uyISekp0kUYY8nN8uFNg8MlxEB0="; + }; + + passthru = { + # Unusual Python path. + pythonPath = "resources/modules"; + updateScript = addonUpdateScript { + attrPath = "kodi.packages.infotagger"; + }; + }; + + meta = with lib; { + homepage = "https://github.com/jurialmunkey/script.module.infotagger"; + description = "Wrapper for new Nexus InfoTagVideo ListItem methods to maintain backwards compatibility"; + license = licenses.gpl3Plus; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 3b948080c0ee..1ceda56ea3cc 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -120,6 +120,8 @@ let self = rec { idna = callPackage ../applications/video/kodi/addons/idna { }; + infotagger = callPackage ../applications/video/kodi/addons/infotagger { }; + inputstream-adaptive = callPackage ../applications/video/kodi/addons/inputstream-adaptive { }; inputstream-ffmpegdirect = callPackage ../applications/video/kodi/addons/inputstream-ffmpegdirect { }; From 8f75345fa436486f1cad63c90b5b3d83dbc7fefb Mon Sep 17 00:00:00 2001 From: Dominik Schrempf Date: Tue, 2 May 2023 21:10:08 +0200 Subject: [PATCH 033/203] kodiPackages.youtube: use infotagger plugin fixes https://github.com/NixOS/nixpkgs/issues/226613 --- pkgs/applications/video/kodi/addons/youtube/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 8a9ccc5554f9..bdc4be3a23fa 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, inputstreamhelper }: +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, requests, infotagger, inputstreamhelper }: buildKodiAddon rec { pname = "youtube"; @@ -13,6 +13,7 @@ buildKodiAddon rec { propagatedBuildInputs = [ six requests + infotagger inputstreamhelper ]; From 0090afd16b40f957afc346d29529198d6bd06b06 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 1 May 2023 14:09:31 -0400 Subject: [PATCH 034/203] python310Packages.huggingface-hub: 0.12.1 -> 0.14.1 --- .../python-modules/huggingface-hub/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 790a14ba014e..f637cbeba323 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -3,18 +3,18 @@ , buildPythonPackage , pythonOlder , filelock +, fsspec , importlib-metadata , packaging , pyyaml , requests -, ruamel-yaml , tqdm , typing-extensions }: buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.12.1"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,15 +23,15 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-uw64JnXx790S4snLjANU0aLI3r7AMPec+IQentTZOdU="; + hash = "sha256-+BtXi+O+Ef4p4b+8FJCrZFsxX22ZYOPXylexFtsldnA="; }; propagatedBuildInputs = [ filelock + fsspec packaging pyyaml requests - ruamel-yaml tqdm typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/huggingface/huggingface_hub"; changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kira-bruneau ]; }; } From e7262d704f5e9656e849d9e0dbfa5d7c9755327b Mon Sep 17 00:00:00 2001 From: Niols Date: Wed, 3 May 2023 11:41:44 +0000 Subject: [PATCH 035/203] ocamlPackages.github*: init at 4.4.1 --- .../development/ocaml-modules/github/data.nix | 23 +++++++++++++ .../ocaml-modules/github/default.nix | 34 +++++++++++++++++++ .../development/ocaml-modules/github/jsoo.nix | 21 ++++++++++++ .../development/ocaml-modules/github/unix.nix | 23 +++++++++++++ pkgs/top-level/ocaml-packages.nix | 5 +++ 5 files changed, 106 insertions(+) create mode 100644 pkgs/development/ocaml-modules/github/data.nix create mode 100644 pkgs/development/ocaml-modules/github/default.nix create mode 100644 pkgs/development/ocaml-modules/github/jsoo.nix create mode 100644 pkgs/development/ocaml-modules/github/unix.nix diff --git a/pkgs/development/ocaml-modules/github/data.nix b/pkgs/development/ocaml-modules/github/data.nix new file mode 100644 index 000000000000..803642b509dd --- /dev/null +++ b/pkgs/development/ocaml-modules/github/data.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, github +, yojson, atdgen +}: + +buildDunePackage { + pname = "github-data"; + inherit (github) version src; + + duneVersion = "3"; + + nativeBuildInputs = [ + atdgen + ]; + + propagatedBuildInputs = [ + yojson + atdgen + ]; + + meta = github.meta // { + description = "GitHub APIv3 data library"; + }; +} diff --git a/pkgs/development/ocaml-modules/github/default.nix b/pkgs/development/ocaml-modules/github/default.nix new file mode 100644 index 000000000000..ec1816f8e5ad --- /dev/null +++ b/pkgs/development/ocaml-modules/github/default.nix @@ -0,0 +1,34 @@ +{ lib, buildDunePackage, fetchFromGitHub +, uri, cohttp, lwt, cohttp-lwt, github-data, yojson, stringext +}: + +buildDunePackage rec { + pname = "github"; + version = "4.4.1"; + + src = fetchFromGitHub { + owner = "mirage"; + repo = "ocaml-github"; + rev = version; + sha256 = "sha256-psUIiIvjVV2NTlBtHnBisWreaKKnsqIjKT2+mLnfsxg="; + }; + + duneVersion = "3"; + + propagatedBuildInputs = [ + uri + cohttp + lwt + cohttp-lwt + github-data + yojson + stringext + ]; + + meta = with lib; { + homepage = "https://github.com/mirage/ocaml-github"; + description = "GitHub APIv3 OCaml library"; + license = licenses.mit; + maintainers = with maintainers; [ niols ]; + }; +} diff --git a/pkgs/development/ocaml-modules/github/jsoo.nix b/pkgs/development/ocaml-modules/github/jsoo.nix new file mode 100644 index 000000000000..d387d2fbde01 --- /dev/null +++ b/pkgs/development/ocaml-modules/github/jsoo.nix @@ -0,0 +1,21 @@ +{ lib, buildDunePackage, github +, cohttp, cohttp-lwt-jsoo, js_of_ocaml-lwt +}: + +buildDunePackage { + pname = "github-jsoo"; + inherit (github) version src; + + duneVersion = "3"; + + propagatedBuildInputs = [ + github + cohttp + cohttp-lwt-jsoo + js_of_ocaml-lwt + ]; + + meta = github.meta // { + description = "GitHub APIv3 JavaScript library"; + }; +} diff --git a/pkgs/development/ocaml-modules/github/unix.nix b/pkgs/development/ocaml-modules/github/unix.nix new file mode 100644 index 000000000000..3f1897f82870 --- /dev/null +++ b/pkgs/development/ocaml-modules/github/unix.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, github +, cohttp, cohttp-lwt-unix, stringext, cmdliner, lwt +}: + +buildDunePackage { + pname = "github-unix"; + inherit (github) version src; + + duneVersion = "3"; + + propagatedBuildInputs = [ + github + cohttp + cohttp-lwt-unix + stringext + cmdliner + lwt + ]; + + meta = github.meta // { + description = "GitHub APIv3 Unix library"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e17454d9dd6f..0185ed26d42f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -571,6 +571,11 @@ let git-binary = pkgs.git; }; + github = callPackage ../development/ocaml-modules/github { }; + github-data = callPackage ../development/ocaml-modules/github/data.nix { }; + github-jsoo = callPackage ../development/ocaml-modules/github/jsoo.nix { }; + github-unix = callPackage ../development/ocaml-modules/github/unix.nix { }; + gluten = callPackage ../development/ocaml-modules/gluten { }; gluten-lwt = callPackage ../development/ocaml-modules/gluten/lwt.nix { }; gluten-lwt-unix = callPackage ../development/ocaml-modules/gluten/lwt-unix.nix { }; From 70669f6eab81fb5ce7db6b578f3d1a36b26f6d75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 07:25:31 +0000 Subject: [PATCH 036/203] python310Packages.slackclient: 3.20.1 -> 3.21.3 --- pkgs/development/python-modules/slackclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 22d1ce93f731..330ca7adf98a 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.20.1"; + version = "3.21.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-etPNhGjLrXOwkM7m2Q1xGoGraBq/2tq58bWXqncHy+w="; + hash = "sha256-begpT/DaDqOi8HZE10FCuIIv18KSU/i5G/Z5DXKUT7Y="; }; propagatedBuildInputs = [ From 14446360ead554eb8a57a03d2e02a9437d152d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20Thom=C3=A9?= Date: Wed, 3 May 2023 01:09:02 +0200 Subject: [PATCH 037/203] python3Packages.torchaudio-bin: add macOS to platforms --- pkgs/development/python-modules/torchaudio/bin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index f74ac8082388..37d547ff1fb2 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html license = licenses.bsd3; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; maintainers = with maintainers; [ junjihashimoto ]; }; } From 5a6fca4ed48abf04b976f1f2c2354f7359effcc3 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Thu, 4 May 2023 11:47:37 -0400 Subject: [PATCH 038/203] teams-for-linux: 1.0.65 -> 1.0.83 --- .../networking/instant-messengers/teams-for-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index aa71039e9f3c..acd2edbc59b4 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "teams-for-linux"; - version = "1.0.65"; + version = "1.0.83"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Rj6A1h5R4w8zacoTV0WKTbTD67qwsw4zHP+KQ6h7/gs="; + sha256 = "sha256-2tCBFc4CEgaYJq5fMbHi+M/Cz5Eeo2Slqgu9xUUkUjA="; }; offlineCache = fetchYarnDeps { From 3be4d4301c81b4d9a23354284116244fff1ec8bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 16:47:46 +0000 Subject: [PATCH 039/203] telegraf: 1.26.1 -> 1.26.2 --- pkgs/servers/monitoring/telegraf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 9139f1aa831c..59746d591e77 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.26.1"; + version = "1.26.2"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-wEmQOnpuJJtjcqw9HLV31wIFjcP48Ojo6bUnyrG3mYA="; + sha256 = "sha256-Y3WDhYJ4So0vcJPvd+1l8Fpuqa84vm7A1Teh5G+pOmI="; }; - vendorHash = "sha256-Tt0ZY5gmT40x1cg/XseCKu10Ol3tE+yVv+7EczPRI6s="; + vendorHash = "sha256-uEqFst42z8tfTgnNF4l/8+6XakRPsT0qL0YJOQD/z60="; proxyVendor = true; ldflags = [ From f66901ff23f23d45b240bae2395627ded4e20f42 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 4 May 2023 20:20:51 +0300 Subject: [PATCH 040/203] faiss.tests.pytest: disable a failing float-vs-double test --- pkgs/development/libraries/science/math/faiss/tests.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/science/math/faiss/tests.nix b/pkgs/development/libraries/science/math/faiss/tests.nix index bd38dbfe9e31..858a980bfeaf 100644 --- a/pkgs/development/libraries/science/math/faiss/tests.nix +++ b/pkgs/development/libraries/science/math/faiss/tests.nix @@ -23,6 +23,11 @@ buildPythonPackage { "test_contrib.py" ]; + disabledTests = [ + # https://github.com/facebookresearch/faiss/issues/2836 + "test_update_codebooks_with_double" + ]; + nativeCheckInputs = [ faiss pytestCheckHook From 949373caa270d7ae787fb8595959348730e5b436 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 17:31:11 +0000 Subject: [PATCH 041/203] google-guest-oslogin: 20230406.02 -> 20230502.00 --- pkgs/tools/virtualization/google-guest-oslogin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/pkgs/tools/virtualization/google-guest-oslogin/default.nix index b52f37b7e57f..68ca58fb64ff 100644 --- a/pkgs/tools/virtualization/google-guest-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-guest-oslogin/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "google-guest-oslogin"; - version = "20230406.02"; + version = "20230502.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-oslogin"; rev = version; - sha256 = "sha256-Eo/wgGytOIbpEsNdAiDt88HRrddy5CopRCFJy7pLKb0="; + sha256 = "sha256-66e0d6nE3880xsdI67O71TyZKQi3sGHkx7fLo3xVI7Q="; }; postPatch = '' From c7d8c3a02b623f8cdde01a2568f80eff83647b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 4 May 2023 18:02:18 +0200 Subject: [PATCH 042/203] github-runner: drop leaveDotGit to not break checksums --- .../github-runner/default.nix | 38 +++++++++++++++++-- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index b976757da00a..7e0fefb70b8e 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -12,6 +12,8 @@ , nodejs_16 , stdenv , which +, buildPackages +, runtimeShell }: buildDotnetModule rec { pname = "github-runner"; @@ -21,11 +23,41 @@ buildDotnetModule rec { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-w5MqFIPTCAqQjdsWdscNnH2KNwUOp5SPFesyprXUvNE="; - # Required to obtain HEAD's Git commit hash + hash = "sha256-5amc0oVcFCPFrUcX5iITjnN9Mtpzi4wWsJe7Kdm9YxA="; leaveDotGit = true; + postFetch = '' + git -C $out rev-parse --short HEAD > $out/.git-revision + rm -rf $out/.git + ''; }; + # The git commit is read during the build and some tests depends on a git repo to be present + # https://github.com/actions/runner/blob/22d1938ac420a4cb9e3255e47a91c2e43c38db29/src/dir.proj#L5 + unpackPhase = '' + cp -r $src $TMPDIR/src + chmod -R +w $TMPDIR/src + cd $TMPDIR/src + ( + export PATH=${buildPackages.git}/bin:$PATH + git init + git config user.email "root@localhost" + git config user.name "root" + git add . + git commit -m "Initial commit" + git checkout -b v${version} + ) + mkdir -p $TMPDIR/bin + cat > $TMPDIR/bin/git < Date: Thu, 4 May 2023 21:22:26 +0200 Subject: [PATCH 043/203] libbladerf: 2.4.0 -> 2.5.0 --- .../libraries/libbladeRF/default.nix | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 2f453a38b8de..1a8002947abd 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -1,22 +1,16 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: -let - # fetch submodule - noos = fetchFromGitHub { - owner = "analogdevicesinc"; - repo = "no-OS"; - rev = "0bba46e6f6f75785a65d425ece37d0a04daf6157"; - sha256 = "0is79dhsyp9xmlnfdr1i5s1c22ipjafk9d35jpn5dynpvj86m99c"; - }; -in stdenv.mkDerivation rec { + +stdenv.mkDerivation rec { pname = "libbladeRF"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "05axh51lrzxpz2qfswnjwxpfk3mlsv2wc88dd12gfr1karn5jwz9"; + sha256 = "sha256-H40w5YKp6M3QLrsPhILEnJiWutCYLtbgC4a63sV397Q="; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config git doxygen help2man ]; @@ -25,11 +19,6 @@ in stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ udev ] ++ lib.optionals stdenv.isDarwin [ ncurses ]; - - postUnpack = '' - cp -r ${noos}/* source/thirdparty/analogdevicesinc/no-OS/ - ''; - # Fixup shebang prePatch = "patchShebangs host/utilities/bladeRF-cli/src/cmd/doc/generate.bash"; @@ -46,11 +35,6 @@ in stdenv.mkDerivation rec { "-DBLADERF_GROUP=bladerf" ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=array-bounds" - ]; - hardeningDisable = [ "fortify" ]; meta = with lib; { From 139b273462d36c96abfa40e2e56343d86f796d9d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 4 May 2023 21:25:06 +0200 Subject: [PATCH 044/203] libbladerf: add markuskowa as maintainer --- pkgs/development/libraries/libbladeRF/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 1a8002947abd..937937ae8260 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://nuand.com/libbladeRF-doc"; description = "Supporting library of the BladeRF SDR opensource hardware"; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ markuskowa ]; platforms = platforms.unix; }; } From 661c842818050a17b41cb70e407e5d7afb367783 Mon Sep 17 00:00:00 2001 From: Ben Burdette <> Date: Thu, 4 May 2023 13:44:39 -0600 Subject: [PATCH 045/203] updating the elm stuff --- .../compilers/elm/packages/node-packages.nix | 511 +++++++++--------- 1 file changed, 266 insertions(+), 245 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index c3ff7bf83cf5..f102e468f14c 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g=="; }; }; - "@babel/compat-data-7.21.4" = { + "@babel/compat-data-7.21.7" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.21.4"; + version = "7.21.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.4.tgz"; - sha512 = "/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.7.tgz"; + sha512 = "KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA=="; }; }; "@babel/core-7.12.10" = { @@ -49,13 +49,13 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.21.4" = { + "@babel/generator-7.21.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.21.4"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz"; - sha512 = "NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz"; + sha512 = "SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -67,58 +67,49 @@ let sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.21.5" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.18.9"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz"; - sha512 = "yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.21.5.tgz"; + sha512 = "uNrjKztPLkUk7bpCNC0jEKDJzzkvel/W+HguzbN8krA+LPfC1CEobJEvAvGka2A/M+ViOqXdcRL0GqPUJSjx9g=="; }; }; - "@babel/helper-compilation-targets-7.21.4" = { + "@babel/helper-compilation-targets-7.21.5" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.21.4"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz"; - sha512 = "Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz"; + sha512 = "1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w=="; }; }; - "@babel/helper-create-class-features-plugin-7.21.4" = { + "@babel/helper-create-class-features-plugin-7.21.8" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.21.4"; + version = "7.21.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz"; - sha512 = "46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.8.tgz"; + sha512 = "+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.21.4" = { + "@babel/helper-create-regexp-features-plugin-7.21.8" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.21.4"; + version = "7.21.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz"; - sha512 = "M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.8.tgz"; + sha512 = "zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g=="; }; }; - "@babel/helper-environment-visitor-7.18.9" = { + "@babel/helper-environment-visitor-7.21.5" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.18.9"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; - sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; - }; - }; - "@babel/helper-explode-assignable-expression-7.18.6" = { - name = "_at_babel_slash_helper-explode-assignable-expression"; - packageName = "@babel/helper-explode-assignable-expression"; - version = "7.18.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"; - sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz"; + sha512 = "IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ=="; }; }; "@babel/helper-function-name-7.21.0" = { @@ -139,13 +130,13 @@ let sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; }; - "@babel/helper-member-expression-to-functions-7.21.0" = { + "@babel/helper-member-expression-to-functions-7.21.5" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.21.0"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz"; - sha512 = "Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.5.tgz"; + sha512 = "nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg=="; }; }; "@babel/helper-module-imports-7.21.4" = { @@ -157,13 +148,13 @@ let sha512 = "orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg=="; }; }; - "@babel/helper-module-transforms-7.21.2" = { + "@babel/helper-module-transforms-7.21.5" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.21.2"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz"; - sha512 = "79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz"; + sha512 = "bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -175,13 +166,13 @@ let sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; }; }; - "@babel/helper-plugin-utils-7.20.2" = { + "@babel/helper-plugin-utils-7.21.5" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.20.2"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"; - sha512 = "8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz"; + sha512 = "0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg=="; }; }; "@babel/helper-remap-async-to-generator-7.18.9" = { @@ -193,22 +184,22 @@ let sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; }; }; - "@babel/helper-replace-supers-7.20.7" = { + "@babel/helper-replace-supers-7.21.5" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.20.7"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz"; - sha512 = "vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.21.5.tgz"; + sha512 = "/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg=="; }; }; - "@babel/helper-simple-access-7.20.2" = { + "@babel/helper-simple-access-7.21.5" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.20.2"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"; - sha512 = "+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz"; + sha512 = "ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.20.0" = { @@ -229,13 +220,13 @@ let sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; - "@babel/helper-string-parser-7.19.4" = { + "@babel/helper-string-parser-7.21.5" = { name = "_at_babel_slash_helper-string-parser"; packageName = "@babel/helper-string-parser"; - version = "7.19.4"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; - sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz"; + sha512 = "5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w=="; }; }; "@babel/helper-validator-identifier-7.19.1" = { @@ -265,13 +256,13 @@ let sha512 = "bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q=="; }; }; - "@babel/helpers-7.21.0" = { + "@babel/helpers-7.21.5" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.21.0"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz"; - sha512 = "XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.5.tgz"; + sha512 = "BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA=="; }; }; "@babel/highlight-7.18.6" = { @@ -283,13 +274,13 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.21.4" = { + "@babel/parser-7.21.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.21.4"; + version = "7.21.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz"; - sha512 = "alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz"; + sha512 = "6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.20.7" = { @@ -517,13 +508,13 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.20.7" = { + "@babel/plugin-transform-arrow-functions-7.21.5" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.20.7"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz"; - sha512 = "3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz"; + sha512 = "wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA=="; }; }; "@babel/plugin-transform-async-to-generator-7.20.7" = { @@ -562,13 +553,13 @@ let sha512 = "RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ=="; }; }; - "@babel/plugin-transform-computed-properties-7.20.7" = { + "@babel/plugin-transform-computed-properties-7.21.5" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.20.7"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz"; - sha512 = "Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.21.5.tgz"; + sha512 = "TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q=="; }; }; "@babel/plugin-transform-destructuring-7.21.3" = { @@ -607,13 +598,13 @@ let sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; }; }; - "@babel/plugin-transform-for-of-7.21.0" = { + "@babel/plugin-transform-for-of-7.21.5" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.21.0"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz"; - sha512 = "LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz"; + sha512 = "nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ=="; }; }; "@babel/plugin-transform-function-name-7.18.9" = { @@ -652,13 +643,13 @@ let sha512 = "NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.21.2" = { + "@babel/plugin-transform-modules-commonjs-7.21.5" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.21.2"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz"; - sha512 = "Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.5.tgz"; + sha512 = "OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ=="; }; }; "@babel/plugin-transform-modules-systemjs-7.20.11" = { @@ -724,13 +715,13 @@ let sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; }; }; - "@babel/plugin-transform-regenerator-7.20.5" = { + "@babel/plugin-transform-regenerator-7.21.5" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.20.5"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz"; - sha512 = "kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.21.5.tgz"; + sha512 = "ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w=="; }; }; "@babel/plugin-transform-reserved-words-7.18.6" = { @@ -796,13 +787,13 @@ let sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.18.10" = { + "@babel/plugin-transform-unicode-escapes-7.21.5" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.18.10"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz"; - sha512 = "kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.21.5.tgz"; + sha512 = "LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg=="; }; }; "@babel/plugin-transform-unicode-regex-7.18.6" = { @@ -859,22 +850,22 @@ let sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.21.4" = { + "@babel/traverse-7.21.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.21.4"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz"; - sha512 = "eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz"; + sha512 = "AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw=="; }; }; - "@babel/types-7.21.4" = { + "@babel/types-7.21.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.21.4"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz"; - sha512 = "rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz"; + sha512 = "m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q=="; }; }; "@hapi/address-2.1.4" = { @@ -1165,13 +1156,13 @@ let sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; }; }; - "@types/http-proxy-1.17.10" = { + "@types/http-proxy-1.17.11" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.10"; + version = "1.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.10.tgz"; - sha512 = "Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.11.tgz"; + sha512 = "HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA=="; }; }; "@types/jest-27.5.2" = { @@ -1201,13 +1192,13 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/lodash-4.14.192" = { + "@types/lodash-4.14.194" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.192"; + version = "4.14.194"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.192.tgz"; - sha512 = "km+Vyn3BYm5ytMO13k9KTp27O75rbQ0NFw+U//g+PX7VZyjCioXaRFisqSIJRECljcTv73G3i6BpglNGHgUQ5A=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.194.tgz"; + sha512 = "r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g=="; }; }; "@types/minimatch-5.1.2" = { @@ -1228,13 +1219,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-18.15.11" = { + "@types/node-18.16.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.15.11"; + version = "18.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz"; - sha512 = "E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.16.3.tgz"; + sha512 = "OPs5WnnT1xkCBiuQrZA4+YAV4HEJejmHneyraIaxsbev5yCEr6KMwINNFP9wQeFIw8FWcoTqF3vQsa5CDaI+8Q=="; }; }; "@types/node-8.10.66" = { @@ -2704,13 +2695,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001477" = { + "caniuse-lite-1.0.30001482" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001477"; + version = "1.0.30001482"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001477.tgz"; - sha512 = "lZim4iUHhGcy5p+Ri/G7m84hJwncj+Kz7S5aD4hoQfslKZJgt0tHc/hafVbqHC5bbhHb+mrW2JOUHkI5KH7toQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001482.tgz"; + sha512 = "F1ZInsg53cegyjroxLNW9DmrEQ1SuGRTO1QlpA0o2/6OpQ0gFeDRoq1yFmnr8Sakn9qwwt9DmbxHB6w167OSuQ=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2938,13 +2929,13 @@ let sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; }; - "cli-spinners-2.8.0" = { + "cli-spinners-2.9.0" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.8.0.tgz"; - sha512 = "/eG5sJcvEIwxcdYM86k5tPwn0MUzkX5YY3eImTGpJOZgVe4SdTMY14vQpcxgBzJ0wXwAYrS8E+c3uHeK4JNyzQ=="; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.0.tgz"; + sha512 = "4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g=="; }; }; "cli-table-0.3.4" = { @@ -3433,13 +3424,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.30.0" = { + "core-js-compat-3.30.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.30.0"; + version = "3.30.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.0.tgz"; - sha512 = "P5A2h/9mRYZFIAP+5Ab8ns6083IyVpSclU74UNvbGVQ8VM7n3n3/g2yF3AkKQ9NXz2O+ioxLbEWKnDtgsFamhg=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.1.tgz"; + sha512 = "d690npR7MC6P0gq4npTl5n2VQeNAmUrJ90n+MHiKS7W2+xno4o3F5GDEuylSdi6EJ3VssibSGXOa1r3YXD3Mhw=="; }; }; "core-util-is-1.0.2" = { @@ -4261,13 +4252,13 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.357" = { + "electron-to-chromium-1.4.382" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.357"; + version = "1.4.382"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.357.tgz"; - sha512 = "UTkCbNTAcGXABmEnQrGcW4m3cG6fcyBfD4KDF0iyEAlbrGZiY9dmslyDAGOD1Kr5biN2F743Y30aRCOtau35Vw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.382.tgz"; + sha512 = "czMavlW52VIPgutbVL9JnZIZuFijzsG1ww/1z2Otu1r1q+9Qe2bTsH3My3sZarlvwyqHM6+mnZfEnt2Vr4dsIg=="; }; }; "elliptic-6.5.4" = { @@ -4369,13 +4360,13 @@ let sha512 = "5GV3WkJ8R/faOP1hwElQdNuCt8tKx2+1lsMrdeIYWSFz01Kp9gJl/R6zGtp4QUyrUtO8KnHsxjHrQNUf2CHkrg=="; }; }; - "elm-tooling-1.13.1" = { + "elm-tooling-1.14.0" = { name = "elm-tooling"; packageName = "elm-tooling"; - version = "1.13.1"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.13.1.tgz"; - sha512 = "a6rL9wW12Ep2oCvQtARaRpQSPGyHEoaxak6cBFej7LiKvqBgD2WrPpABNuTRP4eI3Clnmi7j2G5Nljh41+Wshg=="; + url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.14.0.tgz"; + sha512 = "cIbK3gfYWK086HsqOIGM4reIYcV/FF2R/8jIJ6ZUy1/RSkYFUv2BgPTGYYZo1Io9oymmbwoCWWleNtw7LgGL2w=="; }; }; "elm-webpack-loader-6.0.1" = { @@ -7033,6 +7024,15 @@ let sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; + "isarray-2.0.5" = { + name = "isarray"; + packageName = "isarray"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"; + sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; + }; + }; "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; @@ -8059,13 +8059,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.2.7" = { + "minipass-5.0.0" = { name = "minipass"; packageName = "minipass"; - version = "4.2.7"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.2.7.tgz"; - sha512 = "ScVIgqHcXRMyfflqHmEW0bm8z8rb5McHyOY3ewX9JBgZaR77G7nxq9L/mtV96/QbAAwtbCAHVVLzD1kkyfFQEw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz"; + sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; }; }; "minizlib-1.3.3" = { @@ -8635,13 +8635,13 @@ let sha512 = "leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w=="; }; }; - "object.getownpropertydescriptors-2.1.5" = { + "object.getownpropertydescriptors-2.1.6" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz"; - sha512 = "yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz"; + sha512 = "lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ=="; }; }; "object.pick-1.3.0" = { @@ -9400,13 +9400,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.21" = { + "postcss-8.4.23" = { name = "postcss"; packageName = "postcss"; - version = "8.4.21"; + version = "8.4.23"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz"; - sha512 = "tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz"; + sha512 = "bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA=="; }; }; "postcss-calc-7.0.5" = { @@ -9706,13 +9706,13 @@ let sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; - "postcss-selector-parser-6.0.11" = { + "postcss-selector-parser-6.0.12" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.11"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz"; - sha512 = "zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.12.tgz"; + sha512 = "NdxGCAZdRrwVI1sy59+Wzrh+pMMHxapGnpfenDVlMEXoOcvt4pGE0JLK9YY2F5dLxcFYA/YbVQKhcGU+FtSYQg=="; }; }; "postcss-svgo-4.0.3" = { @@ -10336,13 +10336,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp.prototype.flags-1.4.3" = { + "regexp.prototype.flags-1.5.0" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; - sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz"; + sha512 = "0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA=="; }; }; "regexpu-core-5.3.2" = { @@ -10507,13 +10507,13 @@ let sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; - "resolve-1.22.2" = { + "resolve-1.22.3" = { name = "resolve"; packageName = "resolve"; - version = "1.22.2"; + version = "1.22.3"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"; - sha512 = "Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz"; + sha512 = "P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw=="; }; }; "resolve-alpn-1.2.1" = { @@ -10723,6 +10723,15 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; + "safe-array-concat-1.0.0" = { + name = "safe-array-concat"; + packageName = "safe-array-concat"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz"; + sha512 = "9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ=="; + }; + }; "safe-buffer-5.1.1" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -10822,13 +10831,13 @@ let sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; }; }; - "schema-utils-3.1.1" = { + "schema-utils-3.1.2" = { name = "schema-utils"; packageName = "schema-utils"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"; - sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz"; + sha512 = "pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg=="; }; }; "section-matter-1.0.0" = { @@ -10876,13 +10885,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.4.0" = { + "semver-7.5.0" = { name = "semver"; packageName = "semver"; - version = "7.4.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz"; - sha512 = "RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw=="; + url = "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz"; + sha512 = "+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA=="; }; }; "semver-regex-3.1.4" = { @@ -11119,13 +11128,13 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-3.17.0" = { + "simple-git-3.18.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.17.0"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.17.0.tgz"; - sha512 = "JozI/s8jr3nvLd9yn2jzPVHnhVzt7t7QWfcIoDcqRIGN+f1IINGv52xoZti2kkYfoRhhRvzMSNPfogHMp97rlw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.18.0.tgz"; + sha512 = "Yt0GJ5aYrpPci3JyrYcsPz8Xc05Hi4JPSOb+Sgn/BmPX35fn/6Fp9Mef8eMBCrL2siY5w4j49TA5Q+bxPpri1Q=="; }; }; "simple-swizzle-0.2.2" = { @@ -11875,13 +11884,13 @@ let sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; }; }; - "tar-6.1.13" = { + "tar-6.1.14" = { name = "tar"; packageName = "tar"; - version = "6.1.13"; + version = "6.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"; - sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz"; + sha512 = "piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw=="; }; }; "temp-0.9.0" = { @@ -11920,13 +11929,13 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.16.9" = { + "terser-5.17.1" = { name = "terser"; packageName = "terser"; - version = "5.16.9"; + version = "5.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.16.9.tgz"; - sha512 = "HPa/FdTB9XGI2H1/keLFZHxl6WNvAI4YalHGtDQTlMnJcoqSab1UwL4l1hGEhs6/GmLHBZIg/YgB++jcbzoOEg=="; + url = "https://registry.npmjs.org/terser/-/terser-5.17.1.tgz"; + sha512 = "hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw=="; }; }; "terser-5.3.8" = { @@ -12541,13 +12550,13 @@ let sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w=="; }; }; - "update-browserslist-db-1.0.10" = { + "update-browserslist-db-1.0.11" = { name = "update-browserslist-db"; packageName = "update-browserslist-db"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"; - sha512 = "OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ=="; + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz"; + sha512 = "dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA=="; }; }; "upgrade-1.1.0" = { @@ -13000,13 +13009,13 @@ let sha512 = "F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ=="; }; }; - "which-module-2.0.0" = { + "which-module-2.0.1" = { name = "which-module"; packageName = "which-module"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha512 = "B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="; + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz"; + sha512 = "iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="; }; }; "which-typed-array-1.1.9" = { @@ -13752,7 +13761,7 @@ in sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.8" - sources."minipass-4.2.7" + sources."minipass-5.0.0" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" @@ -13825,7 +13834,7 @@ in sources."json-schema-traverse-1.0.0" ]; }) - sources."tar-6.1.13" + sources."tar-6.1.14" sources."temp-0.9.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -13847,7 +13856,7 @@ in sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-1.3.1" - sources."which-module-2.0.0" + sources."which-module-2.0.1" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -14055,10 +14064,10 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.6.0.tgz"; - sha512 = "/z+FrUG/i7qQ4ij+RaseGQ+G7QQyWz6LPm6uWMJQurrZZhEXRS0RrgA2EuJjqVKqxNwxEPYrVnzHMerzUkjpzg=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.7.0.tgz"; + sha512 = "EIPf/plACx7GmY4GBxfri4JsYYIqq5whAIpVBtcz9yhE+z5L6RqnH6ZLJkTmA5Z+d74lO6oz5CZ5JZS8tzdb6w=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -14418,7 +14427,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.15.11" + sources."@types/node-18.16.3" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.2" @@ -14464,7 +14473,7 @@ in sources."responselike-2.0.1" sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.4.0" + sources."semver-7.5.0" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" @@ -14661,7 +14670,7 @@ in sources."uuid-3.4.0" sources."verror-1.10.0" sources."which-2.0.1" - sources."which-module-2.0.0" + sources."which-module-2.0.1" sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" sources."xmlbuilder-13.0.2" @@ -14735,39 +14744,46 @@ in dependencies = [ sources."@babel/cli-7.12.10" sources."@babel/code-frame-7.21.4" - sources."@babel/compat-data-7.21.4" + sources."@babel/compat-data-7.21.7" sources."@babel/core-7.12.10" - sources."@babel/generator-7.21.4" + sources."@babel/generator-7.21.5" sources."@babel/helper-annotate-as-pure-7.18.6" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" - (sources."@babel/helper-compilation-targets-7.21.4" // { + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.21.5" + (sources."@babel/helper-compilation-targets-7.21.5" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.21.4" - sources."@babel/helper-create-regexp-features-plugin-7.21.4" - sources."@babel/helper-environment-visitor-7.18.9" - sources."@babel/helper-explode-assignable-expression-7.18.6" + (sources."@babel/helper-create-class-features-plugin-7.21.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."@babel/helper-create-regexp-features-plugin-7.21.8" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."@babel/helper-environment-visitor-7.21.5" sources."@babel/helper-function-name-7.21.0" sources."@babel/helper-hoist-variables-7.18.6" - sources."@babel/helper-member-expression-to-functions-7.21.0" + sources."@babel/helper-member-expression-to-functions-7.21.5" sources."@babel/helper-module-imports-7.21.4" - sources."@babel/helper-module-transforms-7.21.2" + sources."@babel/helper-module-transforms-7.21.5" sources."@babel/helper-optimise-call-expression-7.18.6" - sources."@babel/helper-plugin-utils-7.20.2" + sources."@babel/helper-plugin-utils-7.21.5" sources."@babel/helper-remap-async-to-generator-7.18.9" - sources."@babel/helper-replace-supers-7.20.7" - sources."@babel/helper-simple-access-7.20.2" + sources."@babel/helper-replace-supers-7.21.5" + sources."@babel/helper-simple-access-7.21.5" sources."@babel/helper-skip-transparent-expression-wrappers-7.20.0" sources."@babel/helper-split-export-declaration-7.18.6" - sources."@babel/helper-string-parser-7.19.4" + sources."@babel/helper-string-parser-7.21.5" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.21.0" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.21.0" + sources."@babel/helpers-7.21.5" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.21.4" + sources."@babel/parser-7.21.8" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-dynamic-import-7.18.6" @@ -14793,22 +14809,22 @@ in sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.20.7" + sources."@babel/plugin-transform-arrow-functions-7.21.5" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" sources."@babel/plugin-transform-block-scoping-7.21.0" sources."@babel/plugin-transform-classes-7.21.0" - sources."@babel/plugin-transform-computed-properties-7.20.7" + sources."@babel/plugin-transform-computed-properties-7.21.5" sources."@babel/plugin-transform-destructuring-7.21.3" sources."@babel/plugin-transform-dotall-regex-7.18.6" sources."@babel/plugin-transform-duplicate-keys-7.18.9" sources."@babel/plugin-transform-exponentiation-operator-7.18.6" - sources."@babel/plugin-transform-for-of-7.21.0" + sources."@babel/plugin-transform-for-of-7.21.5" sources."@babel/plugin-transform-function-name-7.18.9" sources."@babel/plugin-transform-literals-7.18.9" sources."@babel/plugin-transform-member-expression-literals-7.18.6" sources."@babel/plugin-transform-modules-amd-7.20.11" - sources."@babel/plugin-transform-modules-commonjs-7.21.2" + sources."@babel/plugin-transform-modules-commonjs-7.21.5" sources."@babel/plugin-transform-modules-systemjs-7.20.11" sources."@babel/plugin-transform-modules-umd-7.18.6" sources."@babel/plugin-transform-named-capturing-groups-regex-7.20.5" @@ -14816,7 +14832,7 @@ in sources."@babel/plugin-transform-object-super-7.18.6" sources."@babel/plugin-transform-parameters-7.21.3" sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-regenerator-7.20.5" + sources."@babel/plugin-transform-regenerator-7.21.5" sources."@babel/plugin-transform-reserved-words-7.18.6" sources."@babel/plugin-transform-runtime-7.12.10" sources."@babel/plugin-transform-shorthand-properties-7.18.6" @@ -14824,15 +14840,15 @@ in sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-unicode-escapes-7.18.10" + sources."@babel/plugin-transform-unicode-escapes-7.21.5" sources."@babel/plugin-transform-unicode-regex-7.18.6" sources."@babel/preset-env-7.12.10" sources."@babel/preset-modules-0.1.5" sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.12.5" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.21.4" - sources."@babel/types-7.21.4" + sources."@babel/traverse-7.21.5" + sources."@babel/types-7.21.5" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -14851,10 +14867,10 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" - sources."@types/http-proxy-1.17.10" + sources."@types/http-proxy-1.17.11" sources."@types/json-schema-7.0.11" sources."@types/minimatch-5.1.2" - sources."@types/node-18.15.11" + sources."@types/node-18.16.3" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@types/source-list-map-0.1.2" @@ -15024,7 +15040,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001477" + sources."caniuse-lite-1.0.30001482" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -15123,7 +15139,7 @@ in ]; }) sources."core-js-2.6.12" - sources."core-js-compat-3.30.0" + sources."core-js-compat-3.30.1" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -15150,7 +15166,7 @@ in sources."lru-cache-6.0.0" sources."picocolors-0.2.1" sources."postcss-7.0.39" - sources."semver-7.4.0" + sources."semver-7.5.0" sources."source-map-0.6.1" sources."yallist-4.0.0" ]; @@ -15247,7 +15263,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.357" + sources."electron-to-chromium-1.4.382" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -15393,7 +15409,7 @@ in (sources."file-loader-6.2.0" // { dependencies = [ sources."loader-utils-2.0.4" - sources."schema-utils-3.1.1" + sources."schema-utils-3.1.2" ]; }) sources."file-uri-to-path-1.0.0" @@ -15747,7 +15763,7 @@ in sources."object-visit-1.0.1" sources."object.assign-4.1.4" sources."object.entries-1.1.6" - sources."object.getownpropertydescriptors-2.1.5" + sources."object.getownpropertydescriptors-2.1.6" sources."object.pick-1.3.0" sources."object.values-1.1.6" sources."obuf-1.1.2" @@ -15822,7 +15838,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - sources."postcss-8.4.21" + sources."postcss-8.4.23" (sources."postcss-calc-7.0.5" // { dependencies = [ sources."picocolors-0.2.1" @@ -15890,8 +15906,8 @@ in sources."parse-json-5.2.0" sources."path-type-4.0.0" sources."resolve-from-4.0.0" - sources."schema-utils-3.1.1" - sources."semver-7.4.0" + sources."schema-utils-3.1.2" + sources."semver-7.5.0" sources."yallist-4.0.0" ]; }) @@ -16067,7 +16083,7 @@ in ]; }) sources."postcss-safe-parser-5.0.2" - sources."postcss-selector-parser-6.0.11" + sources."postcss-selector-parser-6.0.12" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."picocolors-0.2.1" @@ -16179,7 +16195,7 @@ in sources."regenerator-runtime-0.13.11" sources."regenerator-transform-0.15.1" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.3" + sources."regexp.prototype.flags-1.5.0" sources."regexpu-core-5.3.2" (sources."regjsparser-0.9.1" // { dependencies = [ @@ -16200,7 +16216,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.22.2" + sources."resolve-1.22.3" sources."resolve-cwd-2.0.0" sources."resolve-dir-1.0.1" sources."resolve-from-3.0.0" @@ -16220,6 +16236,11 @@ in sources."tslib-1.14.1" ]; }) + (sources."safe-array-concat-1.0.0" // { + dependencies = [ + sources."isarray-2.0.5" + ]; + }) sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safe-regex-test-1.0.0" @@ -16515,7 +16536,7 @@ in ]; }) sources."upath-1.2.0" - sources."update-browserslist-db-1.0.10" + sources."update-browserslist-db-1.0.11" sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { @@ -16526,7 +16547,7 @@ in (sources."url-loader-4.1.1" // { dependencies = [ sources."loader-utils-2.0.4" - sources."schema-utils-3.1.1" + sources."schema-utils-3.1.2" ]; }) sources."url-parse-1.5.10" @@ -16632,7 +16653,7 @@ in sources."strip-ansi-3.0.1" sources."supports-color-6.1.0" sources."to-regex-range-2.1.1" - sources."which-module-2.0.0" + sources."which-module-2.0.1" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -16826,7 +16847,7 @@ in sources."@types/debug-0.0.30" sources."@types/get-port-3.2.0" sources."@types/glob-5.0.38" - sources."@types/lodash-4.14.192" + sources."@types/lodash-4.14.194" sources."@types/minimatch-5.1.2" sources."@types/mkdirp-0.5.2" sources."@types/node-8.10.66" @@ -17064,7 +17085,7 @@ in sources."strip-json-comments-2.0.1" sources."sudo-prompt-8.2.5" sources."supports-color-7.2.0" - (sources."terser-5.16.9" // { + (sources."terser-5.17.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -17099,10 +17120,10 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.9.2"; + version = "2.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.9.2.tgz"; - sha512 = "fgmLh2dQnV/dtq+aAKThUwmW/MVYgkShJmvr2G3IbQJBdwJM1MzuMhIZ7S1yp1u0npN8VUn05oOoRh+utMRQXw=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.10.1.tgz"; + sha512 = "uEc4McppMqmWEaRo+jo5RowbDyfcBr0MTFN0kZt9gWrmmK6hPilTJJGtRmoH+K/aJtq4ZPDDF97oAFdkylD1gg=="; }; dependencies = [ sources."@sindresorhus/is-4.6.0" @@ -17110,7 +17131,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.4" - sources."@types/node-18.15.11" + sources."@types/node-18.16.3" sources."@types/responselike-1.0.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -17129,7 +17150,7 @@ in sources."chalk-4.1.2" sources."chokidar-3.5.3" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.8.0" + sources."cli-spinners-2.9.0" sources."clone-1.0.4" sources."clone-response-1.0.3" sources."color-convert-2.0.1" @@ -17144,7 +17165,7 @@ in }) sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" - sources."elm-tooling-1.13.1" + sources."elm-tooling-1.14.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."fast-levenshtein-3.0.0" @@ -17259,8 +17280,8 @@ in sources."git-clone-able-0.1.2" sources."lru-cache-6.0.0" sources."ms-2.1.2" - sources."semver-7.4.0" - sources."simple-git-3.17.0" + sources."semver-7.5.0" + sources."simple-git-3.18.0" sources."upath-2.0.1" sources."yallist-4.0.0" ]; From b12e7df751e845ca082576db2037180e1a97ee2c Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 4 May 2023 16:46:05 -0400 Subject: [PATCH 046/203] jumpy: 0.6.1 -> 0.7.0 Diff: https://github.com/fishfolk/jumpy/compare/v0.6.1...v0.7.0 Changelog: https://github.com/fishfolk/jumpy/releases/tag/v0.7.0 --- pkgs/games/jumpy/Cargo.lock | 767 ++++++++++++++++++++- pkgs/games/jumpy/default.nix | 20 +- pkgs/games/jumpy/remove-unused-patch.patch | 22 - 3 files changed, 738 insertions(+), 71 deletions(-) delete mode 100644 pkgs/games/jumpy/remove-unused-patch.patch diff --git a/pkgs/games/jumpy/Cargo.lock b/pkgs/games/jumpy/Cargo.lock index caec57028fb3..be21d00f86d0 100644 --- a/pkgs/games/jumpy/Cargo.lock +++ b/pkgs/games/jumpy/Cargo.lock @@ -18,6 +18,15 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -179,7 +188,7 @@ dependencies = [ "objc-foundation", "objc_id", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "thiserror", "winapi", "x11rb", @@ -213,9 +222,9 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" dependencies = [ "async-lock", "async-task", @@ -225,6 +234,26 @@ dependencies = [ "slab", ] +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if", + "concurrent-queue 2.1.0", + "futures-lite", + "log", + "parking", + "polling", + "rustix", + "slab", + "socket2", + "waker-fn", +] + [[package]] name = "async-lock" version = "2.7.0" @@ -240,12 +269,32 @@ version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +[[package]] +name = "async-timer" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d62d1c449a11d63d953da8602322493f7718b83c2f649c6a7ba9e08c7af188f" +dependencies = [ + "libc", + "wasm-bindgen", + "winapi", +] + [[package]] name = "atomic-arena" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5450eca8ce5abcfd5520727e975ebab30ccca96030550406b0ca718b224ead10" +[[package]] +name = "atomic-polyfill" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +dependencies = [ + "critical-section", +] + [[package]] name = "atomic_refcell" version = "0.1.9" @@ -258,6 +307,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.13.1" @@ -352,7 +416,7 @@ dependencies = [ "js-sys", "ndk-glue", "notify", - "parking_lot", + "parking_lot 0.12.1", "serde", "thiserror", "wasm-bindgen", @@ -602,7 +666,7 @@ dependencies = [ "anyhow", "bevy", "kira", - "parking_lot", + "parking_lot 0.12.1", "thiserror", ] @@ -705,7 +769,7 @@ dependencies = [ "erased-serde", "glam 0.22.0", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "serde", "smallvec", "thiserror", @@ -758,7 +822,7 @@ dependencies = [ "image", "naga", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "regex", "serde", "smallvec", @@ -782,8 +846,7 @@ dependencies = [ [[package]] name = "bevy_simple_tilemap" version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eda3ef72997c971dd4e03757dda2e58d47778a2d2ecb92cc9df73d5b2010e34" +source = "git+https://github.com/forbjok/bevy_simple_tilemap.git?rev=963d447fa1fd2d6f89228106275b7086840be762#963d447fa1fd2d6f89228106275b7086840be762" dependencies = [ "bevy", "bitflags", @@ -963,6 +1026,22 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bitfield" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d7e60934ceec538daadb9d8432424ed043a904d8e0243f3c6446bce549a46ac" + +[[package]] +name = "bitfield-rle" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f8acc105b7bd3ed61e4bb7ad3e3b3f2a8da72205b2e0408cf71a499e8f57dd0" +dependencies = [ + "failure", + "varinteger", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -1098,6 +1177,15 @@ dependencies = [ "type_ulid", ] +[[package]] +name = "bones_matchmaker_proto" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff7e71011db4da9f456122f586cf576ee42b249b26a5b2a840eee2141c4ef38" +dependencies = [ + "serde", +] + [[package]] name = "bones_render" version = "0.1.2" @@ -1148,7 +1236,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.12", + "syn 2.0.13", ] [[package]] @@ -1249,7 +1337,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.12", + "syn 2.0.13", ] [[package]] @@ -1269,6 +1357,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "cobs" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" + [[package]] name = "cocoa" version = "0.24.1" @@ -1460,7 +1554,7 @@ dependencies = [ "ndk-context", "oboe", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -1476,6 +1570,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "critical-section" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" + [[package]] name = "crossbeam" version = "0.8.2" @@ -1782,7 +1882,7 @@ dependencies = [ "ecolor", "emath", "nohash-hasher", - "parking_lot", + "parking_lot 0.12.1", ] [[package]] @@ -1840,6 +1940,28 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -1944,6 +2066,15 @@ dependencies = [ "unic-langid", ] +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "spin 0.9.7", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1983,12 +2114,48 @@ dependencies = [ "libc", ] +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +dependencies = [ + "futures-core", + "futures-sink", +] + [[package]] name = "futures-core" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + [[package]] name = "futures-io" version = "0.3.28" @@ -2010,6 +2177,47 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + [[package]] name = "fxhash" version = "0.2.1" @@ -2053,6 +2261,22 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "ggrs" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1419c3c38e579884b075b99a8ade2ca507e87a2bde81940c6fe4aea895696831" +dependencies = [ + "bincode", + "bitfield-rle", + "bytemuck", + "instant", + "js-sys", + "parking_lot 0.11.2", + "rand 0.8.5", + "serde", +] + [[package]] name = "gilrs" version = "0.10.1" @@ -2086,6 +2310,12 @@ dependencies = [ "windows 0.44.0", ] +[[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + [[package]] name = "glam" version = "0.22.0" @@ -2093,6 +2323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774" dependencies = [ "bytemuck", + "num-traits", "serde", ] @@ -2182,6 +2413,15 @@ dependencies = [ "svg_fmt", ] +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -2192,6 +2432,20 @@ dependencies = [ "serde", ] +[[package]] +name = "heapless" +version = "0.7.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +dependencies = [ + "atomic-polyfill", + "hash32", + "rustc_version", + "serde", + "spin 0.9.7", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.4.1" @@ -2267,6 +2521,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "if-addrs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc0fa01ffc752e9dbc72818cdb072cd028b86be5e09dd04c5a643704fe101a9" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "image" version = "0.24.6" @@ -2486,10 +2750,11 @@ dependencies = [ [[package]] name = "jumpy" -version = "0.6.1" +version = "0.7.0" dependencies = [ "anyhow", "async-channel", + "async-timer", "base64 0.21.0", "bevy", "bevy-inspector-egui", @@ -2500,12 +2765,16 @@ dependencies = [ "bevy_kira_audio", "bevy_prototype_lyon", "bevy_tweening", + "bitfield", "bones_bevy_asset", "bones_bevy_renderer", "bones_lib", + "bones_matchmaker_proto", "bytemuck", + "bytes", "clap", "directories", + "downcast-rs", "egui_extras", "either", "fluent", @@ -2513,22 +2782,33 @@ dependencies = [ "fnv", "futures-lite", "getrandom 0.2.8", + "ggrs", "iyes_loopless", "jumpy_core", "leafwing-input-manager", "log", + "mdns-sd", "mimalloc", "normalize-path", + "numquant", "once_cell", "peg", + "ping-rs", + "postcard", "puffin", "puffin_egui", + "quinn", + "quinn_runtime_bevy", "rand 0.8.5", + "rcgen", + "rustls", "serde", "serde_json", "serde_yaml", + "smallvec", "thiserror", "tracing", + "turborand", "type_ulid", "unic-langid", "wasm-bindgen", @@ -2537,7 +2817,7 @@ dependencies = [ [[package]] name = "jumpy_core" -version = "0.1.0" +version = "0.7.0" dependencies = [ "bevy", "bones_bevy_asset", @@ -2547,6 +2827,7 @@ dependencies = [ "glam 0.22.0", "hex", "humantime-serde", + "indexmap", "nalgebra", "ordered-float", "petgraph", @@ -2664,9 +2945,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" [[package]] name = "libmimalloc-sys" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8c7cbf8b89019683667e347572e6d55a7df7ea36b0c4ce69961b0cde67b174" +checksum = "ef2c45001fb108f37d41bed8efd715769acb14674c1ce3e266ef0e317ef5f877" dependencies = [ "cc", "libc", @@ -2784,6 +3065,18 @@ dependencies = [ "rawpointer", ] +[[package]] +name = "mdns-sd" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed0b1898d42fb934073c893ab88e8ae72076a5d862417dcf214c028011019753" +dependencies = [ + "flume", + "if-addrs", + "polling", + "socket2", +] + [[package]] name = "memchr" version = "2.5.0" @@ -2824,9 +3117,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcb174b18635f7561a0c6c9fc2ce57218ac7523cf72c50af80e2d79ab8f3ba1" +checksum = "92666043c712f7f5c756d07443469ddcda6dd971cc15258bb7f3c3216fd1b7aa" dependencies = [ "libmimalloc-sys", ] @@ -2948,7 +3241,7 @@ dependencies = [ "ndk-macro", "ndk-sys", "once_cell", - "parking_lot", + "parking_lot 0.12.1", ] [[package]] @@ -3140,6 +3433,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "numquant" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54809e43d79aa532432c0d03c6adf62fdd96f2e152b90cef6cd9a316c3da4d99" + [[package]] name = "objc" version = "0.2.7" @@ -3179,6 +3478,15 @@ dependencies = [ "objc", ] +[[package]] +name = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + [[package]] name = "oboe" version = "0.5.0" @@ -3208,6 +3516,12 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + [[package]] name = "optional" version = "0.5.0" @@ -3244,6 +3558,17 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -3251,7 +3576,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.7", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall", + "smallvec", + "winapi", ] [[package]] @@ -3328,6 +3667,15 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" +[[package]] +name = "pem" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +dependencies = [ + "base64 0.13.1", +] + [[package]] name = "percent-encoding" version = "2.2.0" @@ -3395,12 +3743,51 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "pin-project-lite" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "ping-rs" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d873f038f84371f9c7fa13f6afea4d5f1fbcd5070ba8eb7af2a6d41c768eff8b" +dependencies = [ + "futures", + "mio", + "paste", + "socket2", + "windows 0.43.0", +] + [[package]] name = "pkg-config" version = "0.3.26" @@ -3419,6 +3806,33 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "polling" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" +dependencies = [ + "autocfg", + "bitflags", + "cfg-if", + "concurrent-queue 2.1.0", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.45.0", +] + +[[package]] +name = "postcard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa512cd0d087cc9f99ad30a1bf64795b67871edbead083ffc3a4dfafa59aa00" +dependencies = [ + "cobs", + "heapless", + "serde", +] + [[package]] name = "pp-rs" version = "0.2.1" @@ -3452,9 +3866,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" dependencies = [ "unicode-ident", ] @@ -3476,7 +3890,7 @@ dependencies = [ "byteorder", "instant", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "ruzstd", "serde", "zstd", @@ -3498,6 +3912,72 @@ dependencies = [ "vec1", ] +[[package]] +name = "quinn" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", + "webpki", +] + +[[package]] +name = "quinn-proto" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring", + "rustc-hash", + "rustls", + "rustls-native-certs", + "slab", + "thiserror", + "tinyvec", + "tracing", + "webpki", +] + +[[package]] +name = "quinn-udp" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" +dependencies = [ + "libc", + "quinn-proto", + "socket2", + "tracing", + "windows-sys 0.42.0", +] + +[[package]] +name = "quinn_runtime_bevy" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a4d0c40761a7f14497d4ad43c3887fff819aff1a68d6d731377d98b2106e3be" +dependencies = [ + "async-executor", + "async-io", + "bevy_tasks", + "futures-lite", + "pin-project", + "quinn", + "quinn-proto", + "quinn-udp", +] + [[package]] name = "quote" version = "1.0.26" @@ -3663,6 +4143,18 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "rcgen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" +dependencies = [ + "pem", + "ring", + "time", + "yasna", +] + [[package]] name = "rectangle-pack" version = "0.4.2" @@ -3721,6 +4213,21 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted", + "web-sys", + "winapi", +] + [[package]] name = "ringbuf" version = "0.3.3" @@ -3747,12 +4254,27 @@ dependencies = [ "serde", ] +[[package]] +name = "rustc-demangle" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" + [[package]] name = "rustc-hash" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + [[package]] name = "rustix" version = "0.37.6" @@ -3767,6 +4289,39 @@ dependencies = [ "windows-sys 0.45.0", ] +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +dependencies = [ + "log", + "ring", + "sct", + "webpki", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +dependencies = [ + "base64 0.21.0", +] + [[package]] name = "ruzstd" version = "0.3.1" @@ -3802,18 +4357,66 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + [[package]] name = "scopeguard" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "sct" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys 0.8.3", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +dependencies = [ + "core-foundation-sys 0.8.3", + "libc", +] + [[package]] name = "self_cell" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" + [[package]] name = "serde" version = "1.0.159" @@ -3831,7 +4434,7 @@ checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn 2.0.12", + "syn 2.0.13", ] [[package]] @@ -3926,6 +4529,16 @@ dependencies = [ "serde", ] +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "spade" version = "2.1.0" @@ -3938,6 +4551,21 @@ dependencies = [ "smallvec", ] +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0959fd6f767df20b231736396e4f602171e00d95205676286e79d4a4eb67bef" +dependencies = [ + "lock_api", +] + [[package]] name = "spin_sleep" version = "1.1.1" @@ -3958,6 +4586,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -4075,15 +4709,27 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.12" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + [[package]] name = "termcolor" version = "1.2.0" @@ -4110,7 +4756,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.12", + "syn 2.0.13", ] [[package]] @@ -4185,6 +4831,17 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tokio" +version = "1.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +dependencies = [ + "autocfg", + "pin-project-lite", + "windows-sys 0.45.0", +] + [[package]] name = "toml" version = "0.5.11" @@ -4412,6 +5069,12 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad2024452afd3874bf539695e04af6732ba06517424dbf958fdb16a01f3bef6c" +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + [[package]] name = "url" version = "2.3.1" @@ -4446,6 +5109,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "varinteger" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ea29db9f94ff08bb619656b8120878f280526f71dc88b5262c958a510181812" + [[package]] name = "vec1" version = "1.10.1" @@ -4585,6 +5254,16 @@ dependencies = [ "web-sys", ] +[[package]] +name = "webpki" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "weezl" version = "0.1.7" @@ -4601,7 +5280,7 @@ dependencies = [ "js-sys", "log", "naga", - "parking_lot", + "parking_lot 0.12.1", "raw-window-handle 0.5.2", "smallvec", "static_assertions", @@ -4627,7 +5306,7 @@ dependencies = [ "fxhash", "log", "naga", - "parking_lot", + "parking_lot 0.12.1", "profiling", "raw-window-handle 0.5.2", "smallvec", @@ -4663,7 +5342,7 @@ dependencies = [ "metal", "naga", "objc", - "parking_lot", + "parking_lot 0.12.1", "profiling", "range-alloc", "raw-window-handle 0.5.2", @@ -4735,6 +5414,21 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows" version = "0.44.0" @@ -4896,7 +5590,7 @@ dependencies = [ "ndk-glue", "objc", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "percent-encoding", "raw-window-handle 0.4.3", "raw-window-handle 0.5.2", @@ -4948,6 +5642,15 @@ dependencies = [ "nix 0.24.3", ] +[[package]] +name = "yasna" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +dependencies = [ + "time", +] + [[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index 9450f4955e3b..1cab49b3d74f 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , makeWrapper , pkg-config , zstd @@ -17,36 +16,23 @@ rustPlatform.buildRustPackage rec { pname = "jumpy"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "fishfolk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-03VPfSIlGB8Cc1jWzZSj9MBFBBmMjyx+RdHr3r3oolU="; + sha256 = "sha256-krO/iPGnzXeY3W8xSFerlKa1DvDl7ss00bGaAMkHUtw="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "bevy_simple_tilemap-0.10.1" = "sha256-Q/AsBZjsr+uTIh/oN0OsIJxntZ4nuc1AReo0Ronj930="; "bones_asset-0.1.0" = "sha256-YyY5OsbRLkpAgvNifRiXfmzfsgFw/oFV1nQVCkXG4j4="; }; }; - patches = [ - # removes unused patch in patch.crates-io, which cases the build to fail - # error: failed to load source for dependency `bevy_simple_tilemap` - # Caused by: attempting to update a git repository, but --frozen was specified - ./remove-unused-patch.patch - - # the crate version is outdated - (fetchpatch { - name = "bump-version-to-0-6-1.patch"; - url = "https://github.com/fishfolk/jumpy/commit/15081c425056cdebba1bc90bfcaba50a2e24829f.patch"; - hash = "sha256-dxLfy1HMdjh2VPbqMb/kwvDxeuptFi3W9tLzvg6TLsE="; - }) - ]; - nativeBuildInputs = [ makeWrapper pkg-config diff --git a/pkgs/games/jumpy/remove-unused-patch.patch b/pkgs/games/jumpy/remove-unused-patch.patch deleted file mode 100644 index 544548798ebd..000000000000 --- a/pkgs/games/jumpy/remove-unused-patch.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -4977,8 +4977,3 @@ dependencies = [ - "libc", - "pkg-config", - ] -- --[[patch.unused]] --name = "bevy_simple_tilemap" --version = "0.11.0" --source = "git+https://github.com/forbjok/bevy_simple_tilemap.git#9a1d4332e961327443adb16aca306f837b6f4da5" ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -94,8 +94,6 @@ codegen-units = 1 # Improved rapier physics perf, so it might help other stuf - lto = true - - [patch.crates-io] --bevy_simple_tilemap = { git = "https://github.com/forbjok/bevy_simple_tilemap.git" } -- - bones_lib = { git = "https://github.com/fishfolk/bones" } - bones_bevy_asset = { git = "https://github.com/fishfolk/bones" } - type_ulid = { git = "https://github.com/fishfolk/bones" } From 96c1b380e28d7377d8b99f898ebf4ec43744892d Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 4 May 2023 23:04:47 +0200 Subject: [PATCH 047/203] tclx: add fgaz to maintainers --- pkgs/development/libraries/tclx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 829015e8ebba..1207c0d51004 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -20,6 +20,6 @@ tcl.mkTclDerivation rec { homepage = "https://tclx.sourceforge.net/"; description = "Tcl extensions"; license = lib.licenses.tcltk; - maintainers = with lib.maintainers; [ kovirobi ]; + maintainers = with lib.maintainers; [ kovirobi fgaz ]; }; } From 578d5e941d5311ca50c99edbb52162840bf96cfb Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 4 May 2023 23:05:14 +0200 Subject: [PATCH 048/203] tclx: 8.4.1 -> 8.6.1 Move to flightaware fork, seems to be what everyone is using --- pkgs/development/libraries/tclx/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 1207c0d51004..a31777fed9df 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -1,12 +1,17 @@ -{ lib, fetchurl, tcl }: +{ lib +, fetchFromGitHub +, tcl +}: tcl.mkTclDerivation rec { pname = "tclx"; - version = "8.4.1"; + version = "8.6.1"; - src = fetchurl { - url = "mirror://sourceforge/tclx/tclx${version}.tar.bz2"; - sha256 = "1v2qwzzidz0is58fd1p7wfdbscxm3ip2wlbqkj5jdhf6drh1zd59"; + src = fetchFromGitHub { + owner = "flightaware"; + repo = "tclx"; + rev = "v${version}"; + hash = "sha256-HdbuU0IR8q/0g2fIs1xtug4oox/D24C8E2VbEJC5B1A="; }; # required in order for tclx to properly detect tclx.tcl at runtime @@ -17,7 +22,7 @@ tcl.mkTclDerivation rec { ''; meta = { - homepage = "https://tclx.sourceforge.net/"; + homepage = "https://github.com/flightaware/tclx"; description = "Tcl extensions"; license = lib.licenses.tcltk; maintainers = with lib.maintainers; [ kovirobi fgaz ]; From 0139df51a129126adbb3d77630390f1b065c376b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:21:54 +0200 Subject: [PATCH 049/203] python311Packages.msgspec: 0.14.0 -> 0.14.2 Diff: https://github.com/jcrist/msgspec/compare/refs/tags/0.14.0...0.14.2 Changelog: https://github.com/jcrist/msgspec/releases/tag/0.14.2 --- pkgs/development/python-modules/msgspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 075089f02724..19139af43890 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "msgspec"; - version = "0.14.0"; + version = "0.14.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "jcrist"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-adjLXMHJx9sP5qbg9sw+fV2h843KuG1NKqNyX3gEkVY="; + hash = "sha256-8EdAnHrgff+Xf7r/FuyGYZxpzEXusRTyXbNTNgPcHO0="; }; # Requires libasan to be accessible From 922a202fb6e0cb49caef34d1304d47cde1b77a5a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:47:13 +0200 Subject: [PATCH 050/203] osv-scanner: 1.3.1 -> 1.3.2 Diff: https://github.com/google/osv-scanner/compare/v1.3.1...v1.3.2 Changelog: https://github.com/google/osv-scanner/releases/tag/v1.3.2 --- pkgs/tools/security/osv-scanner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index 4df86e487a6c..127a0631b4cf 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "osv-scanner"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-0P7mcrswWvyqv7a/jyONt/3BSim0IvQUgzjO7swTWn0="; + hash = "sha256-xgSRaGS09a1d1qepzvkTuMtaUHh8QsKxF7RWD+0Sepg="; }; - vendorHash = "sha256-MMEkgGyetwMEiD242CPYh619o4bo4zj87jnl7HvS0OE="; + vendorHash = "sha256-9tNEPgJJ4mp4DPNgIzezS9Axed3XoJV9cyTYCOGMvgA="; subPackages = [ "cmd/osv-scanner" From 22314cf04bd57dfda59203ef6f09c240b9395f9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:48:44 +0200 Subject: [PATCH 051/203] openfortivpn: 1.20.1 -> 1.20.2 Diff: https://github.com/adrienverge/openfortivpn/compare/v1.20.1...v1.20.2 --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index c63ae2968f5f..ac582b2f2a2e 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xsH/Nb1/69R2EvAisDnrHWehjDIMBmElCV6evuTwBIQ="; + sha256 = "sha256-Ml1aVvF+kqlSTuzZeHG8Ry+BA24YdWACwQNlO2K+FGo="; }; # we cannot write the config file to /etc and as we don't need the file, so drop it From a9388b8af4ba1e49b05e2df9ce68b996baf45bd9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:50:35 +0200 Subject: [PATCH 052/203] python311Packages.webauthn: 1.7.2 -> 1.8.1 Diff: https://github.com/duo-labs/py_webauthn/compare/refs/tags/v1.7.2...v1.8.1 Changelog: https://github.com/duo-labs/py_webauthn/blob/v1.8.1/CHANGELOG.md --- pkgs/development/python-modules/webauthn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webauthn/default.nix b/pkgs/development/python-modules/webauthn/default.nix index c302eb9194d3..6d39ed74dda3 100644 --- a/pkgs/development/python-modules/webauthn/default.nix +++ b/pkgs/development/python-modules/webauthn/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "webauthn"; - version = "1.7.2"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - hash = "sha256-B8GdtaufMMl0gHywZ00wNyYZ+rojrExKuQsA/vmbYRI="; + hash = "sha256-ivPLS+kh/H8qLojgc5qh1ndPzSZbzbnm9E+LQGq8+Xs="; }; propagatedBuildInputs = [ From 2819752ac3aa1f3fe1afb24fb529677dab45c068 Mon Sep 17 00:00:00 2001 From: tipozodis Date: Fri, 5 May 2023 00:50:56 +0300 Subject: [PATCH 053/203] spek: 0.8.4 -> 0.8.5 --- pkgs/applications/audio/spek/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index 0ce5eb2cfab0..f54e661b4c74 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg_4, wxGTK32, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "spek"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "alexkay"; repo = "spek"; rev = "v${version}"; - sha256 = "sha256-JLQx5LlnVe1TT1KVO3/QSVRqYL+pAMCxoDWrnkUNmRU="; + sha256 = "sha256-VYt2so2k3Rk3sLSV1Tf1G2pESYiXygrKr9Koop8ChCg="; }; nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; - buildInputs = [ ffmpeg_4 wxGTK32 gtk3 ]; + buildInputs = [ ffmpeg wxGTK32 gtk3 ]; meta = with lib; { description = "Analyse your audio files by showing their spectrogram"; From 017293daa821d9a6ac7c23a17714f1d28f02d7e4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:51:34 +0200 Subject: [PATCH 054/203] python311Packages.sqlmap: 1.7.4 -> 1.7.5 Changelog: https://github.com/sqlmapproject/sqlmap/releases/tag/1.7.5 --- pkgs/development/python-modules/sqlmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 33dfcab92353..dd7f8a5e11fd 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.7.4"; + version = "1.7.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-U0mfnTteVPYP7gxRci/+poUf1QTdZ0Kk+f59e9S/A+4="; + hash = "sha256-PQk3uEY1gjvs5BerfEAEZe4v6uZYpCZqCo+Qc7mSUw8="; }; postPatch = '' From d0bfc9077d56ec18472d8899ef3cb5b536228143 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 4 May 2023 23:23:25 +0200 Subject: [PATCH 055/203] ungoogled-chromium: 112.0.5615.165 -> 113.0.5672.64 --- .../networking/browsers/chromium/default.nix | 6 +----- .../browsers/chromium/upstream-info.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index dd479442e737..77f4def41f33 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,4 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_15 , llvmPackages_16 , ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit @@ -19,7 +18,7 @@ }: let - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_16; stdenv = llvmPackages.stdenv; upstream-info = (lib.importJSON ./upstream-info.json).${channel}; @@ -54,9 +53,6 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (chromiumVersionAtLeast "113") rec { - llvmPackages = llvmPackages_16; - stdenv = llvmPackages_16.stdenv; }); browser = callPackage ./browser.nix { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 5a79d8908c08..51de6c2f35f1 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "112.0.5615.165", - "sha256": "1zbrgkzcb211y1mvi9g35421dnp5bskkczwnpygzja7lm7z6530n", - "sha256bin64": "16da3zi0qy2nc92jf90zvncss3xk9ggiys3ld9j0ghbsrs1jxbvm", + "version": "113.0.5672.64", + "sha256": "0knw3i37hh874ycjlc8bl68wdhyqhma5pn7alwa6254qr5dkci9h", + "sha256bin64": null, "deps": { "gn": { - "version": "2023-02-17", + "version": "2023-03-18", "url": "https://gn.googlesource.com/gn", - "rev": "b25a2f8c2d33f02082f0f258350f5e22c0973108", - "sha256": "075p4jwk1apvwmqmvhwfw5f669ci7nxwjq9mz5aa2g5lz4fkdm4c" + "rev": "41fef642de70ecdcaaa26be96d56a0398f95abd4", + "sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq" }, "ungoogled-patches": { - "rev": "112.0.5615.165-1", - "sha256": "1q2870z4k2hkn3jh24xc0xiadd1sxc4apn1jz740yzlwsi6jmcgw" + "rev": "113.0.5672.64-1", + "sha256": "0xvgq6971qvvn0cf4z5wkfabhm7dsx2f68npfl4y2nix7hwfs6lq" } } } From 77560c8c718fac665f8590a2813f12eb8a601f4a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 00:04:52 +0200 Subject: [PATCH 056/203] subfinder: 2.5.7 -> 2.5.8 Diff: https://github.com/projectdiscovery/subfinder/compare/v2.5.7...v2.5.8 --- pkgs/tools/networking/subfinder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index ff46731fc7f9..7db37f232783 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.5.7"; + version = "2.5.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hDuRHjFl4vsQQHp/juwVPDNUZMBMGfLxyMdeUzWaPng="; + sha256 = "sha256-/q6ES1fW9/vxe03w73VyAHfOZNK6g5hxwi3qhxCiN6M="; }; - vendorHash = "sha256-qN3XX8gA61UngzDAWwrPHRJGIDoNFE44lSAtMaP6vpM="; + vendorHash = "sha256-sUkSxpWDqBe15BFVGNHTF1lV2mXZ0kjevMvdHtuNjXs="; modRoot = "./v2"; From c8b4ed1db50c73e1e2dbaefc4cf1b253fca8667a Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 4 May 2023 18:20:49 -0400 Subject: [PATCH 057/203] cargo-llvm-lines: 0.4.28 -> 0.4.29 Diff: https://github.com/dtolnay/cargo-llvm-lines/compare/0.4.28...0.4.29 Changelog: https://github.com/dtolnay/cargo-llvm-lines/releases/tag/0.4.29 --- pkgs/development/tools/rust/cargo-llvm-lines/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 21df8e4c9ace..cd7c8cf1a644 100644 --- a/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.28"; + version = "0.4.29"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - hash = "sha256-ebsmQM3KLhNfBGRXosOlim+rMTg7aQu0LXL4iGr9FRQ="; + hash = "sha256-8FpNUCOK0vAyO7f1Uy+BaqDcZ0GEFvp7meULHtUncNA="; }; - cargoHash = "sha256-YXJfEofipN33aItuqzVZkPvszeZqLyikBoF+viQgCeM="; + cargoHash = "sha256-uIB+fMSVZGZ7OTgiTEeozjPR6CuMsLgEbq/9//of6xo="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; From d9b3bcf504fe6551e337e7be1050d627f664aabe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 00:36:10 +0200 Subject: [PATCH 058/203] urlwatch: 2.26 -> 2.28 Diff: https://github.com/thp/urlwatch/compare/2.26...2.28 --- pkgs/tools/networking/urlwatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 287353e647f5..885304d9fdb1 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlwatch"; - version = "2.26"; + version = "2.28"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - hash = "sha256-EdRHwUHnAwum7UIgzmETeuQSyisb4zrmWGPgo7RewWQ="; + hash = "sha256-dGohG2+HrsuKegPAn1fmpLYPpovEEUsx+C/0sp2/cX0="; }; propagatedBuildInputs = with python3Packages; [ From f69f92952580bba312a319f9e5d0a847b6d03dd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 00:43:34 +0200 Subject: [PATCH 059/203] python311Packages.aioesphomeapi: 13.7.2 -> 13.7.3 Diff: https://github.com/esphome/aioesphomeapi/compare/refs/tags/v13.7.2...v13.7.3 Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v13.7.3 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index d9f02f883e34..4bc8ebecf700 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.7.2"; + version = "13.7.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-V4sOpgrDF+h+um/A7VwXKRE+aIUuus+eR1Z1tpt5C1g="; + hash = "sha256-Ywa3m/aUp+CBRdA80a9P2eDwlZfsVYFGbE7ZLggVfwM="; }; propagatedBuildInputs = [ From e21e086b31566d0427d9bd61a1662dd05a08f6d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 00:44:14 +0200 Subject: [PATCH 060/203] python311Packages.auth0-python: 4.1.1 -> 4.2.0 Changelog: https://github.com/auth0/auth0-python/blob/4.2.0/CHANGELOG.md --- pkgs/development/python-modules/auth0-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index c05b815bfcf8..f1294133dc5a 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.1.1"; + version = "4.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-or9lrvCWBTrbRhKDs12KVIukoeo2T8Sb2sex57DfArc="; + hash = "sha256-DyFRCQGjyv75YVBPN+1xWjKQtPUv29xblYu2TehkkVo="; }; propagatedBuildInputs = [ From baa121ed6340aba705824e6893b8e06007010ee9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 00:46:36 +0200 Subject: [PATCH 061/203] python311Packages.cloudscraper: 1.2.69 -> 1.2.71 Changelog: https://github.com/VeNoMouS/cloudscraper/releases/tag/1.2.71 --- pkgs/development/python-modules/cloudscraper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix index 86c12ec6ab14..b5cb302765c6 100644 --- a/pkgs/development/python-modules/cloudscraper/default.nix +++ b/pkgs/development/python-modules/cloudscraper/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudscraper"; - version = "1.2.69"; + version = "1.2.71"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-H/S+/urmOmcHbAJkUVFik1mB3V1RVS8FLcJmv2SZc0U="; + hash = "sha256-QpxuiqaRbVutXIperFDz6lPJrCJhb2yyGxjcxxUX0NM="; }; propagatedBuildInputs = [ From 65de422b3f6c13da2d68b4d6073e7d2e5a734b23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 00:48:21 +0200 Subject: [PATCH 062/203] python311Packages.css-parser: 1.0.8 -> 1.0.9 --- pkgs/development/python-modules/css-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/css-parser/default.nix b/pkgs/development/python-modules/css-parser/default.nix index 0b5b2e7ee877..2da8e6d8cca3 100644 --- a/pkgs/development/python-modules/css-parser/default.nix +++ b/pkgs/development/python-modules/css-parser/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "css-parser"; - version = "1.0.8"; + version = "1.0.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-mU1qARWo9OK2ZI4rEnMwNtBfoWQniqI0YwyfA+UsjIA="; + hash = "sha256-GW24Is7yJ0WvaljRgM+CBpSc7Vi0j18+6Y8d4WJ0lbs="; }; # Test suite not included in tarball yet From 6fe32e6da5d40508c666a2933b84c57586c9c597 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 00:50:38 +0200 Subject: [PATCH 063/203] python311Packages.discordpy: 2.2.2 -> 2.2.3 Diff: https://github.com/Rapptz/discord.py/compare/refs/tags/v2.2.2...v2.2.3 Changelog: https://github.com/Rapptz/discord.py/blob/v2.2.3/docs/whats_new.rst --- pkgs/development/python-modules/discordpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix index 019c86d2bd8d..e5552c4f86bc 100644 --- a/pkgs/development/python-modules/discordpy/default.nix +++ b/pkgs/development/python-modules/discordpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "discord.py"; - version = "2.2.2"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Rapptz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1XK9HRSdIhlunSno3FpvD3dIgZ4zbpSTS9kxj+8+S3g="; + hash = "sha256-Rh3gijm67LVyOaliP7w3YwKviKydnxXvu4snNrM5H1c="; }; propagatedBuildInputs = [ From 88c280611ac81b9257121f4d474b2d25c249909e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 00:53:05 +0200 Subject: [PATCH 064/203] python311Packages.hijri-converter: 2.2.4 -> 2.3.1 --- pkgs/development/python-modules/hijri-converter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hijri-converter/default.nix b/pkgs/development/python-modules/hijri-converter/default.nix index 481e90bcbc2b..cee794a7c895 100644 --- a/pkgs/development/python-modules/hijri-converter/default.nix +++ b/pkgs/development/python-modules/hijri-converter/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "hijri-converter"; - version = "2.2.4"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-nh2fpMIg9oZ9oquxqWJAZ1rpdKu6lRxoangfTvasIY8="; + hash = "sha256-BptniSkeCDD0hgp53NNPs87qO5VRbtQBAgK5ZWuhq2E="; }; nativeCheckInputs = [ From 0b5e6272d2f99fd6f210aef5641a23cd4ef8ca3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 00:55:37 +0200 Subject: [PATCH 065/203] python311Packages.hijri-converter: add changelog to meta - update disabled --- pkgs/development/python-modules/hijri-converter/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hijri-converter/default.nix b/pkgs/development/python-modules/hijri-converter/default.nix index cee794a7c895..7c6d0d85d2ce 100644 --- a/pkgs/development/python-modules/hijri-converter/default.nix +++ b/pkgs/development/python-modules/hijri-converter/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "2.3.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Accurate Hijri-Gregorian date converter based on the Umm al-Qura calendar"; homepage = "https://github.com/dralshehri/hijri-converter"; + changelog = "https://github.com/dralshehri/hijridate/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; From 646c4dcca3cc18d0f17b436a7bb31bdf903f851d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 00:57:24 +0200 Subject: [PATCH 066/203] python311Packages.json-schema-for-humans: 0.44.4 -> 0.44.5 Diff: https://github.com/coveooss/json-schema-for-humans/compare/refs/tags/v0.44.4...v0.44.5 Changelog: https://github.com/coveooss/json-schema-for-humans/releases/tag/v0.44.5 --- .../python-modules/json-schema-for-humans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index 0c05c399e8b2..54cfac9c259c 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.44.4"; + version = "0.44.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-31F7TzuXyu7KaUFcbul7ZWGH0MfakMJrh2Crel+T4Is="; + hash = "sha256-+RsJdlGMrjW2GFFLUcQBMwBnBlhST0knCleh2e3d10A="; }; postPatch = '' From 55dc96a50b3f82d8224f21c3fdd14c736f7f062e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 01:00:14 +0200 Subject: [PATCH 067/203] python311Packages.pex: 2.1.134 -> 2.1.135 Changelog: https://github.com/pantsbuild/pex/releases/tag/v2.1.135 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 6a746264dd85..116d53dda336 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.134"; + version = "2.1.135"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hVh8N/eTJL5HpxIUkLsnD985zm1pGnD5YDgwJ/3N6dU="; + hash = "sha256-h6nv91IkI+6+cLHS8CYwm9tddbjiOOWsdk1+17PutvU="; }; nativeBuildInputs = [ From 45fd7a61df2d52cd0615c056edfd283098d7b149 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Thu, 4 May 2023 19:08:44 -0400 Subject: [PATCH 068/203] nodePackages: add aliases --- pkgs/development/node-packages/aliases.nix | 38 +++++++++++++++++++ pkgs/development/node-packages/default.nix | 7 +++- .../node-packages/main-programs.nix | 1 - pkgs/development/node-packages/overrides.nix | 2 - 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/node-packages/aliases.nix diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix new file mode 100644 index 000000000000..f5b73e9f352f --- /dev/null +++ b/pkgs/development/node-packages/aliases.nix @@ -0,0 +1,38 @@ +pkgs: lib: self: super: + +### Deprecated aliases - for backward compatibility + +with self; + +let + # Removing recurseForDerivation prevents derivations of aliased attribute + # set to appear while listing all the packages available. + removeRecurseForDerivations = alias: with lib; + if alias.recurseForDerivations or false + then removeAttrs alias ["recurseForDerivations"] + else alias; + + # Disabling distribution prevents top-level aliases for non-recursed package + # sets from building on Hydra. + removeDistribute = alias: with lib; + if isDerivation alias then + dontDistribute alias + else alias; + + # Make sure that we are not shadowing something from node-packages.nix. + checkInPkgs = n: alias: + if builtins.hasAttr n super + then throw "Alias ${n} is still in node-packages.nix" + else alias; + + mapAliases = aliases: + lib.mapAttrs (n: alias: + removeDistribute + (removeRecurseForDerivations + (checkInPkgs n alias))) + aliases; +in + +mapAliases ({ + "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; # Added 2023-05-02 +}) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 0fcd508012e8..506dc8a525ca 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, nodejs, stdenv}: +{ config, pkgs, lib, nodejs, stdenv }: let inherit (lib) composeManyExtensions extends makeExtensible mapAttrs; @@ -15,7 +15,12 @@ let }) ) (import ./main-programs.nix); + aliases = final: prev: + lib.optionalAttrs config.allowAliases + (import ./aliases.nix pkgs lib final prev); + extensions = composeManyExtensions [ + aliases mainProgramOverrides (import ./overrides.nix { inherit pkgs nodejs; }) ]; diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 7fc28c6cdd40..ab425e91ff99 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -20,7 +20,6 @@ "@commitlint/cli" = "commitlint"; "@forge/cli" = "forge"; "@gitbeaker/cli" = "gitbeaker"; - "@githubnext/github-copilot-cli" = "github-copilot-cli"; "@google/clasp" = "clasp"; "@medable/mdctl-cli" = "mdctl"; "@mermaid-js/mermaid-cli" = "mmdc"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 77bf8e3f8f22..a7e827fb163f 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -39,8 +39,6 @@ final: prev: { ]; }; - "@githubnext/github-copilot-cli" = pkgs.github-copilot-cli; - "@medable/mdctl-cli" = prev."@medable/mdctl-cli".override (oldAttrs: { nativeBuildInputs = with pkgs; with darwin.apple_sdk.frameworks; [ glib From 61c2c744a1d1170d6e6a193536885f736ba4ca7e Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Thu, 4 May 2023 19:07:00 -0400 Subject: [PATCH 069/203] maintainers/scripts/remove-old-aliases.py: support quoted attrset keys --- maintainers/scripts/remove-old-aliases.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py index c5629c829594..8f04a9be4f17 100755 --- a/maintainers/scripts/remove-old-aliases.py +++ b/maintainers/scripts/remove-old-aliases.py @@ -100,11 +100,12 @@ def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]: date_older_list.remove(line) continue - alias = before_equal.strip() + alias = before_equal + alias_unquoted = before_equal.strip('"') after_equal_list = [x.strip(";:") for x in after_equal.split()] converted = ( - f"{indent}{alias} = throw \"'{alias}' has been renamed to/replaced by" + f"{indent}{alias} = throw \"'{alias_unquoted}' has been renamed to/replaced by" f" '{after_equal_list.pop(0)}'\";" f' # Converted to throw {datetime.today().strftime("%Y-%m-%d")}' ) From 249950f75d2c0e92207f71314c02a70ceac2b16c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 May 2023 01:48:03 +0200 Subject: [PATCH 070/203] home-assistant: 2023.5.0 -> 2023.5.1 https://github.com/home-assistant/core/releases/tag/2023.5.1 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a754989c207c..a0a388218639 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.5.0"; + version = "2023.5.1"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index cd5ef40863c0..c31862f59d1a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -321,7 +321,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.5.0"; + hassVersion = "2023.5.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -337,7 +337,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-zTOOQiA9nSJJR59fjkR1k+JNOvqXh1XB21i4nzQq4ZQ="; + hash = "sha256-SnNZE2FFL+PVnAoX661d5d4P1drbSPZQsL25mi4TuNI="; }; # Secondary source is git for tests @@ -345,7 +345,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-spH1gu045VQeC21OeOEYKTLkql0Gflpha927Kvd7q1w="; + hash = "sha256-ddD9hBN+UU9Z3zfNsymD7O5Fi5v1Xuh2wMPmfhrsoO8="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index dd113385e2b7..cadc4ca02763 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230503.1"; + version = "20230503.2"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-h3M2mnlJOwo05zSmjlPKZVh5npR2IAKT2ff4gIz6f0Y="; + hash = "sha256-Iz7GviL5qRjEE+I15NpquJ3seHFJPnoMasChIti4mYY="; }; # there is nothing to strip in this package From 4ac4088844ef90de20ab78415b7d2bd94114393a Mon Sep 17 00:00:00 2001 From: "\"jfvillablanca\"" <"31008330+jfvillablanca@users.noreply.github.com"> Date: Fri, 5 May 2023 08:17:12 +0800 Subject: [PATCH 071/203] vimPlugins: update --- .../editors/vim/plugins/generated.nix | 444 +++++++++--------- 1 file changed, 228 insertions(+), 216 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3643ab1d90b7..213c9222a63d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-04-30"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "cd060d2dd9abb72e24d7921cdbcf3f57cc720105"; - sha256 = "1cafzv4rl9njbjdjkza41p9x70rqjkl4by16r2xj66hfsyalnsfb"; + rev = "be6d89615216339e8bee47f52290ae204372c248"; + sha256 = "0q67vm5g44fdhpl1pn050fgzx9d6xpy78f1lrb30w5z569hzg1ys"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-04-28"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "c42ebc216a380b4ed17be313f1b5245797b7531c"; - sha256 = "0pm09qq7gpjsrij0xj2rkz6pirsdkpz2xq9gr6f1kdmvvzgi0cxq"; + rev = "25d37a2cdd6202f1d767595454a7f84f77bbd83e"; + sha256 = "04c66zbnx2xfgfzik56lyk0pzsn1bnkgrylw86j1wv1aa3nn19nr"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2023-03-24"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "45911fd6b436976ae9e83eb0a1968d3b8e72276b"; - sha256 = "09rp8xc3w7kzpcvkxjjcd9535slj2v2grl2jw5s00n4qlkvrd6p2"; + rev = "4f1fc63ef0ed1f923f306631edd680ea294cc400"; + sha256 = "1aid9g8djcjxdpikv1d9kpvav2pm53829yh21wb181rfkfls6nrp"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-05-01"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "aac9313a2c78b602f23fa59fc799768b35926e8a"; - sha256 = "02jdl4q3811y044nij8vkkb6fa7kgsi22jvs1fqj38zjqvqbmzhv"; + rev = "b8e6c7d966857e8ff14d9b6a23eec9214d99db32"; + sha256 = "100wjp9dl3dvyq82nvs8vnif2w6f64wgxl3ifxqpgy8ckwql765k"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-04-27"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "07039ea63b562caf9017a223d14eebfa1fc085c1"; - sha256 = "0bl6d9g96lfayzn7rv334b5xq54zcai7zbxjwjjlvd60wygxn34l"; + rev = "d8f2699f7ae0e5eb62424d7b2ad80ce30179ee92"; + sha256 = "1ir8yqj1zjbby4rn3cygf8rlxyk0arcrdd2jbxhpcj07ijzv037l"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -859,12 +859,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-04-30"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "3921d775d5db0c9bd42fe4026f68f762e2480475"; - sha256 = "083yhwfj2cci3wazda5qn69m4sbm41p7p6xq0xaq84c5m6v17lmb"; + rev = "de37647f05a5b556b6426b78c4608bbd40a8089f"; + sha256 = "0c8bf8ikz6vpy3284cb820f88gh97fgiyhnw7nb4cw86hhxkviv7"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -931,12 +931,12 @@ final: prev: better-escape-nvim = buildVimPluginFrom2Nix { pname = "better-escape.nvim"; - version = "2023-02-25"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "max397574"; repo = "better-escape.nvim"; - rev = "426d29708064d5b1bfbb040424651c92af1f3f64"; - sha256 = "12vpiznrnj1kw47bp8q3d6pgnb1j84mqvp1svarmqzbsg621gd0r"; + rev = "7031dc734add47bb71c010e0551829fa5799375f"; + sha256 = "0pabbcx5b5varpd9xc9lrl767fv1591h0r4zk28zb31finx5i48k"; }; meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; @@ -1039,12 +1039,12 @@ final: prev: bufexplorer = buildVimPluginFrom2Nix { pname = "bufexplorer"; - version = "2023-01-07"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "jlanzarotta"; repo = "bufexplorer"; - rev = "5a830d5d2d7417bf02339ec279c90e98dde822f8"; - sha256 = "1vcfz4ngk5jsh66l74na9r0z2d3y6annb518kv0lgv76z99g5vy8"; + rev = "20f0440948653b5482d555a35a432135ba46a26d"; + sha256 = "0bh3p4zqw75nky0c1ff5wjavzqv0px9ypy62ddriayb8p55nmdn0"; }; meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; @@ -1063,12 +1063,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2023-05-01"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "9f55bff3561e4c0ac5168487c64cb30d0ab75408"; - sha256 = "03lvk0l5402zfxqviipma9s8f8hrzg0pdkcrc3lc5q6iklk20hmf"; + rev = "41660189da6951d14436147dff30ed7f0d12ed01"; + sha256 = "0bz4m6ain9kvpb85hr5d2y6m63inggnfkv5cfny6s2cd5a7py8ia"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1663,12 +1663,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2023-04-29"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "7fa0459b0cc0498375c5a1e14fb8d21d130bb198"; - sha256 = "0xgc1vzr0hhbab6b5rhgrv3c656x1yi86cmz008jij144w6awcgf"; + rev = "b713b724bc622167c5eb8d98651a1ca607d52e61"; + sha256 = "0libfagkzzqmzrvyhx692hx2bcsqwpz3bdj04jyfwll7bwslzx6r"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1939,12 +1939,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2023-04-28"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "38d3b7eb553872d8866f14a0dd4fe84126068fce"; - sha256 = "1d1a2c864y24lnr8h1xsg9krrk9604vy5mawjccn2fzq9g5vg6z5"; + rev = "e1fe53117aab24c378d5e6deaad786789c360123"; + sha256 = "13ypypkb63j8spg9av9i7n0yp0g4d1hwrym0f9659r0kxmzy9h88"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -2143,12 +2143,12 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-04-29"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "19c1c945553918d683a001e697faad933c41bb5d"; - sha256 = "040885dckmrdi3ym2dz255cisvgka0ykglql54sc17lrfihmiiq9"; + rev = "21d8ef6ce4ac931ebfa3fc3c0afb65bb05db9fc3"; + sha256 = "1k4s6ai31zwwmjzs0x6xa9v19k8kkhv7669my1n24wlnivsnr2sh"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; @@ -2239,12 +2239,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-04-23"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "5a529df8fe3504ccf1ca9526e196f48b2f723c72"; - sha256 = "0xffp0igr3rs2czzbkx5nr19wza1kyqsk7xf963baqsw0zj6wh7v"; + rev = "bb5ce73e9c41865e22329da118d91a565089e4d7"; + sha256 = "1qz8f4mcvjsh3qyf9jj0zlrs1pnm5jrnjbz70kzv1j0zf689ypds"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2275,12 +2275,12 @@ final: prev: csv-vim = buildVimPluginFrom2Nix { pname = "csv.vim"; - version = "2023-02-20"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "0f6900bf1d0f2ccdbe59ed246db4a82e5cc16e78"; - sha256 = "0yi9r665xsvp2043mwc58wljfnsp38pzab7j14mb0fcs787r0kq4"; + rev = "15ff93edf5b26c466affbb356e0696b7d6a3b499"; + sha256 = "0mjvy0lbcd3j5dnfq2575m29pbs8w3asdwmknhnk6by6aih3mdsj"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; @@ -2347,12 +2347,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-04-27"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "be2420c29fd4b96d095b631c5a9cbd7fd4bd5aa3"; - sha256 = "09afhn9g2x6i1wns4r5czbghav3hl9bxzvaj94a8j9jhvifq2b0v"; + rev = "0af0ad181db271ef8d5a332f4cfcec9118340497"; + sha256 = "0fvfgzs9i6ggy213c3whd91pk7k2lis9j23ah3b0jnr69h0gwqv6"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -2443,12 +2443,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2023-04-30"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "b23b7c7dc2b38fc2528927adb7bbcb0552ec7c7a"; - sha256 = "1xlsz4g39vs8nmg4asbb9b56n0df0hq2nc2ywsgcqj68slay8lny"; + rev = "2f4cf55846774c70996b009adb030b109d90d4af"; + sha256 = "1gx3742v9hcfa9zwmsfba2pwjssys6n7jbs99n50z04lrndjnnk4"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2793,12 +2793,12 @@ final: prev: dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2023-04-22"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "f5d7fa1fa5ce6bcebc8f07922f39b1eda4d01e37"; - sha256 = "15n2pzv9iydn36067bc08xqzz7dwnxyrnz25v1afcfg5ph7vl5g0"; + rev = "540d6e7115fb32b5035ddaf0c1a26cbffb855dac"; + sha256 = "05zfhcybv5s5a08hbiflmp28pc5mqadsgkd3ich9sdj63f28lks8"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2854,12 +2854,12 @@ final: prev: elixir-tools-nvim = buildVimPluginFrom2Nix { pname = "elixir-tools.nvim"; - version = "2023-05-01"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "2890da8be0ab1af2de3ce3b2bdb99e843c5d561c"; - sha256 = "1c69jr2w6cr7sz1964amp9p5ffdgajnv75ymhpqqf5jz3rdyn53n"; + rev = "53946c8d1d9f7ab8f5dff8834960fb547db2bf9b"; + sha256 = "11k5c37aqydy0bzc917mpc43l8sf0klvy7scihldc3x3xpnswc1x"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3144,12 +3144,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2023-04-28"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "97f9bdea0374c3553a3a11b8e4d2b21f11855463"; - sha256 = "0awkwf82rc755bdv2qpd8sfk6ciwss73q98xirwpzhfdikisdm5n"; + rev = "627fadf8200bacb0b55db29d9bbab305a1b43c65"; + sha256 = "1sf3ps1rm6acihc6mcf503gljbp6j767vw90i4zkxzvpp2fm4lpp"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3180,12 +3180,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-05-01"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "2308366ad625f61284e51d249ede4f795394b186"; - sha256 = "1vvlqc8a2v2891zfjvw3knmrvxszx1zzyh1jkyszz4ii8h3f746m"; + rev = "10f741908e56ce47cf6b3440e3f04b4fdc0da2f2"; + sha256 = "0zq2q844nqr2jlikxrjvd478zbpgsr50m3jpdnbkzrdlf658y3ln"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3707,12 +3707,12 @@ final: prev: haskell-tools-nvim = buildNeovimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-04-23"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "1a2f39087306ff14c2d668a2b19335362bcd27af"; - sha256 = "16ffw6r2g8yxfydlkb4wz0bmvipawi3nxl4maasxagcjj41wfaxl"; + rev = "55c2af43c1624acb3029e12d6c0a2287447dd875"; + sha256 = "1sajin39y13kf1w8mgsmnmjl29bc6x35dkclvbzk3vzvkbhd2bv7"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3814,12 +3814,12 @@ final: prev: hoon-vim = buildVimPluginFrom2Nix { pname = "hoon.vim"; - version = "2022-03-22"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "urbit"; repo = "hoon.vim"; - rev = "233d48ab2621877d8899b7a75b70f379ce36a066"; - sha256 = "0bq8vd6dnf39y3686snaywp8krmjghfsxnnm0k1cyv20g1mf54s5"; + rev = "dd7d8e3926ad3eab94d363604f652d799ae55b93"; + sha256 = "1bm7h1hvc2y3nq6si1l4ac2m7aribz4ixpdxnnll8zvd0dz23a0i"; }; meta.homepage = "https://github.com/urbit/hoon.vim/"; }; @@ -4199,12 +4199,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2023-04-30"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "12f07c5d68ba6b09b53ab528de6df68e55b4cd9a"; - sha256 = "0v7wm2nkqwblasjw72f6k68j6v21w66vf9adzqhs8w5p96y27pl2"; + rev = "c261d50794db8de0607de1c01a1f4c088d9f1906"; + sha256 = "1rh2p2hkn1gsqbxca2yv8rlajmgddg24asmjbmlfiwgd9xh6mn8f"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4295,12 +4295,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-04-28"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "bb5cc9ef3bbb17541929b745f74551c900188099"; - sha256 = "0pvnshf64s405fh7igb5091gq414fyylq2kzw86d2hsbrdqn3x46"; + rev = "ceb413678dfcf3d5455208959185e3db1f7892c7"; + sha256 = "0ydzivwa9vczqiwp7n0yxnxi3fixxns761swrar9z7vj427fvxkw"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4367,12 +4367,12 @@ final: prev: legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-04-20"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "4fc7d11d03df874ecd7a8cfa6055d7a4ce2cff87"; - sha256 = "0y4wgla8w2b8yc7bynchaiq1vcv9i9yvvzgia1zdfky7ph47r1jk"; + rev = "42e32d51b685f16fe6b56367b308dbdd9c01dbd0"; + sha256 = "1mc5lkw1alijl936iwahrawl0j4k8s4y10zb0inb8svdbjwd9wsd"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -4727,23 +4727,23 @@ final: prev: lsp_lines-nvim = buildVimPluginFrom2Nix { pname = "lsp_lines.nvim"; - version = "2023-04-09"; + version = "2023-05-03"; src = fetchgit { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "d9c8a71b8b6e6bfa2b5cf015f59450472dbf06fe"; - sha256 = "0l7q1x8bkfnzhfing5gsbsa2cgkrjx02w018rhhldcix2l5ih9p0"; + rev = "512d8c79637e7aeb889240c2e0ca8ae327940737"; + sha256 = "0j0wzb3g04f6i1mp8m9f1rzl71d2h1738ardw5swvr9p9x04m22p"; }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-04-27"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "9616a1adde75a108495dd97ec8bb46f908d552e7"; - sha256 = "0miv96jg6sbih9clivsmxl5qdma8hqjpmq7zxdk4x4pzmzj2sb7i"; + rev = "7a26ebaa7e36aa2aefa6c1994b2b866c96de32e6"; + sha256 = "0f7fjb947hcr946l93p0bh1n649qn6s4d4lzf0xzgj73dsq0j8z4"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4762,12 +4762,12 @@ final: prev: lspkind-nvim = buildVimPluginFrom2Nix { pname = "lspkind-nvim"; - version = "2022-09-22"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "onsails"; repo = "lspkind.nvim"; - rev = "c68b3a003483cf382428a43035079f78474cd11e"; - sha256 = "0qrfqajpbkb757vbcjz1g7v5rihsyhg1f1jxrbwg08dbxpw101av"; + rev = "cec39a0651679931ce2e503123c633b0aeae5fc6"; + sha256 = "1bmqnylimx08xw08w06xhjbh2bdf40qk23vwm78cl8qscrljqi8y"; }; meta.homepage = "https://github.com/onsails/lspkind.nvim/"; }; @@ -4810,12 +4810,12 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2023-04-09"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "84ffb80e452d95e2c46fa29a98ea11a240f7843e"; - sha256 = "1gm1s31vmg0zj018yi2czabsylnvxkzx3icy5vf6pvs907gm5gxv"; + rev = "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9"; + sha256 = "1nh8yrcfq654qwj2zpkqsd62cz4p6mii998lxhs6mf1a8bqw9lcn"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; @@ -4919,12 +4919,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-04-28"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "43f2ddf0b5f544d9bb20e24b8ff76b79f2a07ab0"; - sha256 = "09g8hlracxiplb61wbxmg5z3f4sclaaayh5pddkjrmnwl5mfki54"; + rev = "cec0e6dd534ade486b5eeb59ebcfa8d51c3e8c5e"; + sha256 = "0gv5bhc7jpsaxg7rgj52kvsnxrkqpww63zychrxc8mafbc3jfnn0"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5015,12 +5015,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-04-30"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "88a6b58b4775b78e5028fb18f4bdc3090bb52923"; - sha256 = "1rn2bcv0rhqwm21aaa813w9b2dkv3g0r58f3y4vc2hy0b8yxq1lh"; + rev = "37837ffe6b8be7ce0d8d23adb3f413a56e712543"; + sha256 = "0fmb5l9vgh4x1yq18qrway4sdvw27kfmfsi7b8wwkd7gc766643i"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5375,12 +5375,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-04-27"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "ccc79c8096b0171c770a59a05d69a22f49d6d6c9"; - sha256 = "0is0wxx8315a8qx63zf97646pva4n50qbfmg54bz327hf8bqnfaf"; + rev = "321f4ff65cbec0e67e54f1a03354b8e6367c8230"; + sha256 = "0sm52j2cd664b3c9cfzin0wmdq9j31ij1sqxjndmymg1a3ip9gzk"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5399,12 +5399,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-04-29"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "7e3f718f43de41053f77b1e8de6de2b759fc4023"; - sha256 = "17f5bvjac682gcp9f3i4sg4n6nwlhjax8n63krjfkxw37rbzhxp6"; + rev = "ab4c68129b5fefe5c6bb6d7e92283d3f8bdf8566"; + sha256 = "1b784p5cysrji8hvafs3kkrf1fpqrb08ji720q23rc60yyvqz0bp"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5423,24 +5423,24 @@ final: prev: neogen = buildVimPluginFrom2Nix { pname = "neogen"; - version = "2023-03-27"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "9c17225aac94bdbf93baf16e1b2d2c6dcffb0901"; - sha256 = "1plc0kb0pdyciwd4kwgcqqiqn4k0gzlp4p8s1578x1bjlf1cpwwk"; + rev = "c0fd3dc9e7cc91181ea5a345c4b01c865626c81e"; + sha256 = "03ga3mhhhad4nlqx5r6afj2rmxy4j830cmvspvqamkkf0m7xn9ag"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-04-13"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "69a6ca7c41b023ebf9cad70778e227b3209b40c4"; - sha256 = "1r5dii9510hb4qd63g32hrrrn8m3dmhwlp8l2ilig2vzcpics6mq"; + rev = "d7c66e5e8752e0cc76336a78c4432648cf3102e1"; + sha256 = "0h5q4i8q2nz4a4lwr9gkrllqmn2dz4b14yazdyvq2ljjaqziv03q"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5495,12 +5495,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-05-01"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "ecfb426fcd9e8cd606645d05553b3e835288fab3"; - sha256 = "066d5i1yc39jmzv70bdiqb6gf7fpq49xj6k765v9hpv86z7fshmh"; + rev = "6aa9fd303c807ed1ca3fb15cdeab1e322d02fd31"; + sha256 = "1xlaq1fv1a511gm1s1j04jirfsq7i6p2rxnjf1dlfr45qscfw15v"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5555,12 +5555,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-04-27"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "972a7dc9dfe860649edaf89e08c514a98d3a2a09"; - sha256 = "12yj02k9yjflq4p10wwb354mxc773vdibmiyf503xp56q48c3rbp"; + rev = "32beac0c0736aeb7fcb7eb6cd93307bb5eeee30a"; + sha256 = "15rhzz4kw34ncavwa26kxq4l05xi98dcjsri3lj5w9q5nidxphxd"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5927,12 +5927,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-05-01"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "9443ee10595ee8e0a481f949e827f156b8c63b9f"; - sha256 = "0r7nmrlrp9lfg8z69i3ngna9kfwyszlp6f4d33pzn9v1if14mcp9"; + rev = "91bec1718f9ee1e8de61303c274d1c5fe1d31572"; + sha256 = "1prc20fsn1zcj8xjck3960zwj3d07dx96850x891dz5hw9v9g3rs"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5975,12 +5975,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-04-22"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "0f12ed399e79aa49f283aa954468b92be65e03ed"; - sha256 = "196lc9y6bfxivsfkck739dkr66arf3jgqgyaha34nc7mk9s0395g"; + rev = "6a7649413ef61123c333f422ee95840c04ece161"; + sha256 = "05gfgwlvxmr9zy6dw862pdddpdhxww8d76gpj6yn017vcfpy9nia"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -6167,12 +6167,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-05-01"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "c3f7c54f6efed83b5657b1cf2e2a9bb7c121c6b4"; - sha256 = "10d1va35izy4cxbpsyh5h2p5jqxwlwpb5pafhb8fw72rqf02lda7"; + rev = "0f47dcaf7e39d64cd067e090e6f2eda6326e7366"; + sha256 = "0gjs3cji176wszq5nk0dr1xvw7k3wlbl98zxnn645b325fwfpwcr"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6251,12 +6251,12 @@ final: prev: nvim-config-local = buildVimPluginFrom2Nix { pname = "nvim-config-local"; - version = "2022-03-26"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "klen"; repo = "nvim-config-local"; - rev = "af59d6344e555917209f7304709bbff7cea9b5cc"; - sha256 = "1wg6g4rqpj12sjj0g1qxqgcpkzr7x82lk90lf6qczim97r3lj9hy"; + rev = "55b9f8520a39b45fbfc9526c39765c7c9ed2c166"; + sha256 = "062dvy8fdpg3zgh70hqsk0n29mz0izfll9g6hs34ssg6gkn2b3vf"; }; meta.homepage = "https://github.com/klen/nvim-config-local/"; }; @@ -6311,12 +6311,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-04-09"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "286f682f366fbc652b38dff893569374e9433dd3"; - sha256 = "1kd54ivihbm847iqxpbjz227zzwmca40lxmc4qaacbcm8afbs24i"; + rev = "749bfe12d1447703899fa823c1c075fbe2d42c24"; + sha256 = "1yrd8v91miyni5pka2x6vryfmgpsx73hpdx3inzvs2hkm5kaydpi"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -6407,12 +6407,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2023-05-01"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "ab5f7c3bf32401f1d6c90b31db309daf6d004ebf"; - sha256 = "0yf5pzgskia5rxc3hx479rs4qwi2c2dqajvib80119jbf7av11j6"; + rev = "624fddaf856add7a4a9a40b33fad3bb3818f4fc8"; + sha256 = "1r65wcpbdqi05mpa9382bawv32l2r0s8avr9in5q07sl66wd59v8"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -6527,12 +6527,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-05-01"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "5f7a8311dd6e67de74c12fa9ac2f1aa75f72b19e"; - sha256 = "1m00hlixyisv2ccvsnnv0rir5y4219m8y6xns673j6hsg5jsnjsg"; + rev = "3bd4ca412982afa6f88bb7ef890660cee51c3e58"; + sha256 = "1rnzqr5wnk0zfi85dnrqccqs7jrg8ibd9bqzj4qqsqz40l6bli1s"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6575,12 +6575,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2023-04-26"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "26968e2768ffd59f7dcc26693c534ca91a80c928"; - sha256 = "0vgpkcdxicfrnbr38kxlqlhy6fqb3rm36rn89ywhnfk9qakn0l0a"; + rev = "facb97d53843cdeb6f5483744a3e6060304b01b4"; + sha256 = "0j2rc7vbq3957sqajf619agg7v2b2scdyn23qmicpzsmxsd298ij"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6803,36 +6803,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-04-30"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "0df384b6c0fa62ff1333634d56ee4df0be5d34e1"; - sha256 = "1iqw7hwdjs5fdcpjmizi16pxpgak5zf73p78v0sdwyx8z4pd82vn"; + rev = "53295de04d265fba695ec5a21912bdf36647dbad"; + sha256 = "09i9x7d54ph6v30ih13cbmy0sicavsbzl22c0sp8srwphv4m8hpj"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-05-01"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b4d2640eab4b1f6373e1ded84ab9f6db0c02c756"; - sha256 = "0ha614qcnklqcnayy0fxw901mk9njcwqrf5hcpd7dvbwx60iqz54"; + rev = "54741de02c18fae1b33d2b0da36f5ef946712073"; + sha256 = "0l6m3sf03yxjf1y77w0nx5jnd9vfahz03yrgfzpnvjbd8y3vn70y"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2023-05-01"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "e1dc868e61766499746b5b7b22671efc1f33181e"; - sha256 = "1y8rhx9315pnj43925ljjyxykpdg126zzqzhd2dprikhn9clh3w9"; + rev = "0226dd639712141235d5c9eefde47365d15d0535"; + sha256 = "1j9bd6k5pnprwpfw1wkppa0bfn9wqc31hgpj4bvivl1k25vmagwm"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -6875,12 +6875,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-04-29"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "85a6f9d1af8b731f09f4031e1f9478d4b40d13ab"; - sha256 = "1dgqvj5j24r3058vxqykj9j7dhf6pjnch7bccxdnc4an4x0hmwiz"; + rev = "5632f926833493bf44de3d0c214169a062b068df"; + sha256 = "1p4zxhbhsdxxigrhp1lbrk43414w8bz61x2rk4vw253ky3j5bfbq"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7042,12 +7042,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-04-29"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "82c706822bb13a8ea7a21e0e3dccc83eaf40bfbc"; - sha256 = "0qkp0axsbq7wwdqr20zqmgvc8k2zi3rfrspi5d0c5qq5yih518b5"; + rev = "37cb6be6f6f98c4616ca382ad955c709dc38f39d"; + sha256 = "1gni86ghw68mf332438naqsgpiwl07g4qral2mhkcga94kjaw1sg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7091,24 +7091,24 @@ final: prev: onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2022-10-10"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "b6b5ffe31a195a3077338d7a506b905e4a51590f"; - sha256 = "0mw0z6z33xrxs5yp5d2jm8wvrlicj084gmw858sbx9d9ph4sdyj3"; + rev = "4e983447f0442dba1629cdaeddfd137793d71d28"; + sha256 = "1vg5zfzyl9c93w9i3d4i22px558warma9gnpafgklrxkwq1hxq0h"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-04-22"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "0147f69893496b3df605d64acdf4b66f03b0654e"; - sha256 = "11xxjw1x5dn32g42v61kxyr2g4j0nci4skla4bp4lkdywi6ag1cp"; + rev = "d9d6cd9ba5b4e9d15ea2e9730ccf569f7fd0ffaa"; + sha256 = "0lpsdcic1nllbx2q6dgg6s8sw5is3j52ckyxii8prcy3rqg20f00"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7175,12 +7175,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2023-05-01"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "4647d20e33bf14c70fd44e1a4ee071ce1351d139"; - sha256 = "1rrqbkqk837plkizzxp83w4agqikccgp6582ijwxhnc526qlz7nm"; + rev = "07d412eb15155c8391945a5bbbfd1caa996888bc"; + sha256 = "118q7in4s18hh71gwfyd1b8nxn6ac4rzc97zbxncn85hnpl9rfsb"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -7693,12 +7693,12 @@ final: prev: rest-nvim = buildNeovimPluginFrom2Nix { pname = "rest.nvim"; - version = "2023-04-27"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "4ca39f739919c43b620c6fc9e314fdee136bdd54"; - sha256 = "1jwr0gbz0rrp8gfc05l3m9x6y108n88ara4ckc01a75sr5k3nk5d"; + rev = "3bb920f28faf15f7dbd78e3ebef69fb5655327dc"; + sha256 = "0czhzhv45y79iwm2yyc9afjzsl88y28y71jqnvwkxp2ycyk87hz6"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -7933,12 +7933,12 @@ final: prev: seoul256-vim = buildVimPluginFrom2Nix { pname = "seoul256.vim"; - version = "2023-01-05"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "8f81a2f9f7ced9f8edea7f8a06caf5eaa9d9a217"; - sha256 = "0vjdmiapz4mx9c2hg39hs45k9zwj5zk8cl757dfwbj6y5fqkznv6"; + rev = "b21c9e63f7c2d543db8b34a393a0b42ec7e9b891"; + sha256 = "0bj3c0869b8wvx9rskp3hhw85a0abysgkm4zzmacrxhkcslnayiw"; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; @@ -8018,12 +8018,12 @@ final: prev: smart-splits-nvim = buildVimPluginFrom2Nix { pname = "smart-splits.nvim"; - version = "2023-04-30"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "c9ed0ebe308bf157fe7c2f10ab6d9dbef5b2be94"; - sha256 = "1b06w8gn76qhnirgrhkn18hi1vb6ylws2pg4nakr8ga7bj6djm38"; + rev = "a2668b59bf3f9b87d47b42e7e8d08200ff0ab3b5"; + sha256 = "0lgm0vp42q6sz4ncv0mrss39c0sidb085plkww9k62n1pdwd8kwv"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -8319,12 +8319,12 @@ final: prev: statuscol-nvim = buildVimPluginFrom2Nix { pname = "statuscol.nvim"; - version = "2023-04-23"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "b115b5d7a4ea5d4b152d61d89457cc874e08a7d1"; - sha256 = "026j7m8la14pfz9xqmw13gr1x8c9yx9ykqq4wa8x7cyf3a1s8z13"; + rev = "7ee8d982331019fec3a90ec87b98d6b4405cacbe"; + sha256 = "1khw24f5a9ssnya2l2kg6d16bn7mw1ny1w9r985w7fga9j46w0zv"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; @@ -9164,12 +9164,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-04-28"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "c5df636ce62a8aab7565f35da143cfd672526302"; - sha256 = "1pfhrkn4r5r4pnr7jfc6cv29ijjvyacs7zpyarhi6fzkvnwz4pdw"; + rev = "f2ed28707a0ad49047d9b733395ea205ea09f517"; + sha256 = "0815fywkzjdf28lc3cc9dly2kz8hanbid8zb9rzw41lbwbmkmmwz"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -9200,12 +9200,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-04-24"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "cba4aca075e4a9687cfd34b40328cac06126bc07"; - sha256 = "0dz4a8jnq5ii0h8amlc5gcx08qqgnj7y2l6hb89iihqibvcny0ma"; + rev = "f487c9117c79b118ab792ffdd12125626c63b281"; + sha256 = "06nd1r7biba3fqpy04014rvcwaqsbhhxawv4mchyi357b602jb8w"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -9356,12 +9356,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-05-01"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "7e6936ed62620080322ca254dfb60aabb9bc6774"; - sha256 = "1bz41fcp7ry8wpl38q9q03kc2mwc2cnqy3m28fvyzcplpary0x2d"; + rev = "bb80d37d39c48d4870c0574657cf0337ec733d33"; + sha256 = "1pn4qyn26ai6vr9i992kp5jn6858pz7n64m1zmj6bpc635g4rrbr"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -9452,12 +9452,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-04-04"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "a8130c37d144b51d84bee19f0532abcd3583383f"; - sha256 = "17afzlz508ry5cc52w2dgs480pm8qbr9skr56k944jcrh430rz4y"; + rev = "07fec88cc592d131e028cb70242c8b216ecde149"; + sha256 = "0abmwq4sqfq3b3qmn49czj6avd5m5h0h3n6gdna5bj7vs19dbg8f"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -10916,12 +10916,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2023-04-14"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "79d12ed0384d2934c27daee8f5f49b8390c56014"; - sha256 = "0q084z6lbhd84qgl7zz6xkfzy8x5raw3lm5gix93wdi0kzczchpn"; + rev = "21dd4d655339560d0f4b876852ef0cc8ff16b7f1"; + sha256 = "01c3y9gkx4gmr5b6bxcdf0g45bd6w7ka0dm74jflfw75gg9c69rf"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -11854,12 +11854,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-04-27"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "507565f281a739c7aa1d3852d96baaaf4ee93882"; - sha256 = "0d8gpb3nw5p5wilg70gf3vbr6xgjq4h4v82fmnyyjysxx2hc5vkf"; + rev = "6017a30e8ac75774be8cdae7bd996efbc9c1598b"; + sha256 = "1p4a081x4vfy3rli5n4a4mmnykq0lpx38qhkkgbnc7fvw92x2468"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -12395,12 +12395,12 @@ final: prev: vim-oscyank = buildVimPluginFrom2Nix { pname = "vim-oscyank"; - version = "2023-04-19"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "ojroques"; repo = "vim-oscyank"; - rev = "7fa8b04562d4ba2c23e67e7038256ecabc8fc376"; - sha256 = "0cbpjffjk8ydwb9kv1sblggrs5j2hdk7l57xy7k0r7rwd5kmwj5k"; + rev = "ce025bd8237a6228beabb04b66d29566b2453f7b"; + sha256 = "1grlz5dn35mqn9gqkvs3qg9qd9wvwiib7ln459pll0nkfycbf20g"; }; meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; @@ -13488,12 +13488,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-04-24"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "5af7aa2a07c70f730b03c893821366961b108cf2"; - sha256 = "0pgbq148pfizjklg4276n9rniklqqhhlg48p73i2capgkm50hnjd"; + rev = "c19be85a9b3d8b86f37533bfeb82cbe189cd895e"; + sha256 = "16216q8d0dd10i84sh5v5p6bmvfbw86sh7zd7k0fwbaa6yfbpk2v"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -14208,12 +14208,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-05-01"; + version = "2023-05-02"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "6cb63b9329685b750b9b689a942c47b9012c8bbc"; - sha256 = "1y9vs7gyv8810d8frm11izbcvasj777rw448mmzag2agksyv17yf"; + rev = "e69222931721673d48fa9177325b1740e93e6ac7"; + sha256 = "090kcz3jzz1yk52hv8l4l80aszs2cs782f07ca6l40v33ng4pgkk"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -14221,12 +14221,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-05-01"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "871ac461e9314598b5b26c3a1a9f5e36c17dff14"; - sha256 = "1n1qyg5v4r8j816y5abqclhmsyny0k3arwlz23rlvdidwq5d1zn8"; + rev = "18255a2370812696138cb415a5b02925d33ef569"; + sha256 = "1m9c499n34xlr6vjrb6zqgwj6g1j39xxdwl9c4f6biamraxix365"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -14341,12 +14341,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-04-27"; + version = "2023-05-04"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "4acffc92953a90a790603bfdab7c92319ab167b1"; - sha256 = "1msiqpxsnmdxgxcxhlpgjaz9fyg2jy4lbvfv0p8b265vlnym4ymy"; + rev = "af8f26bfbb61b5f722c9fbc72b296dc9db0bcfdc"; + sha256 = "196g7rf2d0jvi7gj2l37rggn81pfd7d8wz0b967yqffjsl4jk0ay"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -14582,12 +14582,12 @@ final: prev: zig-vim = buildVimPluginFrom2Nix { pname = "zig.vim"; - version = "2023-02-15"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "a0d9adedafeb1a33a0159d16ddcdf194b7cea881"; - sha256 = "0qcjwms102cpdbjamda3cbdwbqdk4zj5zrvr9dlj2lmwkdjqqfdz"; + rev = "a9633f5f5905e448049933bfcdaab632447c4394"; + sha256 = "1bi82sdq7x46f6z9xv24x3ahhsg7bxcm2wabjfw5wmlpp6m13csa"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; @@ -14628,14 +14628,26 @@ final: prev: meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; + kmonad-vim = buildVimPluginFrom2Nix { + pname = "kmonad-vim"; + version = "2022-03-20"; + src = fetchFromGitHub { + owner = "kmonad"; + repo = "kmonad-vim"; + rev = "37978445197ab00edeb5b731e9ca90c2b141723f"; + sha256 = "13p3i0b8azkmhafyv8hc4hav1pmgqg52xzvk2a3gp3ppqqx9bwpc"; + }; + meta.homepage = "https://github.com/kmonad/kmonad-vim/"; + }; + catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-04-30"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "94d10b558e679447064fe72ddf764b6fea3f0c85"; - sha256 = "0pklfhfhwnwgnjdkv80gwc3wjcd2q7hsjs7wwjsbn5j6bv1f3x5s"; + rev = "a7e279d6e019f35dd042670f00748b602fff5568"; + sha256 = "024w2z0j54sz6mq3xx0fwnaz36d635s4y45fp22rbvg7idr4cnn8"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -14702,12 +14714,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-04-28"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "349b3d412d4d277a7b2971352319a463952623c4"; - sha256 = "0y507651aqznknzw5fw0v7mwp6bcxz03cqgzmyrkb5qvbhpzdsj4"; + rev = "f65d03cad9f3ab6c2c83ac0fbe2cda50731eb79b"; + sha256 = "09aspcjvf6a8rv2yl7mzxs0p8xrnyw2gx8438sdmhis41hq770s0"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -14726,12 +14738,12 @@ final: prev: nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2023-04-10"; + version = "2023-05-03"; src = fetchFromGitHub { owner = "nordtheme"; repo = "vim"; - rev = "f725ac643afce04021c9abcbb57711fcb9fa71e9"; - sha256 = "0pbgcpqfzwari78v5yypidcy5rlxdsklg77fkjgzxgkjikmbil8s"; + rev = "f13f5dfbb784deddbc1d8195f34dfd9ec73e2295"; + sha256 = "1f3k8hxf21fij776xw830f71wvl6v5qmv5h806l773c9sx2dp1rz"; }; meta.homepage = "https://github.com/nordtheme/vim/"; }; From 1f6fc08d4c2edd328c18b2847de8c48e2c9c48cf Mon Sep 17 00:00:00 2001 From: "\"jfvillablanca\"" <"31008330+jfvillablanca@users.noreply.github.com"> Date: Fri, 5 May 2023 08:18:41 +0800 Subject: [PATCH 072/203] vimPlugins: resolve github repository redirects --- .../editors/vim/plugins/generated.nix | 24 +++++++++---------- .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 213c9222a63d..95b615ec4395 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4221,6 +4221,18 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/keymap-layer.nvim/"; }; + kmonad-vim = buildVimPluginFrom2Nix { + pname = "kmonad-vim"; + version = "2022-03-20"; + src = fetchFromGitHub { + owner = "kmonad"; + repo = "kmonad-vim"; + rev = "37978445197ab00edeb5b731e9ca90c2b141723f"; + sha256 = "13p3i0b8azkmhafyv8hc4hav1pmgqg52xzvk2a3gp3ppqqx9bwpc"; + }; + meta.homepage = "https://github.com/kmonad/kmonad-vim/"; + }; + kommentary = buildVimPluginFrom2Nix { pname = "kommentary"; version = "2023-01-06"; @@ -14628,18 +14640,6 @@ final: prev: meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; - kmonad-vim = buildVimPluginFrom2Nix { - pname = "kmonad-vim"; - version = "2022-03-20"; - src = fetchFromGitHub { - owner = "kmonad"; - repo = "kmonad-vim"; - rev = "37978445197ab00edeb5b731e9ca90c2b141723f"; - sha256 = "13p3i0b8azkmhafyv8hc4hav1pmgqg52xzvk2a3gp3ppqqx9bwpc"; - }; - meta.homepage = "https://github.com/kmonad/kmonad-vim/"; - }; - catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; version = "2023-05-03"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 9dc5a3f02074..606ede72d5ae 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -353,6 +353,7 @@ https://github.com/neoclide/jsonc.vim/,, https://github.com/JuliaEditorSupport/julia-vim/,, https://github.com/rebelot/kanagawa.nvim/,, https://github.com/anuvyklack/keymap-layer.nvim/,HEAD, +https://github.com/kmonad/kmonad-vim/,, https://github.com/b3nj5m1n/kommentary/,, https://github.com/udalov/kotlin-vim/,, https://github.com/qnighy/lalrpop.vim/,, From 84870fdc80b9cb05bdac6d5e55d8be362e0c5e1c Mon Sep 17 00:00:00 2001 From: "\"jfvillablanca\"" <"31008330+jfvillablanca@users.noreply.github.com"> Date: Fri, 5 May 2023 08:19:45 +0800 Subject: [PATCH 073/203] vimPlugins.nvim-treesitter: update grammars --- .../vim/plugins/nvim-treesitter/generated.nix | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 34bc432a8d06..47a273aea907 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -115,12 +115,12 @@ }; blueprint = buildGrammar { language = "blueprint"; - version = "0.0.0+rev=6ef91ca"; + version = "0.0.0+rev=7f1a5df"; src = fetchFromGitLab { owner = "gabmus"; repo = "tree-sitter-blueprint"; - rev = "6ef91ca8270f0112b9c6d27ecb9966c741a5d103"; - hash = "sha256-E7SWUWQFlFWXfmdqNXt2eKkvFusnBUILHerQEFj2JTg="; + rev = "7f1a5df44861291d6951b6b2146a9fef4c226e14"; + hash = "sha256-ihbcrDRMA+jGs7ZmDU1j9PwTEYY6SyMhC0vgmh1Om6Y="; }; meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint.git"; }; @@ -137,12 +137,12 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=0dd182a"; + version = "0.0.0+rev=2340fd6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "0dd182a14a519a70dc60c3727fdc2fdb65c030ae"; - hash = "sha256-yIZUsEJvQkxD4gNp4jQRGtEeSTLeSdgFdJs03nvt9ko="; + rev = "2340fd6b57b06ccbf24c2c6dafb15905fdccfb1f"; + hash = "sha256-9acxVw5EWr/NwO5ERwy3V976NMY65vDQp60jIoDfO7k="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -292,12 +292,12 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=53485a8"; + version = "0.0.0+rev=3abbd3a"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "53485a8f301254e19c518aa20c80f1bcf7cf5c62"; - hash = "sha256-1IcvFcxIkcrOuq6bypD08PeYw6J/pL/MbYPt+dKHQbc="; + rev = "3abbd3a486a1e356acfdf0367dbf3680f8a0024d"; + hash = "sha256-+rIUp5mlO0yw/Bj+yxbgKQZlP+QdNf484CsuikZatLw="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -336,12 +336,12 @@ }; dockerfile = buildGrammar { language = "dockerfile"; - version = "0.0.0+rev=8ee3a0f"; + version = "0.0.0+rev=fd30df6"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "8ee3a0f7587b2bd8c45c8cb7d28bd414604aec62"; - hash = "sha256-I73T3NuN/K9+R3itIJrNVjlyVr/432UT3HEf6LND+0c="; + rev = "fd30df68c4178964ed012ef7f745055db76f8ebf"; + hash = "sha256-k5KQ0GfTveXadgQk0xay2QY7uCvFYneQ/0AKwZqAG48="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -722,12 +722,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=3241b68"; + version = "0.0.0+rev=684638e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "3241b683cc1eaa466afb83b9a5592ab39caaa2fa"; - hash = "sha256-kGUBAXskVPRQHMwffYLRGO6uD9PNFWZeXkXsmp0yfKA="; + rev = "684638edce563245e4dc6263940aeffa2a0205c2"; + hash = "sha256-ewMSd1DpaZEkbjHzUNX3D1CbhNjP47StyyvjU+oVaMM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -997,23 +997,23 @@ }; llvm = buildGrammar { language = "llvm"; - version = "0.0.0+rev=e9948ed"; + version = "0.0.0+rev=d47c95d"; src = fetchFromGitHub { owner = "benwilliamgraham"; repo = "tree-sitter-llvm"; - rev = "e9948edc41e9e5869af99dddb2b5ff5cc5581af6"; - hash = "sha256-M7smrjU+7L9a2kpz0wM+G+YQGTQaqsVL/Q+OCKlPpzQ="; + rev = "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"; + hash = "sha256-CK7f0qSAsec2cuQElXLFRQ5uiQLGCyEpNIKTIDwbBrU="; }; meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm"; }; lua = buildGrammar { language = "lua"; - version = "0.0.0+rev=0fc8996"; + version = "0.0.0+rev=4e94980"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; - rev = "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd"; - hash = "sha256-MbNP1/NKdSkUTydmK819o8vMKUZFan1yE7d227xMsh4="; + rev = "4e94980e52f81f713d09be104ba32bf050000031"; + hash = "sha256-Arv627RIv0d/plfBPq5QVks737PUy3sq2kuLwLr++uM="; }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; From 48bd94f10aa61a6040d94935b9e0991ba7961fd2 Mon Sep 17 00:00:00 2001 From: ran xiao Date: Sun, 16 Apr 2023 11:17:34 +1000 Subject: [PATCH 074/203] python3.pkgs.interface-meta: fix typo --- pkgs/development/python-modules/interface-meta/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/interface-meta/default.nix b/pkgs/development/python-modules/interface-meta/default.nix index 952452b07d3c..04daece781e5 100644 --- a/pkgs/development/python-modules/interface-meta/default.nix +++ b/pkgs/development/python-modules/interface-meta/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { poetry-core ]; - propogatedBuildInputs = [ + propagatedBuildInputs = [ poetry-dynamic-versioning ]; From de5700389969692238fb9d1386b0c8d05422c0d3 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 4 May 2023 20:46:59 -0400 Subject: [PATCH 075/203] cargo-dist: 0.0.5 -> 0.0.6 Diff: https://github.com/axodotdev/cargo-dist/compare/v0.0.5...v0.0.6 Changelog: https://github.com/axodotdev/cargo-dist/blob/v0.0.6/CHANGELOG.md --- pkgs/development/tools/rust/cargo-dist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 30697d33ad92..362907a4941c 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-AbEreN8pv/aZoBX1amoihb6HxWRdMuEX0waBlbvueQw="; + hash = "sha256-fpOBSMVBkuFJcog5g5qFO/0GI78GkkwWQC7zocrVJ2w="; }; - cargoHash = "sha256-U2pTvTk6oc6PV4W4XBKLzsaqSTb7Oqyw2Ponc9H0xs8="; + cargoHash = "sha256-BqbF21OotztNZsol6wlTDzfz0ViybPF5KK/v+F9N5Us="; nativeBuildInputs = [ pkg-config From 5428081305e8f3146a4a65d454b47a24cbea80ad Mon Sep 17 00:00:00 2001 From: lasers Date: Thu, 4 May 2023 20:08:44 -0500 Subject: [PATCH 076/203] ukmm: 0.8.0 -> 0.8.1 --- pkgs/tools/games/ukmm/Cargo.lock | 46 +------------------------------ pkgs/tools/games/ukmm/default.nix | 4 +-- 2 files changed, 3 insertions(+), 47 deletions(-) diff --git a/pkgs/tools/games/ukmm/Cargo.lock b/pkgs/tools/games/ukmm/Cargo.lock index 6d5363a1037a..1089feeb47ba 100644 --- a/pkgs/tools/games/ukmm/Cargo.lock +++ b/pkgs/tools/games/ukmm/Cargo.lock @@ -3105,48 +3105,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" -[[package]] -name = "phf" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2 1.0.56", - "quote 1.0.26", - "syn 1.0.109", -] - -[[package]] -name = "phf_shared" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" -dependencies = [ - "siphasher", -] - [[package]] name = "pico-args" version = "0.4.2" @@ -3663,8 +3621,6 @@ checksum = "3ac74c5091a7fa31438118781bec869b1b2d2d7aaf222ba993e8ac08821ea0a9" dependencies = [ "crc 2.1.0", "include-flate", - "phf", - "roead", "serde", "serde_json", "thiserror", @@ -4780,7 +4736,7 @@ dependencies = [ [[package]] name = "ukmm" -version = "0.8.0" +version = "0.8.1" dependencies = [ "anyhow", "anyhow_ext", diff --git a/pkgs/tools/games/ukmm/default.nix b/pkgs/tools/games/ukmm/default.nix index ac3eac5fa1ba..c300b4df1a36 100644 --- a/pkgs/tools/games/ukmm/default.nix +++ b/pkgs/tools/games/ukmm/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "ukmm"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "NiceneNerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qd2Sa5d4mKLsnBKPLawCw7Db2bT8+AAYHUQrjL6wExo="; + sha256 = "sha256-YgM1qb4/wng9A6lAjg2z1oev+dE90o+39TTeIN5Sepw="; }; cargoLock = { From 3108b26034938790785351773e50224e3c7cee6d Mon Sep 17 00:00:00 2001 From: Aaron VonderHaar Date: Sat, 15 Apr 2023 00:49:26 -0700 Subject: [PATCH 077/203] tiled: add zstd support --- pkgs/applications/editors/tiled/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 4d83ffe082c4..6f1b267f9615 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -10,6 +10,7 @@ , qttools , qtsvg , zlib +, zstd , libGL }: @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config qbs wrapQtAppsHook ]; - buildInputs = [ qtEnv zlib libGL ]; + buildInputs = [ qtEnv zlib zstd libGL ]; outputs = [ "out" "dev" ]; From 67561dcc59607fe521d4dd10a70043e13c85a2e3 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Thu, 4 May 2023 20:09:16 -0700 Subject: [PATCH 078/203] nixos/bootspec: Fix cross for nixos-system systemBuilder When `nixpkgs.hostPlatform` != `nixpkgs.buildPlatform`, building the top-level attribute fails since the bootspec portion of the system builder tries to reference the host platform's `jq`. Change this to reference the build platform's `jq`. --- nixos/modules/system/activation/bootspec.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/activation/bootspec.nix b/nixos/modules/system/activation/bootspec.nix index 677bd562d170..9e1fa309d5db 100644 --- a/nixos/modules/system/activation/bootspec.nix +++ b/nixos/modules/system/activation/bootspec.nix @@ -40,7 +40,7 @@ let # This can only be done here because we *cannot* depend on $out # referring to the toplevel, except by living in the toplevel itself. toplevelInjector = lib.escapeShellArgs [ - "${pkgs.jq}/bin/jq" + "${pkgs.buildPackages.jq}/bin/jq" '' ."org.nixos.bootspec.v1".toplevel = $toplevel | ."org.nixos.bootspec.v1".init = $init @@ -60,7 +60,7 @@ let children); in lib.escapeShellArgs [ - "${pkgs.jq}/bin/jq" + "${pkgs.buildPackages.jq}/bin/jq" "--sort-keys" ''."org.nixos.specialisation.v1" = ($ARGS.named | map_values(. | first))'' ] + " ${lib.concatStringsSep " " specialisationLoader}"; From 30f26d070db7778ee085c1a3eea7153e7c84767e Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Thu, 4 May 2023 23:10:48 -0400 Subject: [PATCH 079/203] chef-cli, inspec, serverspec: Fix Gemfile deprecation warnings This resolves the following warning in these packages: [DEPRECATED] This Gemfile does not include an explicit global source. Not using an explicit global source may result in a different lockfile being generated depending on the gems you have installed locally before bundler is run. Instead, define a global source in your Gemfile like this: source "https://rubygems.org". --- pkgs/tools/misc/chef-cli/Gemfile | 5 ++--- pkgs/tools/misc/inspec/Gemfile | 7 +++---- pkgs/tools/misc/serverspec/Gemfile | 5 ++--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/chef-cli/Gemfile b/pkgs/tools/misc/chef-cli/Gemfile index b02c6a2a9241..2b0f5743e5a0 100644 --- a/pkgs/tools/misc/chef-cli/Gemfile +++ b/pkgs/tools/misc/chef-cli/Gemfile @@ -1,3 +1,2 @@ -source 'https://rubygems.org' do - gem "chef-cli" -end +source 'https://rubygems.org' +gem "chef-cli" diff --git a/pkgs/tools/misc/inspec/Gemfile b/pkgs/tools/misc/inspec/Gemfile index 35994813924f..b1627ca5e5d4 100644 --- a/pkgs/tools/misc/inspec/Gemfile +++ b/pkgs/tools/misc/inspec/Gemfile @@ -1,4 +1,3 @@ -source 'https://rubygems.org' do - gem "inspec" - gem "inspec-bin" -end +source 'https://rubygems.org' +gem "inspec" +gem "inspec-bin" diff --git a/pkgs/tools/misc/serverspec/Gemfile b/pkgs/tools/misc/serverspec/Gemfile index 7fa6999daf8a..97bc14a34e9f 100644 --- a/pkgs/tools/misc/serverspec/Gemfile +++ b/pkgs/tools/misc/serverspec/Gemfile @@ -1,3 +1,2 @@ -source 'https://rubygems.org' do - gem 'serverspec' -end +source 'https://rubygems.org' +gem 'serverspec' From a99f5f247aac71e9759ccbfc4895818d67b90c90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 04:32:09 +0000 Subject: [PATCH 080/203] okteto: 2.15.1 -> 2.15.2 --- pkgs/development/tools/okteto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 28a165e968b9..b76ed98c3052 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.15.1"; + version = "2.15.2"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-LxAqRkjagoHv8mLA0ysgQozIFV3gBSr0zFSN5cH8NnI="; + hash = "sha256-PxCVBi/GMzyTs9GfIAAPHNbinexw4guSO8ZsyZIOmr4="; }; vendorHash = "sha256-dZ6gzW5R5na5qcHFQqQvKfYb0Bu0kVvVMOaRdtTgkhE="; From c6d51780cdc7de89f052b4c171d8ce3ef4062eaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 04:48:48 +0000 Subject: [PATCH 081/203] typos: 1.14.8 -> 1.14.9 --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 10fbb535b9d6..5be5bce2c5c4 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.14.8"; + version = "1.14.9"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-x7Pcg2zgu2s+oLkOJj+Eo/Gs48BJO6+JATckMqaeaj4="; + hash = "sha256-dfUXH7MRTnHYSqNJzlT0fUn/Er0wrTARq3ZuOdWToow="; }; - cargoHash = "sha256-4se9/lcVWAWhbi0i3FDGQraK5KhPZ6ongc2wmJV4gI0="; + cargoHash = "sha256-+u/3XtC/HxtAsX4dRf74u0BLh872Y2kK+BnbWqUnUdo="; meta = with lib; { description = "Source code spell checker"; From 810b5bf86febacbade842cada85ad9ee4df1f12b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 04:55:34 +0000 Subject: [PATCH 082/203] netbird-ui: 0.17.0 -> 0.19.0 --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index f746178d46c7..f20a2c19e869 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -30,16 +30,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.17.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GSLEuelm6BEVF6NApYFJHa9bediRGoi5JotWPzDi+hg="; + sha256 = "sha256-uz2WrPKNgYP8texn2wmGEnX4HS+HcF73iCJLTTAzX6g="; }; - vendorHash = "sha256-lag/usfAvpZhWeVe1wB3SJJsTCLcBeh04RvkE803OqQ="; + vendorHash = "sha256-hXoHdcoXsT3ap0Ns2seAaoMeQlwbp0WrqjoSH6Y/H+E="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From 50b86d1a3e5121600c65edc2e4395ef855e3b907 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 05:12:08 +0000 Subject: [PATCH 083/203] zsh-forgit: 23.04.0 -> 23.05.0 --- pkgs/shells/zsh/zsh-forgit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix index 8873b7b4ff8e..9957530fd901 100644 --- a/pkgs/shells/zsh/zsh-forgit/default.nix +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "zsh-forgit"; - version = "23.04.0"; + version = "23.05.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - sha256 = "sha256-3lvYIuzuJw0CQlaAQG6hAyfUgSXM+3BOmKRVDNFUN/U="; + sha256 = "sha256-oBPN8ehz00cDIs6mmGfCBzuDQMLG5z3G6KetJ1FK7e8="; }; strictDeps = true; From b5c3f904fb18225c6e11ce83ef1f928b44efa5fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 05:13:45 +0000 Subject: [PATCH 084/203] zim-tools: 3.1.1 -> 3.1.3 --- pkgs/tools/text/zim-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/zim-tools/default.nix b/pkgs/tools/text/zim-tools/default.nix index 06c71b05c08a..4a051d2238cf 100644 --- a/pkgs/tools/text/zim-tools/default.nix +++ b/pkgs/tools/text/zim-tools/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "zim-tools"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { owner = "openzim"; repo = "zim-tools"; rev = version; - sha256 = "sha256-xZae1o4L9AdGDqBnFDZniWNM/dLsYRcS0OLWw9+Wecs="; + sha256 = "sha256-dFZd+vr/PnC7WKTFitwBe1zd/1TUnCznI/eS+Q0ZZPg="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From 74e89bd33f5bc0599cc2e5f45cb8aab9f9cc0082 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 03:13:39 +0000 Subject: [PATCH 085/203] terraform-providers.ibm: 1.52.1 -> 1.53.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 142cc1879cd0..140047ae5b21 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -566,13 +566,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-YIabiu1o2+gJ6ZK5F1PRnVqKP3gbhD96FkDfytX8Hak=", + "hash": "sha256-0ZIm6OTVTfbWcPMWsLNxmD3QDDbB72lvwsISkiWzcFQ=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.52.1", + "rev": "v1.53.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-BTt21bR4kgzyAuS3flalgOJuRxVPwwNOIR2nj2zdw9E=" + "vendorHash": "sha256-bcCiNWwVSLI3F3ikTx8z/TtkbgjLAB8puSFTC9LTEMU=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", From 4de7c2761f6fe9cef3f7a6bd583c005a734fb597 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 03:17:42 +0000 Subject: [PATCH 086/203] terraform-providers.okta: 3.46.0 -> 4.0.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 140047ae5b21..1d0fd3e7998e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -819,13 +819,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-pSGoD4WSfw6lTJTn/Yf8k60CtbPjZeEPJ7mH1c6cRD0=", + "hash": "sha256-NUczAdOYpqpHGpE2OaJtziggA5o+CUYSq2F/RkTL7YU=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.46.0", + "rev": "v4.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-DkC4BmFfckBtT12lr3rgU9Mg4Nb+7sXjDT/EdfbSFQM=" + "vendorHash": "sha256-LjYPZaF8vy1WUNeI/TFIDjVh08sxf6nKLpvmQsCQFFo=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From deb7ec86cc32f0ab87ff8f8e5c07f6ddfecf3818 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 03:20:15 +0000 Subject: [PATCH 087/203] terraform-providers.opentelekomcloud: 1.34.2 -> 1.34.3 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1d0fd3e7998e..e113bd3e9ac4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -855,13 +855,13 @@ "vendorHash": "sha256-62q67aaOZA3fQmyL8bEHB+W497bcx9Xy7kKrbkjkbaI=" }, "opentelekomcloud": { - "hash": "sha256-bRvs4IxnUObX/ChPdCn97VUQSxTjV2tfnmBmWmgAXUA=", + "hash": "sha256-WgddD3gy8pTRAtkh6FHqFzN15aLkFz7KnPFUN0MS56Q=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.34.2", + "rev": "v1.34.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-VEreMBvqvBGUZz5EY5+0jbNDOVbmhYerfLYGa1rl+aw=" + "vendorHash": "sha256-2EuGZxHrpPwDicSrIf/Jx/c4LhOtE5HvTz9LkJ4xCSY=" }, "opsgenie": { "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=", From e5c8a4ea58bdd6f4048ebd419e687d8ad4c19456 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 03:27:08 +0000 Subject: [PATCH 088/203] terraform-providers.vault: 3.15.1 -> 3.15.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e113bd3e9ac4..9b75051dc5c7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1180,12 +1180,12 @@ "vendorHash": "sha256-bNE5HxOcj0K2vdqWPVECeTojnWz0hF9mw0TnRRBhqkQ=" }, "vault": { - "hash": "sha256-etQTHPZ1bngVMpeQ/IZ8yaoe94ZPNT2IG4ip4d+73Xg=", + "hash": "sha256-eTHdmow16TJ/uJ4M5yFiYrwuYo4kYSnkPXymxAYVjuw=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.15.1", + "rev": "v3.15.2", "spdx": "MPL-2.0", "vendorHash": "sha256-Ox8Onq44NdE/KMrmzbOpKetJKww9T2PvEliLbWU/bLU=" }, From 31cd152ce72e195d087e8c8323a963e9d055f5b3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 03:28:48 +0000 Subject: [PATCH 089/203] terraform-providers.vultr: 2.14.1 -> 2.15.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9b75051dc5c7..673bd623725e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1235,11 +1235,11 @@ "vendorHash": "sha256-guUjkk7oW+Gvu015LUAxGqUwZF4H+4xmmOaMqKixZaI=" }, "vultr": { - "hash": "sha256-QZYuxtY89ldGUPNz/DJlFU6HWUJgeJC2TM6cSDoeaYc=", + "hash": "sha256-4Um4UyDjtamy2s15K3Idm5edZj5BOy13+kr39wl9e0Q=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.14.1", + "rev": "v2.15.0", "spdx": "MPL-2.0", "vendorHash": null }, From 014897d1da2e7d7dd3824bfc5cbef729ca06ed1d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 03:33:08 +0000 Subject: [PATCH 090/203] terraform-providers.yandex: 0.89.0 -> 0.90.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 673bd623725e..00ee8dd32650 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1253,13 +1253,13 @@ "vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs=" }, "yandex": { - "hash": "sha256-UFAWifGu/3QKH8JLBYObLhO/PdCQ1f5e9hmehF8grak=", + "hash": "sha256-ij/KKv/e3KzT5c5KbsW7LszsqzVgwPF2jrnRFOw0uxw=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "proxyVendor": true, "repo": "terraform-provider-yandex", - "rev": "v0.89.0", + "rev": "v0.90.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RfSPCBDb4crv6GZPhsVSQOWnZ3xHa/VWln5pSg68Exg=" + "vendorHash": "sha256-5pzIvNVgfFT4j18JNHxJ5ZappuS9nFjlpPC3dcsIQRQ=" } } From 80e81b989be55a91fb916c5822e910d561f2cab3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 May 2023 03:35:38 +0000 Subject: [PATCH 091/203] terraform-providers.aws: 4.65.0 -> 4.66.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 00ee8dd32650..f07a7fa3ddca 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-cmE7jJO49CuYdiKjrPaHhNCFoMbT0z4uSnFdC7Fnd9g=", + "hash": "sha256-oD8I7wWLdn9Yv6naRcq0myg1L2DcvP/a6VL/fUfdC+g=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.65.0", + "rev": "v4.66.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-UvbuWjxlou7lwvU5D6DaEXuCFvn8ECTbkNvKGrHwsu8=" + "vendorHash": "sha256-tetNRSjQTgFzFLSdmRL6f+UlwKp62zr00JzFXJs8nMs=" }, "azuread": { "hash": "sha256-YdlH1c2Oeu9wDiZvlzgYhY8CvWCMM3W/ilEkTU3mR1k=", From 5bf047fdc02799ff7de85a0d6606469a4eb4f2ea Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 5 May 2023 08:31:18 +0300 Subject: [PATCH 092/203] dde-daemon: do not create /usr/share/uadp --- pkgs/desktops/deepin/go-package/dde-daemon/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index e8b2bfedefa9..3890e6a23a0f 100644 --- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -67,6 +67,9 @@ buildGoPackage rec { substituteInPlace inputdevices/layout_list.go \ --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" + substituteInPlace system/uadp/crypto.go \ + --replace "/usr/share/uadp" "/var/lib/dde-daemon/uadp" + substituteInPlace appearance/background/{background.go,custom_wallpapers.go} accounts/user.go bin/dde-system-daemon/wallpaper.go \ --replace "/usr/share/wallpapers" "/run/current-system/sw/share/wallpapers" From fb66a26b75ceb76826e9c186ea1ae62edefb2f58 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 4 May 2023 18:54:03 -0400 Subject: [PATCH 093/203] ddcci-driver: 0.4.2 -> 0.4.3 --- pkgs/os-specific/linux/ddcci/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index 0e7e0bf8e8f4..91e5dfcd4744 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ddcci-driver"; - version = "0.4.2"; + version = "0.4.3"; name = "${pname}-${kernel.version}-${version}"; src = fetchFromGitLab { owner = "${pname}-linux"; repo = "${pname}-linux"; rev = "v${version}"; - sha256 = "sSmL8PqxqHHQiume62si/Kc9El58/b4wkB93iG0dnNM="; + hash = "sha256-1Z6V/AorD4aslLKaaCZpmkD2OiQnmpu3iroOPlNPtLE="; }; hardeningDisable = [ "pic" ]; @@ -32,14 +32,6 @@ stdenv.mkDerivation rec { "INCLUDEDIR=$(out)/include" ]; - patches = [ - # fix to support linux 6.1 - (fetchpatch { - url = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux/-/commit/ce52d6ac5e5ed7119a0028eed8823117a004766e.patch"; - sha256 = "sha256-Tmf4oiMWLR5ma/3X0eoFuriK29HwDqy6dBT7WdqE3mI="; - }) - ]; - meta = with lib; { description = "Kernel module driver for DDC/CI monitors"; homepage = "https://gitlab.com/ddcci-driver-linux/ddcci-driver-linux"; From 799e37bd1674297a030b02b36e32b7e67e258f33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 05:39:12 +0000 Subject: [PATCH 094/203] wishlist: 0.10.0 -> 0.11.0 --- pkgs/servers/wishlist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/servers/wishlist/default.nix index 55729655a254..ed487a739647 100644 --- a/pkgs/servers/wishlist/default.nix +++ b/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-rC/MS4YNzeqrXExfNGsPLHWvqOxypoeELzwoy+57HXo="; + sha256 = "sha256-O2ciXaWH2QSoqDTnDxmqwgK/BM5WHye8JHfw9+zZxZ4="; }; - vendorHash = "sha256-ZWgqp8UlpBHDYORSnWDuwB7DQQFUG4FAF/kUpR9LA6w="; + vendorHash = "sha256-wZugmCP3IouZ9pw3NEAZcoqdABMGTVi/IcithQjVFW4="; doCheck = false; From ca38e21e6be507852b2e3f08d9d036e991186519 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 05:42:07 +0000 Subject: [PATCH 095/203] jsonnet-language-server: 0.11.0 -> 0.12.0 --- .../language-servers/jsonnet-language-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix index f35900ec41ad..8843d22f8589 100644 --- a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix +++ b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "jsonnet-language-server"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "grafana"; repo = "jsonnet-language-server"; rev = "refs/tags/v${version}"; - hash = "sha256-oPItt1v4wK0W0lSots3hoq5A1ooCRwzJV8cNYV+SBb4="; + hash = "sha256-jmeXX4l0A6bVRt9eJI6wDzjOcjPC0/uElT/2YwhWoqw="; }; - vendorHash = "sha256-ZyTo79M5nqtqrtTOGanzgHcnSvqCKACacNBWzhYG5nY="; + vendorHash = "sha256-lC3GAOJ/XVzn+9kk4PnW/7UwqjiXP7DqYmqauwOqQ+k="; ldflags = [ "-s" From 7e882fb1fb1cf4d892c9bcca67e21a4a8c561075 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 05:48:26 +0000 Subject: [PATCH 096/203] pocketbase: 0.15.2 -> 0.15.3 --- pkgs/servers/pocketbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 524c8db9feca..462479745b87 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2O7M9K3NLa86tzezs+HL49ja+hhcKCmj5KdxpUjzm5Q="; + sha256 = "sha256-9LIOBfNOa+u7yLL7iWb/e7c8ZSiyjukqaY0ifVR2iSs="; }; - vendorHash = "sha256-KV7FmJQZj5QFPUZZjjOw9RTanq4MQtFi8qM90Pq1xTs="; + vendorHash = "sha256-LFIJClPByaLXtsBOk7SjpJlIuQhWbVIs6H4PXhd7oyo="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From 014cc7a7ac43af4bbc26d823e4597bfcf798e8b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 06:05:07 +0000 Subject: [PATCH 097/203] libcotp: 2.0.0 -> 2.0.1 --- pkgs/development/libraries/libcotp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix index 4baa712b6803..d7f60b9ad6b1 100644 --- a/pkgs/development/libraries/libcotp/default.nix +++ b/pkgs/development/libraries/libcotp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcotp"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-99Uw/BMk2bLj+/FZd7MwrRw62XcCroO9yNWdtH5AFpE="; + sha256 = "sha256-w0DxZLEuR9m7udmlBQ7TyCoQvGVmJCffKHsxynQV+oo="; }; postPatch = lib.optionalString stdenv.cc.isClang '' From 661117e16fef233387866691c749f2427d349c1f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 4 May 2023 22:12:01 -0700 Subject: [PATCH 098/203] gh: fix cross "zowoq" wrote this commit: https://github.com/NixOS/nixpkgs/pull/225121#issuecomment-1500037413 --- pkgs/applications/version-management/gh/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 2f79120759ca..d08f41852b7d 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles, testers, gh }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles, stdenv, testers, gh }: buildGoModule rec { pname = "gh"; @@ -15,27 +15,23 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - # upstream unsets these to handle cross but it breaks our build - postPatch = '' - substituteInPlace Makefile \ - --replace "GOOS= GOARCH= GOARM= GOFLAGS= CGO_ENABLED=" "" - ''; - buildPhase = '' runHook preBuild - make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh manpages + make GO_LDFLAGS="-s -w" GH_VERSION=${version} bin/gh ${lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) "manpages"} runHook postBuild ''; installPhase = '' runHook preInstall install -Dm755 bin/gh -t $out/bin + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installManPage share/man/*/*.[1-9] installShellCompletion --cmd gh \ --bash <($out/bin/gh completion -s bash) \ --fish <($out/bin/gh completion -s fish) \ --zsh <($out/bin/gh completion -s zsh) + '' + '' runHook postInstall ''; From 12a715b89570eecf3100a543e839a9b020e185c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 06:14:33 +0000 Subject: [PATCH 099/203] ginkgo: 2.9.2 -> 2.9.4 --- pkgs/development/tools/ginkgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index 62340c1c6bbf..bd0e3e651cc3 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.9.2"; + version = "2.9.4"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-lRJCRdt/LIFG6MmCkzlvp77CxM4Md7+eyyiw32Xz9rw="; + sha256 = "sha256-groih0LxtmB8k4/vfw2Ivtzm+SOyQqK1o7XASNplFvQ="; }; - vendorHash = "sha256-1+uB/UuwrZw17eSRLwcER67z/Qxg2H04vbBdk2FKYf0="; + vendorHash = "sha256-Rm5fpiTZMo/B9+yIpmEniJVRfKgHjpFIagELEjgFYwc="; # integration tests expect more file changes # types tests are missing CodeLocation From 70ca1fab1b890b5f19bc1d4d44e1de632a9eea04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 06:14:43 +0000 Subject: [PATCH 100/203] gocryptfs: 2.3.1 -> 2.3.2 --- pkgs/tools/filesystems/gocryptfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index ab333255227f..ef9fe7b781b2 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "gocryptfs"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mfbdxKZdYDbnNWQTrDV+4E6WYA8ybE5oiAH1WWOZHdQ="; + sha256 = "sha256-1+g8n6n2i7UKr4C5ZLNF5ceqdu3EYx4R6rQALVoGwTs="; }; - vendorHash = "sha256-eibUACIOfIsCgPYJ57Hq29S80XT6w4VbpjvaX7XasdE="; + vendorHash = "sha256-7eAyuyqAvFQjkvsrkJEvop0veX7sGGX6xXAdUNuOXWU="; nativeBuildInputs = [ makeWrapper From 733b43ba8940e38b9616c5cbdf398dc138c05202 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 08:19:39 +0200 Subject: [PATCH 101/203] python311Packages.elkm1-lib: 2.2.1 -> 2.2.2 Diff: https://github.com/gwww/elkm1/compare/refs/tags/2.2.1...2.2.2 Changelog: https://github.com/gwww/elkm1/blob/2.2.2/CHANGELOG.md --- pkgs/development/python-modules/elkm1-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index a418e3006dbd..0aa754d1c64c 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.2.1"; + version = "2.2.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = "refs/tags/${version}"; - hash = "sha256-UrdnEafmzO/l1kTcGmPWhujbThVWv4uBH57D2uZB/kw="; + hash = "sha256-z/ltpypCGJ3ORHOlLjicKlqIoxqGzVt588OHmNO65bg="; }; nativeBuildInputs = [ From 43d8b31dd20beb4a1779d64c5169ac20b0f53762 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 06:26:20 +0000 Subject: [PATCH 102/203] oh-my-posh: 15.4.0 -> 15.4.2 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index c89fa1ddb3da..2dd6e826ed1d 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "15.4.0"; + version = "15.4.2"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xrSMR16KvS97/pfQPwOfETvVvTxqZMdNR7xG9QxuelA="; + hash = "sha256-D1X0/r/OyQKPPE1aEwNVdGJYq6+i67xTvIQK3ZeI7pM="; }; vendorHash = "sha256-4exLY24baDjgGIDS1P7BIK38O4b+KeqNTMzA6wap05k="; From ef1d1d7a4e00e558f833d7f203ffe0eff22aa46f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 08:36:26 +0200 Subject: [PATCH 103/203] python311Packages.holidays: 0.21.13 -> 0.24 Changelog: - https://github.com/dr-prodigy/python-holidays/releases/tag/v.0.24 - https://github.com/dr-prodigy/python-holidays/releases/tag/v.0.23 - https://github.com/dr-prodigy/python-holidays/releases/tag/v.0.22 --- pkgs/development/python-modules/holidays/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 714a91e177cc..bdc30eead282 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.21.13"; + version = "0.24"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dr-prodigy"; repo = "python-holidays"; rev = "refs/tags/v.${version}"; - hash = "sha256-acV/m4orkOEbON7C4ThGvaQtTMpp4c8FNesC7UepJFc="; + hash = "sha256-1/rphnbzDlbay+yez/erF+WC+2aqeBEgdcHo2YR+ugc="; }; propagatedBuildInputs = [ @@ -38,6 +38,11 @@ buildPythonPackage rec { "holidays" ]; + disabledTests = [ + # Failure starting with 0.24 + "test_l10n" + ]; + meta = with lib; { description = "Generate and work with holidays in Python"; homepage = "https://github.com/dr-prodigy/python-holidays"; From 3d795ba793d2e23f7e7a5f1adce99d7e3db84a59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 06:39:43 +0000 Subject: [PATCH 104/203] kddockwidgets: 1.6.0 -> 1.7.0 --- pkgs/development/libraries/kddockwidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kddockwidgets/default.nix b/pkgs/development/libraries/kddockwidgets/default.nix index 3102c8847259..29b7bf992775 100644 --- a/pkgs/development/libraries/kddockwidgets/default.nix +++ b/pkgs/development/libraries/kddockwidgets/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "KDDockWidgets"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "KDAB"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rAv0P7tRcgCTB/ZM93wKF8oRZc7KqPyoDcnRn5Rel/k="; + sha256 = "sha256-k5Hn9kxq1+tH5kV/ZeD4xzQLDgcY4ACC+guP7YJD4C8="; }; nativeBuildInputs = [ cmake ]; From 371aeb8d4663fffb47cbb11ae06129008f365289 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 06:41:37 +0000 Subject: [PATCH 105/203] vault: 1.13.1 -> 1.13.2 --- pkgs/tools/security/vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index a6bb24e6fa3a..042d7fa44e50 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-bYZghlQi2p3XnKWH3H2sehds/XSMW8pbzBophNMa5q4="; + sha256 = "sha256-U4V2+O8//6mkuznSHkPWeeJNK6NtUTEhFk7zz3FEe58="; }; - vendorHash = "sha256-mNnStWxrSR455zGWkj4dLDFk/kdOXYgk8LKB0wy7K5M="; + vendorHash = "sha256-eyXmmhMAbLJiLwQQAR4+baU53n2WY5laUKEGoPjpBg4="; subPackages = [ "." ]; From c6e66fad58905ac6f3542f427c9fabe07637f1f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 06:49:10 +0000 Subject: [PATCH 106/203] liblxi: 1.18 -> 1.19 --- pkgs/development/libraries/liblxi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix index b63f3d9df0d5..03b6c29cc05c 100644 --- a/pkgs/development/libraries/liblxi/default.nix +++ b/pkgs/development/libraries/liblxi/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "liblxi"; - version = "1.18"; + version = "1.19"; src = fetchFromGitHub { owner = "lxi-tools"; repo = "liblxi"; rev = "v${version}"; - sha256 = "sha256-2tZWIN58J6zNHG3dahNfg5eNiS8ykWFQyRSyikuzdjE="; + sha256 = "sha256-TdIUPAXBogGT9OQrX4wkSmPFjR9McdS9gnQ7c24U4qs="; }; nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ]; From ad6ea40ac321fbd06710afa396a65734f90fcc39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 06:56:47 +0000 Subject: [PATCH 107/203] libupnp: 1.14.16 -> 1.14.17 --- pkgs/development/libraries/pupnp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index c384a96e62f1..5531ad6d6c8c 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.16"; + version = "1.14.17"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "pupnp"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "sha256-JsissTWnF8GuHSWeCmWOusDYV32Xu0LDRqZCm7yz6YY="; + sha256 = "sha256-vb540oqDn6Y+oD0LriOJckYYkI/zcHkEVc8mL/+9bps="; }; nativeBuildInputs = [ From c4b8bb723a75427e4190f58f51bc6e4db7315d0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 07:06:20 +0000 Subject: [PATCH 108/203] supabase-cli: 1.50.13 -> 1.55.0 --- pkgs/development/tools/supabase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index 769546e30567..27f75537e1d0 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.50.13"; + version = "1.55.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-e/jPtNzuETky8uwg1TnFOGKppSPuEkBiEfmPwiUM3V0="; + sha256 = "sha256-6Jq9Tc3NVZcvP5Pdy9Bx9yX/pdS3I2X9n1mPirBckB8="; }; - vendorSha256 = "sha256-j2iEeAn+4Tn3h8lVKoaYE+6W4R/q+JaAWXxHllZGLNs="; + vendorSha256 = "sha256-Kqb5Rici4J4psPx1Yfp3mGnwuXlzEreQvm4yFcWCp8U="; ldflags = [ "-s" From 684e9a425ee6d2798610301ba878f52e758aa3a8 Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Wed, 3 May 2023 13:56:19 +0200 Subject: [PATCH 109/203] shopware-cli: init at 0.1.62 --- pkgs/tools/misc/shopware-cli/default.nix | 49 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/tools/misc/shopware-cli/default.nix diff --git a/pkgs/tools/misc/shopware-cli/default.nix b/pkgs/tools/misc/shopware-cli/default.nix new file mode 100644 index 000000000000..d8f66984355b --- /dev/null +++ b/pkgs/tools/misc/shopware-cli/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +, makeWrapper +, dart-sass-embedded +}: + +buildGoModule rec { + pname = "shopware-cli"; + version = "0.1.62"; + src = fetchFromGitHub { + repo = "shopware-cli"; + owner = "FriendsOfShopware"; + rev = version; + hash = "sha256-Vxg3hYUCN4UdBGHN57VXDlGdp+qzq8tbUDPAl/Bse44="; + }; + + nativeBuildInputs = [ installShellFiles makeWrapper ]; + + vendorSha256 = "sha256-O3dJX2w+J9TABkytaJ0ubFg9edVpmo7iPArc+Qqh3M4="; + + postInstall = '' + export HOME="$(mktemp -d)" + installShellCompletion --cmd shopware-cli \ + --bash <($out/bin/shopware-cli completion bash) \ + --zsh <($out/bin/shopware-cli completion zsh) \ + --fish <($out/bin/shopware-cli completion fish) + ''; + + preFixup = '' + wrapProgram $out/bin/shopware-cli \ + --prefix PATH : ${lib.makeBinPath [ dart-sass-embedded ]} + ''; + + ldflags = [ + "-s" + "-w" + "-X 'github.com/FriendsOfShopware/shopware-cli/cmd.version=${version}'" + ]; + + meta = with lib; { + description = "Command line tool for Shopware 6"; + homepage = "https://github.com/FriendsOfShopware/shopware-cli"; + changelog = "https://github.com/FriendsOfShopware/shopware-cli/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ shyim ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6789ced4a9d..8069c51b7393 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12166,6 +12166,8 @@ with pkgs; shrikhand = callPackage ../data/fonts/shrikhand { }; + shopware-cli = callPackage ../tools/misc/shopware-cli { }; + shunit2 = callPackage ../tools/misc/shunit2 { }; sic = callPackage ../applications/networking/irc/sic { }; From a3da59015653b2c6cdaf4162b5bb8713e668e5c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 09:56:46 +0200 Subject: [PATCH 110/203] python311Packages.google-cloud-storage: 2.8.0 -> 2.9.0 Changelog: https://github.com/googleapis/python-storage/blob/v2.9.0/CHANGELOG.md --- .../python-modules/google-cloud-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 5c857047c8f2..6673c67227ae 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.8.0"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Q4jaH/W9ptcp8m28rxv6AgoqUqe5HwqBI+29pRZggCw="; + hash = "sha256-m2rntQn8KUvay4TQ8+qOIOLFSotLvjnFcHY1/sIU7/M="; }; propagatedBuildInputs = [ From c08bd639f94554430b8054824fda9cbec338392a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 09:57:34 +0200 Subject: [PATCH 111/203] python311Packages.google-cloud-spanner: 3.32.0 -> 3.33.0 Changelog: https://github.com/googleapis/python-spanner/blob/v3.33.0/CHANGELOG.md --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index b096bafa62e9..717cde74790c 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.32.0"; + version = "3.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/2ktwVBV6CmEKrX8cngxmeOz4Hwhpw2ThOX1rA/yYeQ="; + hash = "sha256-k+2s1GPBK/mPCwRK0UzuoNSKNMouwIcoRM7BagXUNS8="; }; propagatedBuildInputs = [ From 51805d5c2f7778770021cb0379569e41b6b4dd16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 08:29:58 +0000 Subject: [PATCH 112/203] promexplorer: 0.0.4 -> 0.0.5 --- pkgs/tools/misc/promexplorer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/promexplorer/default.nix b/pkgs/tools/misc/promexplorer/default.nix index 596b9990408a..efdbbe4e6da5 100644 --- a/pkgs/tools/misc/promexplorer/default.nix +++ b/pkgs/tools/misc/promexplorer/default.nix @@ -1,13 +1,13 @@ { lib, nimPackages, fetchFromGitHub }: nimPackages.buildNimPackage rec { pname = "promexplorer"; - version = "0.0.4"; + version = "0.0.5"; nimBinOnly = true; src = fetchFromGitHub { owner = "marcusramberg"; repo = "promexplorer"; rev = "v${version}"; - hash = "sha256-Fj3RCVygixs+iIlLptX6aOsG4jJa/jUN8hXYkjZ7K/A="; + hash = "sha256-a+9afqdgLgGf2hOWf/QsElq+CurDfE1qDmYCzodZIDU="; }; buildInputs = with nimPackages; [ illwill illwillwidgets ]; From cea5810dc242ebbefbee4a07fbf8b506d1892f42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 08:38:11 +0000 Subject: [PATCH 113/203] circleci-cli: 0.1.25725 -> 0.1.26343 --- pkgs/development/tools/misc/circleci-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index c98211c21bcf..7b9c4264fe1c 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.25725"; + version = "0.1.26343"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rv+/OSAq/vQIlysbpx8JZuBmtb3COq8hl/tXBYylRwA="; + sha256 = "sha256-mEvrcZbQ8vcRHL1CWlxzBJFqXLTJi51DER9BKLxnJ+4="; }; - vendorHash = "sha256-GBeu/+3Klpb16TI/2joDBG2E5BiwlTIhElSE3278SNs="; + vendorHash = "sha256-LzDofZI54cWP4FQfINq3tQbSi4c9/N1v0YH/aSzttNo="; nativeBuildInputs = [ installShellFiles ]; From 57f73bd444360cafdef9fbf5d36381249d3a462f Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Fri, 5 May 2023 11:49:06 +0300 Subject: [PATCH 114/203] python3Packages.web3: update to 6.3.0 --- pkgs/development/python-modules/web3/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index c31fe93b0220..0b285bd514d1 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "web3"; - version = "5.31.1"; + version = "6.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "web3.py"; rev = "v${version}"; - hash = "sha256-YsAbPI9Y6z+snKZ9NsA0YSpB38n+ra4+Ei6COYFe8v4="; + hash = "sha256-p3Dpmb0BST1nbh42q/eK/DjQqoIPHvNr2KllRpTgFFw="; }; nativeBuildInputs = [ @@ -72,6 +72,10 @@ buildPythonPackage rec { doCheck = false; + postPatch = '' + substituteInPlace setup.py --replace "types-protobuf==3.19.13" "types-protobuf" + ''; + pythonImportsCheck = [ "web3" ]; From f0520ce51dd8bd06a243c46eb93cb2eed67e19e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 10:50:05 +0200 Subject: [PATCH 115/203] python311Packages.dvc-ssh: 2.21.0 -> 2.22.1 Changelog: https://github.com/iterative/dvc-ssh/releases/tag/2.22.1 --- pkgs/development/python-modules/dvc-ssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-ssh/default.nix b/pkgs/development/python-modules/dvc-ssh/default.nix index 2e21c4e8697c..18391eef75cd 100644 --- a/pkgs/development/python-modules/dvc-ssh/default.nix +++ b/pkgs/development/python-modules/dvc-ssh/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "dvc-ssh"; - version = "2.21.0"; + version = "2.22.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-iew/+/Ww6Uvz6Ctvswd8l5YFa3zihYxo1jvTe0ZTW9M="; + hash = "sha256-WHFfq0Cw17AWgmUlkZUOO6t6XcPYjLHUz4s0wcVYklc="; }; # Prevent circular dependency From f3a4d5b323bc1730416e238978aaad5cea7793a6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 10:50:20 +0200 Subject: [PATCH 116/203] python311Packages.dvc-gs: 2.21.0 -> 2.22.0 Changelog: https://github.com/iterative/dvc-gs/releases/tag/2.22.0 --- pkgs/development/python-modules/dvc-gs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-gs/default.nix b/pkgs/development/python-modules/dvc-gs/default.nix index 0f29bc8a3554..ab16c906ccaf 100644 --- a/pkgs/development/python-modules/dvc-gs/default.nix +++ b/pkgs/development/python-modules/dvc-gs/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "dvc-gs"; - version = "2.21.0"; + version = "2.22.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-MGNDEhJJGSQIPDXGv/y4u1UHnh4HnNbKtQbGHys0dSA="; + hash = "sha256-UzYW2iU/GvLJd4q6ErcLQRoAehyFF3PrMTjb8PEtmNE="; }; # Prevent circular dependency From 23cac0d4d692a15da70aa63abd64ec229aae8787 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 10:50:35 +0200 Subject: [PATCH 117/203] python311Packages.dvc-s3: 2.21.0 -> 2.22.0 Changelog: https://github.com/iterative/dvc-s3/releases/tag/2.22.0 --- pkgs/development/python-modules/dvc-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-s3/default.nix b/pkgs/development/python-modules/dvc-s3/default.nix index 546fd4e3129f..effa8e79e0a1 100644 --- a/pkgs/development/python-modules/dvc-s3/default.nix +++ b/pkgs/development/python-modules/dvc-s3/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "dvc-s3"; - version = "2.21.0"; + version = "2.22.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-AEB5Nyp6j7mX0AOA0rhegd4q8xP/POx9J6yn1Ppu0nk="; + hash = "sha256-19j/JD8KZEQKaj55HYEucHwh/LUJ+88PPFEqAWov2Gg="; }; # Prevent circular dependency From 8de789ece508598a2132bcdab7be033bbc0e4bbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 10:50:56 +0200 Subject: [PATCH 118/203] python311Packages.dvc-azure: 2.21.0 -> 2.21.1 Changelog: https://github.com/iterative/dvc-azure/releases/tag/2.21.1 --- pkgs/development/python-modules/dvc-azure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-azure/default.nix b/pkgs/development/python-modules/dvc-azure/default.nix index 40f7a0638927..068875dc3199 100644 --- a/pkgs/development/python-modules/dvc-azure/default.nix +++ b/pkgs/development/python-modules/dvc-azure/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "dvc-azure"; - version = "2.21.0"; + version = "2.21.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-VN3QSGb4cLhxX8JV1Pg4/449SJOWv9Tu3kcDGbDwAYw="; + hash = "sha256-0PB+2lPAV2yy2hivDDz0PXmi8WqoSlUZadyfKPp9o1g="; }; # Prevent circular dependency From 2a5ea263899c3ec5bc5832ee268e8e98da2ffcb3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 10:51:27 +0200 Subject: [PATCH 119/203] python311Packages.dvc-studio-client: 0.8.0 -> 0.9.0 Diff: https://github.com/iterative/dvc-studio-client/compare/refs/tags/0.8.0...0.9.0 Changelog: https://github.com/iterative/dvc-studio-client/releases/tag/0.9.0 --- pkgs/development/python-modules/dvc-studio-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix index aaa313a5ff37..d5733cfd435e 100644 --- a/pkgs/development/python-modules/dvc-studio-client/default.nix +++ b/pkgs/development/python-modules/dvc-studio-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dvc-studio-client"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Uk9P/QUlvu3XgGMGZF7d2dPJyYKe3/Ex68HVP8eZqU0="; + hash = "sha256-yiNhvemeN3Dbs8/UvdTsy0K/FORoAy27tvT4ElwFxRk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 9affd32d7a7842d463526437a637a900d04aa666 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 08:52:40 +0000 Subject: [PATCH 120/203] pomerium-cli: 0.21.0 -> 0.22.0 --- pkgs/tools/security/pomerium-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pomerium-cli/default.nix b/pkgs/tools/security/pomerium-cli/default.nix index 6eb35099db2a..67c44930f0da 100644 --- a/pkgs/tools/security/pomerium-cli/default.nix +++ b/pkgs/tools/security/pomerium-cli/default.nix @@ -8,16 +8,16 @@ let in buildGoModule rec { pname = "pomerium-cli"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "pomerium"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-0JMMa85gMTZA0JtxpONVMakbsapAoCXdiL3+Whv5Pp0="; + sha256 = "sha256-0vRLjmzW/U/Kssu4VQO6mFqVH4UovmTGEEfxeWI8Nqo="; }; - vendorHash = "sha256-eATNBUQNspDdksF06VHIzwzEJfaFBlJt9OtONxH49s4="; + vendorHash = "sha256-dnfJnndYXR6LQKDruLSsDav4DtyaGu5/rNnk69oMhPU="; subPackages = [ "cmd/pomerium-cli" From 3576a3e25633039e9fd4755a2ac6a8c02eda0e3f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 5 May 2023 10:53:46 +0200 Subject: [PATCH 121/203] ocamlPackages.linol: fix minimalOCamlVersion --- pkgs/development/ocaml-modules/linol/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/linol/default.nix b/pkgs/development/ocaml-modules/linol/default.nix index 64aace8851b7..34f32cf4f7bf 100644 --- a/pkgs/development/ocaml-modules/linol/default.nix +++ b/pkgs/development/ocaml-modules/linol/default.nix @@ -5,7 +5,7 @@ rec { pname = "linol"; version = "2023-04-25"; - minimalOCamlVersion = "4.08"; + minimalOCamlVersion = "4.14"; duneVersion = "3"; src = fetchFromGitHub { From 18f2c5f5b860733ecbd499ebd74a72c685f8917d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 5 May 2023 10:42:06 +0200 Subject: [PATCH 122/203] ocamlPackages.lsp: fix propagatedInputs --- .../ocaml-modules/ocaml-lsp/lsp.nix | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index 32e8fbaf2ef7..b067614f5058 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -84,11 +84,31 @@ buildDunePackage rec { nativeBuildInputs = lib.optional (lib.versionOlder version "1.7.0") cppo; - propagatedBuildInputs = [ - csexp - jsonrpc - uutf - ] ++ lib.optional (lib.versionOlder version "1.7.0") stdlib-shims; + propagatedBuildInputs = + if lib.versionAtLeast version "1.14.0" then [ + jsonrpc + ppx_yojson_conv_lib + uutf + ] else if lib.versionAtLeast version "1.10.0" then [ + dyn + jsonrpc + ordering + ppx_yojson_conv_lib + stdune + uutf + ] else if lib.versionAtLeast version "1.7.0" then [ + csexp + jsonrpc + pp + ppx_yojson_conv_lib + uutf + ] else [ + csexp + jsonrpc + ppx_yojson_conv_lib + stdlib-shims + uutf + ]; meta = jsonrpc.meta // { description = "LSP protocol implementation in OCaml"; From 4be8375c5d1e30a5740b4c67293e39d4d76c0c97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 09:10:14 +0000 Subject: [PATCH 123/203] flix: 0.35.0 -> 0.36.0 --- pkgs/development/compilers/flix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix index 2b4c8dc50f2b..763a8eb7b982 100644 --- a/pkgs/development/compilers/flix/default.nix +++ b/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.35.0"; + version = "0.36.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-liPOAQfdAYc2JlUb+BXQ5KhTOYexC1vBCIuO0nT2jhk="; + sha256 = "sha256-HAhNNg8f+uC2QKYqkugJIyH7VakNA631S2/UE2vG+5M="; }; dontUnpack = true; From bf0ca92836add05fb2ec6e24f1720f62cdd5ca4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 09:10:59 +0000 Subject: [PATCH 124/203] fulcio: 1.2.0 -> 1.3.1 --- pkgs/tools/security/fulcio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index e1a7b40a14b5..d1c1da21058d 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sDxbBIE0NgOcEMTnQNXe93RvIDBn0IjH2D15GxwVJqU="; + sha256 = "sha256-d9PTio6BYJ+WmHH53NRFBI1BG/aOM+BauV398FKaQg0="; # 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; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-71YnLPgM3gkGzCgoiUIpknv9bFfxnZPHvf+5gAF1Knk="; + vendorHash = "sha256-RnCQ0KKT1azPZGPwbtRBLxNMng2mnYVT7xBI3Cxm9Q0="; nativeBuildInputs = [ installShellFiles ]; From 81357776bc59cbb5ba4e1c09c970199a4b3a343f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 09:18:45 +0000 Subject: [PATCH 125/203] arkade: 0.9.13 -> 0.9.16 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index bf5f9b35a4f6..c79b758e8761 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.9.13"; + version = "0.9.16"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-j7fqLkVRAH4EN90IQ/9y/uKfFsdXXTW6R/WFRhuKPGQ="; + sha256 = "sha256-HbwajFTCjiNtAMawI7uBZhIBGyVHUQQjsOrtuxuYmeM="; }; CGO_ENABLED = 0; From 497381dc32769185666357d1353dcfca9046c966 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 09:19:21 +0000 Subject: [PATCH 126/203] numix-icon-theme-circle: 23.04.20 -> 23.04.28 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 3f48f5b22a82..05c723130612 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.04.20"; + version = "23.04.28"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-pc5GwxU4KP6PktPvuCYVzJORVmMvC8GdBPr7QSN2cM0="; + sha256 = "sha256-GxTxywN5+CL/+21xhfCvbxJeGnDNjYrQ7iUd2/eq+QU="; }; nativeBuildInputs = [ gtk3 ]; From a1c2e2606c37fcddee03ab52f6256ceb1cafa320 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 08:38:27 +0000 Subject: [PATCH 127/203] aws-lambda-rie: 1.10 -> 1.11 --- .../admin/aws-lambda-runtime-interface-emulator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix index df074a2b2e62..7f588fec3a4d 100644 --- a/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix +++ b/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "aws-lambda-runtime-interface-emulator"; - version = "1.10"; + version = "1.11"; src = fetchFromGitHub { owner = "aws"; repo = "aws-lambda-runtime-interface-emulator"; rev = "v${version}"; - sha256 = "sha256-sRb1JYSAveei/X1m5/xfuGZFUwBopczrz1n+8gn4eKw="; + sha256 = "sha256-N5RTMShukJCiM0NYzFsANUDww8iLT/p7Li0hAXerjAM="; }; - vendorSha256 = "sha256-9aSALE42M/DoQS4PBHIVNDKzNdL5UhdXKAmLUSws3+Y="; + vendorHash = "sha256-AZDbBFF7X247AYOVvJ5vuzuVqHqH6MbUylF5lRamzhU="; # disabled because I lack the skill doCheck = false; From 74d79f7a55ff36faae53d7518544603fb7333685 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 09:30:06 +0000 Subject: [PATCH 128/203] cargo-udeps: 0.1.36 -> 0.1.38 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index c66589f57e37..1ae5f39566a8 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.36"; + version = "0.1.38"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7sfUA1YQrYlgnzr+uTXcEwWMN/rUkwIzNvzN8YQ6HOo="; + sha256 = "sha256-UQ6JrzL9yGllhPYN7Dod6UYqu2FJLjInmpE6IUmjZno="; }; - cargoHash = "sha256-Q5sLn9JrspnxMPi8zoP3i/G92PP1zPVCKlQXdTiSXJM="; + cargoHash = "sha256-jzBOdMtv47wDOOcPg0B5BYQtYSnDnOnms0SDrW2lFbs="; nativeBuildInputs = [ pkg-config ]; From 74aed074ecda8461c0f4ee276216e80d3df556f5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 5 May 2023 10:39:25 +0100 Subject: [PATCH 129/203] rapidcheck: unstable-2020-12-19 -> unstable-2023-04-16 Fixed gcc build failure among other things: https://github.com/emil-e/rapidcheck/pull/304/commits/184312e0699ab7d2fe569bf3709d48781398153c While at it added trivial updater. --- pkgs/development/libraries/rapidcheck/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix index a8a87dfd1172..4d8f34f58c8c 100644 --- a/pkgs/development/libraries/rapidcheck/default.nix +++ b/pkgs/development/libraries/rapidcheck/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, cmake, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, unstableGitUpdater +}: stdenv.mkDerivation rec { pname = "rapidcheck"; - version = "unstable-2020-12-19"; + version = "unstable-2023-04-16"; src = fetchFromGitHub { owner = "emil-e"; repo = "rapidcheck"; - rev = "b78f89288c7e086d06e2a1e10b605d8375517a8a"; - sha256 = "0fj11gbhkaxbsgix2im7vdfvr26l75b8djk462sfw8xrwrfkjbdz"; + rev = "a5724ea5b0b00147109b0605c377f1e54c353ba2"; + hash = "sha256-nq2VBDREkAOnvtdYr3m0TYNXx7mv9hbV5HZFVL2uTTg="; }; nativeBuildInputs = [ cmake ]; @@ -21,6 +26,8 @@ stdenv.mkDerivation rec { rm $out/extras/**/CMakeLists.txt ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "A C++ framework for property based testing inspired by QuickCheck"; inherit (src.meta) homepage; From 9f53f29175b3ca247dd27b91ddf3ebf2db66920f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 09:43:02 +0000 Subject: [PATCH 130/203] clash-meta: 1.14.3 -> 1.14.4 --- pkgs/tools/networking/clash-meta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/clash-meta/default.nix b/pkgs/tools/networking/clash-meta/default.nix index 803c9203a318..35a07133b44e 100644 --- a/pkgs/tools/networking/clash-meta/default.nix +++ b/pkgs/tools/networking/clash-meta/default.nix @@ -4,7 +4,7 @@ }: buildGoModule rec { pname = "clash-meta"; - version = "1.14.3"; + version = "1.14.4"; src = fetchFromGitHub { owner = "MetaCubeX"; @@ -14,10 +14,10 @@ buildGoModule rec { postFetch = '' rm -f $out/.github/workflows/{Delete,delete}.yml ''; - hash = "sha256-HITuxnzzyHBJ3PlXHYR0M1r3x70AtwzAp1hQ6pX16Bo="; + hash = "sha256-HEJQaNFKcmR7KtXsYs2h1KpRZJfQljYjMUBMdqg7gRU="; }; - vendorHash = "sha256-D6b0U04wwDUzeIu3//E10YehohTzvyHWtK5Yzf3xrAI="; + vendorHash = "sha256-jvl4dAP0EOl9p/3LPNLUqzg8H/mP7AKaI+lJ6ROo/1k="; # Do not build testing suit excludedPackages = [ "./test" ]; From cc3f70a1aa25684e714eb9a2e0f237c8a8965e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Fri, 5 May 2023 11:58:16 +0200 Subject: [PATCH 131/203] mullvad-browser: 12.0.4 -> 12.0.5 --- .../networking/browsers/mullvad-browser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 627056795ce4..5992d8dfdc10 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -76,14 +76,14 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - tag = "mullvad-browser-102.9.0esr-12.0-2-build1"; - version = "12.0.4"; + tag = "mullvad-browser-102.10.0esr-12.0-2-build2"; + version = "12.0.5"; lang = "ALL"; srcs = { x86_64-linux = fetchurl { url = "https://github.com/mullvad/mullvad-browser/releases/download/${tag}/mullvad-browser-linux64-${version}_${lang}.tar.xz"; - hash = "sha256-q4dTKNQkcqaRwiF25iVOQSvwVLA3tJRlQ4DzC3tuG5A="; + hash = "sha256-Ezs2pjJNGOinMIskBDwpj70eKSkfcV6ZCKb60I5J23w="; }; }; From 0fc052a4f42112552ab10e27edcfa0439687beda Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Fri, 5 May 2023 12:56:35 +0300 Subject: [PATCH 132/203] owncloud-client: improve nix expressions --- .../networking/owncloud-client/default.nix | 12 +++++------- .../libre-graph-api-cpp-qt-client.nix | 7 ++++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 36b1b88696ff..29f9ae7eb7bd 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , mkDerivation , pkg-config @@ -7,12 +8,13 @@ , callPackage , qtbase , qtkeychain +, wrapQtAppsHook , qttools , sqlite , libsecret }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "owncloud-client"; version = "3.2.1"; @@ -25,12 +27,8 @@ mkDerivation rec { hash = "sha256-39tpvzlTy3KRxg8DzCQW2VnsaLqJ+dNQRur2TqRZytE="; }; - nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; - buildInputs = [ qtbase qttools qtkeychain sqlite libsecret libregraph ]; - - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}" - ]; + nativeBuildInputs = [ pkg-config cmake extra-cmake-modules wrapQtAppsHook qttools ]; + buildInputs = [ qtbase qtkeychain sqlite libsecret libregraph ]; cmakeFlags = [ "-UCMAKE_INSTALL_LIBDIR" diff --git a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix b/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix index fb089cf09970..371432cb5fd6 100644 --- a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix +++ b/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix @@ -1,11 +1,12 @@ { lib +, stdenv , fetchFromGitHub -, mkDerivation , cmake , qtbase +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "libre-graph-api-cpp-qt-client"; version = "0.13.2"; @@ -18,7 +19,7 @@ mkDerivation rec { sourceRoot = "source/client"; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase ]; cmakeFlags = [ ]; From f80cd0a794a85cd796f99fb1400161741e6b5ca8 Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Thu, 20 Apr 2023 11:15:50 +0200 Subject: [PATCH 133/203] maintainers: add giorgiga --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c450ea83726c..69b37574b173 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5695,6 +5695,12 @@ githubId = 1713676; name = "Luis G. Torres"; }; + giorgiga = { + email = "giorgio.gallo@bitnic.it"; + github = "giorgiga"; + githubId = 471835; + name = "Giorgio Gallo"; + }; GKasparov = { email = "mizozahr@gmail.com"; github = "GKasparov"; From c49009648108ceeed8c69ec67c889205863464e2 Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Thu, 20 Apr 2023 11:17:15 +0200 Subject: [PATCH 134/203] fishPlugins.sdkman-for-fish: init at 1.4.0 Co-authored-by: OTABI Tomoya Co-authored-by: Sandro --- pkgs/shells/fish/plugins/default.nix | 2 ++ pkgs/shells/fish/plugins/sdkman-for-fish.nix | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/shells/fish/plugins/sdkman-for-fish.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 3c3a99b35e56..739e81995233 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -48,6 +48,8 @@ lib.makeScope newScope (self: with self; { pure = callPackage ./pure.nix { }; + sdkman-for-fish = callPackage ./sdkman-for-fish.nix { }; + sponge = callPackage ./sponge.nix { }; tide = callPackage ./tide.nix { }; diff --git a/pkgs/shells/fish/plugins/sdkman-for-fish.nix b/pkgs/shells/fish/plugins/sdkman-for-fish.nix new file mode 100644 index 000000000000..32e5317ed1cf --- /dev/null +++ b/pkgs/shells/fish/plugins/sdkman-for-fish.nix @@ -0,0 +1,20 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "sdkman-for-fish"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "reitzig"; + repo = "sdkman-for-fish"; + rev = "v${version}"; + hash = "sha256-bfWQ2al0Xy8bnJt5euziHz/+qhyri4qWy47VDoPwQcg="; + }; + + meta = with lib; { + description = "Adds support for SDKMAN! to fish"; + homepage = "https://github.com/reitzig/sdkman-for-fish"; + license = licenses.mit; + maintainers = with maintainers; [ giorgiga ]; + }; +} From 69764ae8d7aa86ff8395eca444c9b49a18bc9dfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 10:21:07 +0000 Subject: [PATCH 135/203] ddccontrol-db: 20230328 -> 20230424 --- pkgs/data/misc/ddccontrol-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 2f66e154097e..36186b972653 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20230328"; + version = "20230424"; src = fetchFromGitHub { owner = "ddccontrol"; repo = pname; rev = version; - sha256 = "sha256-74HZqgIEDCKeByPFsuUy3A9zutc5ALNxCrRipi7nbI4="; + sha256 = "sha256-qi6dDh6Zk1GpHBpQ+aatAmG9lCdesnJRhK3jVjKYKcQ="; }; nativeBuildInputs = [ autoreconfHook intltool ]; From d6a684d22358e6f175191cb56e659720344d2d43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 04:17:09 +0000 Subject: [PATCH 136/203] ppsspp-sdl: 1.14.4 -> 1.15.2 --- pkgs/applications/emulators/ppsspp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/ppsspp/default.nix b/pkgs/applications/emulators/ppsspp/default.nix index afa361903f51..51d959e7c901 100644 --- a/pkgs/applications/emulators/ppsspp/default.nix +++ b/pkgs/applications/emulators/ppsspp/default.nix @@ -34,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString enableQt "-qt" + lib.optionalString (!enableQt) "-sdl" + lib.optionalString forceWayland "-wayland"; - version = "1.14.4"; + version = "1.15.2"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc="; + sha256 = "sha256-D42u3MP+JKO/1IrOWVliVg4flUJi/pADScbNktRP+bY="; }; postPatch = '' From 4b64895a1286d86c4f635b300b9eadee86109559 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 10:44:29 +0000 Subject: [PATCH 137/203] btdu: 0.5.0 -> 0.5.1 --- pkgs/tools/misc/btdu/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/btdu/default.nix b/pkgs/tools/misc/btdu/default.nix index f3dcdf8e259c..8031b5ea165d 100644 --- a/pkgs/tools/misc/btdu/default.nix +++ b/pkgs/tools/misc/btdu/default.nix @@ -9,31 +9,31 @@ }: let - _d_ae_ver = "0.0.3228"; - _d_btrfs_ver = "0.0.13"; - _d_ncurses_ver = "0.0.149"; + _d_ae_ver = "0.0.3236"; + _d_btrfs_ver = "0.0.18"; + _d_ncurses_ver = "1.0.0"; _d_emsi_containers_ver = "0.9.0"; in stdenv.mkDerivation rec { pname = "btdu"; - version = "0.5.0"; + version = "0.5.1"; srcs = [ (fetchurl { url = "https://github.com/CyberShadow/${pname}/archive/v${version}.tar.gz"; - sha256 = "90ba4d8997575993e9d39a503779fb32b37bb62b8d9386776e95743bfc859606"; + sha256 = "566269f365811f6db53280fc5476a7fcf34791396ee4e090c150af4280b35ba5"; }) (fetchurl { url = "https://github.com/CyberShadow/ae/archive/v${_d_ae_ver}.tar.gz"; - sha256 = "6b3da61d9f7f1a7343dbe5691a16482cabcd78532b7c09ed9d63eb1934f1b9d8"; + sha256 = "5ea3f0d9d2d13012ce6a1ee1b52d9fdff9dfb1d5cc7ee5d1b04cab1947ed4d36"; }) (fetchurl { url = "https://github.com/CyberShadow/d-btrfs/archive/v${_d_btrfs_ver}.tar.gz"; - sha256 = "05a59cd64000ce2af9bd0578ef5118ab4d10de0ec50410ba0d4e463f01cfaa4e"; + sha256 = "32af4891d93c7898b0596eefb8297b88d3ed5c14c84a5951943b7b54c7599dbd"; }) (fetchurl { url = "https://github.com/D-Programming-Deimos/ncurses/archive/v${_d_ncurses_ver}.tar.gz"; - sha256 = "2c8497f5dd93f9d3a05ca7ed57c4fcaee1e988fd25a24de106917ddf72f34646"; + sha256 = "b5db677b75ebef7a1365ca4ef768f7344a2bc8d07ec223a2ada162f185d0d9c6"; }) (fetchurl { url = "https://github.com/dlang-community/containers/archive/v${_d_emsi_containers_ver}.tar.gz"; From 050649477df7f25862fc7d4d2345f66b1a3d79c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 09:51:01 +0000 Subject: [PATCH 138/203] mimir: 2.7.1 -> 2.8.0 --- pkgs/servers/monitoring/mimir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index f151d31d5959..a8d83d151eab 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: buildGoModule rec { pname = "mimir"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - sha256 = "sha256-5rj7qTomHiplCMcAsKCquH5Z94Syk43Ggoq+Mo1heQA="; + sha256 = "sha256-gVt334HTKOotRaO1ga774FaxpblADpgdTtucADOHsCE="; }; vendorSha256 = null; From 64ec522697d4c5050b97e47fd96467b400f668d7 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 5 May 2023 06:47:06 +0800 Subject: [PATCH 139/203] openvi: init at 7.3.22 --- pkgs/applications/editors/openvi/default.nix | 46 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/applications/editors/openvi/default.nix diff --git a/pkgs/applications/editors/openvi/default.nix b/pkgs/applications/editors/openvi/default.nix new file mode 100644 index 000000000000..43c4d8927268 --- /dev/null +++ b/pkgs/applications/editors/openvi/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, ncurses +}: + +stdenv.mkDerivation rec { + pname = "openvi"; + version = "7.3.22"; + + src = fetchFromGitHub { + owner = "johnsonjh"; + repo = "OpenVi"; + rev = version; + hash = "sha256-yXYiH2FCT7ffRPmb28V54+KO1RLs8L9KHk3remkMWmA="; + }; + + patches = [ + # do not attempt to install to /var/tmp/vi.recover + (fetchpatch { + url = "https://github.com/johnsonjh/OpenVi/commit/5205f0234369963c443e83ca5028ca63feaaac91.patch"; + hash = "sha256-hoKzQLnpdRbc48wffWbzFtivr20VqEPs4WRPXuDa/88="; + }) + ]; + + buildInputs = [ ncurses ]; + + makeFlags = [ + "PREFIX=$(out)" + # command -p will yield command not found erorr + "PAWK=awk" + # silently fail the chown command + "IUSGR=$(USER)" + ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/johnsonjh/OpenVi"; + description = "Portable OpenBSD vi for UNIX systems"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ aleksana ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 013f7bda2c86..a7ab81404922 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32897,6 +32897,8 @@ with pkgs; opentx = libsForQt5.callPackage ../applications/misc/opentx { }; + openvi = darwin.apple_sdk_11_0.callPackage ../applications/editors/openvi { }; + opera = callPackage ../applications/networking/browsers/opera { }; orca = python3Packages.callPackage ../applications/misc/orca { From ffa93dc254855a3dbd2800fffa0e9244f8bd65e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 10:56:05 +0000 Subject: [PATCH 140/203] ncspot: 0.13.1 -> 0.13.2 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 8609912456b5..1f493e2eaf1e 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - hash = "sha256-TZTADhoJloqMSO2UgbwwvJoZqhi8UC1qNDDNxE6Aq54="; + hash = "sha256-DdJa4ax/v86OgO+IAsiFA8/u6pEGcCw+N/3MLXzz8DM="; }; - cargoHash = "sha256-tEk7BxAN8jEquJiv89vC0lYrB/sKeZhThBzs09A9NpA="; + cargoHash = "sha256-HkpFboXgHbJMYJFabJ58Syy1ag+InwqkeJAw8MxAr0A="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; From c16cd432046605d93f5a6233970af11cfeaecc6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 11:03:10 +0000 Subject: [PATCH 141/203] rke2: 1.26.4+rke2r1 -> 1.27.1+rke2r1 --- pkgs/applications/networking/cluster/rke2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/rke2/default.nix b/pkgs/applications/networking/cluster/rke2/default.nix index 85962c1b6ef8..8ffad86ddc74 100644 --- a/pkgs/applications/networking/cluster/rke2/default.nix +++ b/pkgs/applications/networking/cluster/rke2/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rke2"; - version = "1.26.4+rke2r1"; + version = "1.27.1+rke2r1"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-orxRyCgj3pGLlBoUEjVpyWKw4zfvN4DtaymYKEBXNbs="; + hash = "sha256-MPhE4dkFDLMG/Zxn9UqUMmbV95wfNDJU9C5CT8Ap5iA="; }; - vendorHash = "sha256-YeWyMEwatKuT4FWIpaDK6/xo5TG5IOecoYR+uVidOW4="; + vendorHash = "sha256-STpM7GxLdEhe7tfa6n6jyUSQsE9D91pCBvw1n7Q9qMc="; subPackages = [ "." ]; From 4503d47a56950a21aeae9a3e648d6862682756ae Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 5 May 2023 01:29:10 +0900 Subject: [PATCH 142/203] python3Packages.openapi-schema-pydantic: init at 1.2.4 --- .../openapi-schema-pydantic/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/openapi-schema-pydantic/default.nix diff --git a/pkgs/development/python-modules/openapi-schema-pydantic/default.nix b/pkgs/development/python-modules/openapi-schema-pydantic/default.nix new file mode 100644 index 000000000000..1930dc237f05 --- /dev/null +++ b/pkgs/development/python-modules/openapi-schema-pydantic/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pydantic +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "openapi-schema-pydantic"; + version = "1.2.4"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-PiLPWLdKafdSzH5fFTf25EFkKC2ycAy7zTu5nd0GUZY="; + }; + + propagatedBuildInputs = [ + pydantic + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # these tests are broken with `pydantic >= 1.10` + # but this library seems to work fine. + # e.g. https://github.com/hwchase17/langchain/blob/d86ed15d8884d5a3f120a433b9dda065647e4534/poetry.lock#L6011-L6012 + "test_pydantic_discriminator_schema_generation" + "test_pydantic_discriminator_openapi_generation" + ]; + + meta = with lib; { + description = "OpenAPI (v3) specification schema as pydantic class"; + homepage = "https://github.com/kuimono/openapi-schema-pydantic"; + changelog = "https://github.com/kuimono/openapi-schema-pydantic/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73b8679c0561..93913fecde01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6910,6 +6910,8 @@ self: super: with self; { openant = callPackage ../development/python-modules/openant { }; + openapi-schema-pydantic = callPackage ../development/python-modules/openapi-schema-pydantic { }; + openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { }; openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; From 62c557d55438f460251b065c8ab21bffd3022d8d Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 5 May 2023 01:30:01 +0900 Subject: [PATCH 143/203] python3Packages.langchain: init at 0.0.158 --- .../python-modules/langchain/default.nix | 219 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 221 insertions(+) create mode 100644 pkgs/development/python-modules/langchain/default.nix diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix new file mode 100644 index 000000000000..a21b0b0ae1ac --- /dev/null +++ b/pkgs/development/python-modules/langchain/default.nix @@ -0,0 +1,219 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, numpy +, pyyaml +, sqlalchemy +, requests +, async-timeout +, aiohttp +, numexpr +, openapi-schema-pydantic +, dataclasses-json +, tqdm +, tenacity +, bash + # optional dependencies +, openai +, huggingface-hub +, torch +, transformers +, qdrant-client +, sentence-transformers +, azure-identity +, azure-cosmos +, azure-core +, elasticsearch +, opensearch-py +, faiss +, spacy +, nltk +, beautifulsoup4 +, tiktoken +, jinja2 +, pinecone-client +, weaviate-client +, redis +, google-api-python-client +, pypdf +, networkx +, psycopg2 +, boto3 +, pyowm +, pytesseract +, html2text +, atlassian-python-api +, duckduckgo-search +, lark + # test dependencies +, pytest-vcr +, pytest-asyncio +, pytest-mock +, pandas +, toml +, freezegun +, responses +, pexpect +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "langchain"; + version = "0.0.158"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "hwchase17"; + repo = "langchain"; + rev = "refs/tags/v${version}"; + hash = "sha256-R8l7Y33CiTL4px5A7rB6PHMnSjvINZBrgANwUMFkls8="; + }; + + postPatch = '' + substituteInPlace langchain/utilities/bash.py \ + --replace '"env", ["-i", "bash", ' '"${lib.getExe bash}", [' + substituteInPlace tests/unit_tests/test_bash.py \ + --replace "/bin/sh" "${bash}/bin/sh" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + buildInputs = [ + bash + ]; + + propagatedBuildInputs = [ + numpy + pyyaml + sqlalchemy + requests + aiohttp + numexpr + openapi-schema-pydantic + dataclasses-json + tqdm + tenacity + ] ++ lib.optionals (pythonOlder "3.11") [ + async-timeout + ] ++ passthru.optional-dependencies.all; + + passthru.optional-dependencies = { + llms = [ + # anthropic + # cohere + openai + # nlpcloud + huggingface-hub + # manifest-ml + torch + transformers + ]; + qdrant = [ + qdrant-client + ]; + openai = [ + openai + ]; + cohere = [ + # cohere + ]; + embeddings = [ + sentence-transformers + ]; + azure = [ + azure-identity + azure-cosmos + openai + azure-core + ]; + all = [ + # anthropic + # cohere + openai + # nlpcloud + huggingface-hub + # jina + # manifest-ml + elasticsearch + opensearch-py + # google-search-results + faiss + sentence-transformers + transformers + spacy + nltk + # wikipedia + beautifulsoup4 + tiktoken + torch + jinja2 + pinecone-client + # pinecone-text + weaviate-client + redis + google-api-python-client + # wolframalpha + qdrant-client + # tensorflow-text + pypdf + networkx + # nomic + # aleph-alpha-client + # deeplake + # pgvector + psycopg2 + boto3 + pyowm + pytesseract + html2text + atlassian-python-api + # gptcache + duckduckgo-search + # arxiv + azure-identity + # clickhouse-connect + azure-cosmos + # lancedb + lark + pexpect + # pyvespa + # O365 + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + pytest-vcr + pytest-mock + pytest-asyncio + pandas + toml + freezegun + responses + ]; + + preCheck = '' + # integration_tests have many network, db access and require `OPENAI_API_KEY`, etc. + rm -r tests/integration_tests + ''; + + disabledTests = [ + # these tests have db access + "test_table_info" + "test_sql_database_run" + ]; + + meta = with lib; { + description = "Building applications with LLMs through composability"; + homepage = "https://github.com/hwchase17/langchain"; + changelog = "https://github.com/hwchase17/langchain/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93913fecde01..0f2bf763b3ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5406,6 +5406,8 @@ self: super: with self; { lakeside = callPackage ../development/python-modules/lakeside { }; + langchain = callPackage ../development/python-modules/langchain { }; + langcodes = callPackage ../development/python-modules/langcodes { }; langdetect = callPackage ../development/python-modules/langdetect { }; From e5fa77e771e3f80914de72d05ee9c3263b8b5ab4 Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Fri, 19 Aug 2022 22:27:01 +0530 Subject: [PATCH 144/203] xplorer: init at unstable-2023-03-19 --- .../file-managers/xplorer/Cargo.lock | 4672 +++++++++++++++++ .../file-managers/xplorer/default.nix | 94 + .../file-managers/xplorer/package.json | 88 + pkgs/top-level/all-packages.nix | 2 + 4 files changed, 4856 insertions(+) create mode 100644 pkgs/applications/file-managers/xplorer/Cargo.lock create mode 100644 pkgs/applications/file-managers/xplorer/default.nix create mode 100644 pkgs/applications/file-managers/xplorer/package.json diff --git a/pkgs/applications/file-managers/xplorer/Cargo.lock b/pkgs/applications/file-managers/xplorer/Cargo.lock new file mode 100644 index 000000000000..d0ca3bf679f5 --- /dev/null +++ b/pkgs/applications/file-managers/xplorer/Cargo.lock @@ -0,0 +1,4672 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] +name = "aes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +dependencies = [ + "cfg-if 1.0.0", + "cipher", + "cpufeatures", + "opaque-debug", +] + +[[package]] +name = "aho-corasick" +version = "0.7.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" + +[[package]] +name = "app" +version = "0.1.0" +dependencies = [ + "bincode", + "clap", + "font-loader", + "glob", + "lazy_static", + "normpath", + "notify", + "open 2.1.3", + "parselnk", + "path-absolutize", + "reqwest", + "serde", + "serde_json", + "sysinfo", + "tauri", + "tauri-build", + "tauri-plugin-window-state", + "tokio", + "trash", + "url", + "window-shadows", + "window-vibrancy", + "zip", +] + +[[package]] +name = "atk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "attohttpc" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" +dependencies = [ + "flate2", + "http", + "log", + "native-tls", + "serde", + "serde_json", + "serde_urlencoded", + "url", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[package]] +name = "base64ct" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "memchr", +] + +[[package]] +name = "bumpalo" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" + +[[package]] +name = "bytemuck" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" + +[[package]] +name = "bzip2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "cargo_toml" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e72c3ff59e3b7d24630206bb63a73af65da4ed5df1f76ee84dfafb9fee2ba60e" +dependencies = [ + "serde", + "serde_derive", + "toml", +] + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c" +dependencies = [ + "byteorder", + "uuid 0.8.2", +] + +[[package]] +name = "cfg-expr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-expr" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aacacf4d96c24b2ad6eb8ee6df040e4f27b0d0b39a5710c30091baa830485db" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-integer", + "num-traits", + "time 0.1.44", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "cipher" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +dependencies = [ + "generic-array", +] + +[[package]] +name = "clap" +version = "3.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" +dependencies = [ + "atty", + "bitflags", + "clap_lex", + "indexmap", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "cmake" +version = "0.1.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +dependencies = [ + "cc", +] + +[[package]] +name = "cocoa" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +dependencies = [ + "bitflags", + "block", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +dependencies = [ + "bitflags", + "core-foundation", + "foreign-types", + "libc", +] + +[[package]] +name = "core-text" +version = "19.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" +dependencies = [ + "core-foundation", + "core-graphics", + "foreign-types", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +dependencies = [ + "autocfg", + "cfg-if 1.0.0", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "ctor" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "cty" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "dbus" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8bcdd56d2e5c4ed26a529c5a9029f5db8290d433497506f958eae3be148eb6" +dependencies = [ + "libc", + "libdbus-sys", + "winapi 0.3.9", +] + +[[package]] +name = "deflate" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" +dependencies = [ + "adler32", + "byteorder", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version 0.4.0", + "syn", +] + +[[package]] +name = "digest" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if 1.0.0", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi 0.3.9", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + +[[package]] +name = "dtoa-short" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" +dependencies = [ + "dtoa", +] + +[[package]] +name = "either" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "expat-sys" +version = "2.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" +dependencies = [ + "cmake", + "pkg-config", +] + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "field-offset" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +dependencies = [ + "memoffset", + "rustc_version 0.3.3", +] + +[[package]] +name = "filetime" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "windows-sys 0.36.1", +] + +[[package]] +name = "flate2" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "font-loader" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c49d6b4c11dca1a1dd931a34a9f397e2da91abe3de4110505f3530a80e560b52" +dependencies = [ + "core-foundation", + "core-text", + "libc", + "servo-fontconfig", + "winapi 0.3.9", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "freetype-sys" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" +dependencies = [ + "cmake", + "libc", + "pkg-config", +] + +[[package]] +name = "fsevent" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" +dependencies = [ + "bitflags", + "fsevent-sys", +] + +[[package]] +name = "fsevent-sys" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" +dependencies = [ + "libc", +] + +[[package]] +name = "fuchsia-zircon" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +dependencies = [ + "bitflags", + "fuchsia-zircon-sys", +] + +[[package]] +name = "fuchsia-zircon-sys" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" + +[[package]] +name = "futures-executor" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" + +[[package]] +name = "futures-macro" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" + +[[package]] +name = "futures-task" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" + +[[package]] +name = "futures-util" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.0.2", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps 6.0.2", + "x11", +] + +[[package]] +name = "generator" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc184cace1cea8335047a471cc1da80f18acf8a76f3bab2028d499e328948ec7" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.32.0", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.2", + "winapi 0.3.9", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" +dependencies = [ + "anyhow", + "heck 0.4.0", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "glob" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" + +[[package]] +name = "globset" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +dependencies = [ + "atk", + "bitflags", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps 6.0.2", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "h2" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "html5ever" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.4", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "hyper" +version = "0.14.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa 1.0.4", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd911b35d940d2bd0bea0f9100068e5b97b51a1cbe13d13382f132e0365257a0" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "js-sys", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "ico" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a4b3331534254a9b64095ae60d3dc2a8225a7a70229cd5888be127cdc1f6804" +dependencies = [ + "byteorder", + "png 0.11.0", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +dependencies = [ + "crossbeam-utils", + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd8e4fb07cf672b1642304e731ef8a6a4c7891d67bb4fd4f5ce58cd6ed86803c" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-rational", + "num-traits", +] + +[[package]] +name = "indexmap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "infer" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" +dependencies = [ + "cfb", +] + +[[package]] +name = "inflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5f9f47468e9a76a6452271efadc88fe865a82be91fe75e6c0c57b87ccea59d4" +dependencies = [ + "adler32", +] + +[[package]] +name = "inotify" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" +dependencies = [ + "bitflags", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "ipnet" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f995a3c8f2bc3dd52a18a583e90f9ec109c047fa1603a853e46bcda14d2e279d" +dependencies = [ + "serde", + "serde_json", + "treediff", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "kuchiki" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" +dependencies = [ + "cssparser", + "html5ever", + "matches", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.134" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" + +[[package]] +name = "libdbus-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if 1.0.0", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mac-notification-sys" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time 0.3.15", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markup5ever" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +dependencies = [ + "log", + "phf 0.8.0", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "minisign-verify" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" + +[[package]] +name = "miniz_oxide" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.6.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +dependencies = [ + "cfg-if 0.1.10", + "fuchsia-zircon", + "fuchsia-zircon-sys", + "iovec", + "kernel32-sys", + "libc", + "log", + "miow", + "net2", + "slab", + "winapi 0.2.8", +] + +[[package]] +name = "mio" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.36.1", +] + +[[package]] +name = "mio-extras" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" +dependencies = [ + "lazycell", + "log", + "mio 0.6.23", + "slab", +] + +[[package]] +name = "miow" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +dependencies = [ + "kernel32-sys", + "net2", + "winapi 0.2.8", + "ws2_32-sys", +] + +[[package]] +name = "native-tls" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "net2" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +dependencies = [ + "cfg-if 0.1.10", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "normpath" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04aaf5e9cb0fbf883cc0423159eacdf96a9878022084b35c462c428cab73bcaf" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "notify" +version = "4.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" +dependencies = [ + "bitflags", + "filetime", + "fsevent", + "fsevent-sys", + "inotify", + "libc", + "mio 0.6.23", + "mio-extras", + "walkdir", + "winapi 0.3.9", +] + +[[package]] +name = "notify-rust" +version = "4.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368e89ea58df747ce88be669ae44e79783c1d30bfd540ad0fc520b3f41f0b3b0" +dependencies = [ + "dbus", + "mac-notification-sys", + "tauri-winrt-notification", +] + +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi 0.3.9", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "once_cell" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "open" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2423ffbf445b82e58c3b1543655968923dd06f85432f10be2bb4f1b7122f98c" +dependencies = [ + "pathdiff", + "windows-sys 0.36.1", +] + +[[package]] +name = "open" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a3100141f1733ea40b53381b0ae3117330735ef22309a190ac57b9576ea716" +dependencies = [ + "pathdiff", + "windows-sys 0.36.1", +] + +[[package]] +name = "openssl" +version = "0.10.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "os_info" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" +dependencies = [ + "log", + "serde", + "winapi 0.3.9", +] + +[[package]] +name = "os_pipe" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dceb7e43f59c35ee1548045b2c72945a5a3bb6ce6d6f07cdc13dc8f6bc4930a" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "os_str_bytes" +version = "6.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.2", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.36.1", +] + +[[package]] +name = "parselnk" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0088616e6efe53ab79907b9313f4743eb3f8a16eb1e0014af810164808906dc3" +dependencies = [ + "bitflags", + "byteorder", + "chrono", + "thiserror", + "widestring", +] + +[[package]] +name = "password-hash" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" + +[[package]] +name = "path-absolutize" +version = "3.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3de4b40bd9736640f14c438304c09538159802388febb02c8abaae0846c1f13" +dependencies = [ + "path-dedot", +] + +[[package]] +name = "path-dedot" +version = "3.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d611d5291372b3738a34ebf0d1f849e58b1dcc1101032f76a346eaa1f8ddbb5b" +dependencies = [ + "once_cell", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "pbkdf2" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +dependencies = [ + "digest", + "hmac", + "password-hash", + "sha2", +] + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pest" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a" +dependencies = [ + "thiserror", + "ucd-trie", +] + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_macros 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "plist" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" +dependencies = [ + "base64", + "indexmap", + "line-wrap", + "serde", + "time 0.3.15", + "xml-rs", +] + +[[package]] +name = "png" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b0cabbbd20c2d7f06dbf015e06aad59b6ca3d9ed14848783e98af9aaf19925" +dependencies = [ + "bitflags", + "deflate", + "inflate", + "num-iter", +] + +[[package]] +name = "png" +version = "0.17.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c" +dependencies = [ + "bitflags", + "crc32fast", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +dependencies = [ + "once_cell", + "thiserror", + "toml", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro2" +version = "1.0.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.7", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" +dependencies = [ + "cty", +] + +[[package]] +name = "rayon" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom 0.2.7", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "reqwest" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "431949c384f4e2ae07605ccaa56d1d9d2ecdb5cadd4f9577ccfab29f2e5149fc" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rfd" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +dependencies = [ + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "lazy_static", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.37.0", +] + +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver 0.11.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.14", +] + +[[package]] +name = "rustversion" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" + +[[package]] +name = "ryu" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static", + "windows-sys 0.36.1", +] + +[[package]] +name = "scoped-tls" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "security-framework" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +dependencies = [ + "serde", +] + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + +[[package]] +name = "serde" +version = "1.0.145" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.145" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +dependencies = [ + "itoa 1.0.4", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa 1.0.4", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +dependencies = [ + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "servo-fontconfig" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" +dependencies = [ + "libc", + "servo-fontconfig-sys", +] + +[[package]] +name = "servo-fontconfig-sys" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" +dependencies = [ + "expat-sys", + "freetype-sys", + "pkg-config", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shared_child" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "soup2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +dependencies = [ + "bitflags", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", +] + +[[package]] +name = "soup2-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "string_cache" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sysinfo" +version = "0.23.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3977ec2e0520829be45c8a2df70db2bf364714d8a748316a10c3c35d4d2b01c9" +dependencies = [ + "cfg-if 1.0.0", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi 0.3.9", +] + +[[package]] +name = "system-deps" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" +dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml", + "version-compare 0.0.11", +] + +[[package]] +name = "system-deps" +version = "6.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" +dependencies = [ + "cfg-expr 0.10.3", + "heck 0.4.0", + "pkg-config", + "toml", + "version-compare 0.1.0", +] + +[[package]] +name = "tao" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43336f5d1793543ba96e2a1e75f3a5c7dcd592743be06a0ab3a190f4fcb4b934" +dependencies = [ + "bitflags", + "cairo-rs", + "cc", + "cocoa", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "paste", + "png 0.17.6", + "raw-window-handle", + "scopeguard", + "serde", + "unicode-segmentation", + "uuid 1.1.2", + "windows 0.39.0", + "windows-implement", + "x11-dl", +] + +[[package]] +name = "tar" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tauri" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efbf22abd61d95ca9b2becd77f9db4c093892f73e8a07d21d8b0b2bf71a7bcea" +dependencies = [ + "anyhow", + "attohttpc", + "base64", + "cocoa", + "dirs-next", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "glib", + "glob", + "gtk", + "heck 0.4.0", + "http", + "ignore", + "minisign-verify", + "notify-rust", + "objc", + "once_cell", + "open 3.0.3", + "os_info", + "os_pipe", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "regex", + "rfd", + "semver 1.0.14", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "shared_child", + "state", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "time 0.3.15", + "tokio", + "url", + "uuid 1.1.2", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "zip", +] + +[[package]] +name = "tauri-build" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0991fb306849897439dbd4a72e4cbed2413e2eb26cb4b3ba220b94edba8b4b88" +dependencies = [ + "anyhow", + "cargo_toml", + "heck 0.4.0", + "json-patch", + "semver 1.0.14", + "serde_json", + "tauri-utils", + "winres", +] + +[[package]] +name = "tauri-codegen" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "356fa253e40ae4d6ff02075011f2f2bb4066f5c9d8c1e16ca6912d7b75903ba6" +dependencies = [ + "base64", + "brotli", + "ico", + "json-patch", + "plist", + "png 0.17.6", + "proc-macro2", + "quote", + "regex", + "semver 1.0.14", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time 0.3.15", + "uuid 1.1.2", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6051fd6940ddb22af452340d03c66a3e2f5d72e0788d4081d91e31528ccdc4d" +dependencies = [ + "heck 0.4.0", + "proc-macro2", + "quote", + "syn", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-plugin-window-state" +version = "0.1.0" +source = "git+https://github.com/tauri-apps/tauri-plugin-window-state#ccb9436ba7bc8d5c1ee6a3287f947b6e0264af36" +dependencies = [ + "bincode", + "serde", + "tauri", + "thiserror", +] + +[[package]] +name = "tauri-runtime" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d49439a5ea47f474572b854972f42eda2e02a470be5ca9609cc83bb66945abe2" +dependencies = [ + "gtk", + "http", + "http-range", + "infer", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "uuid 1.1.2", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-runtime-wry" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dce920995fd49907aa9bea7249ed1771454f11f7611924c920a1f75fb614d4" +dependencies = [ + "cocoa", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid 1.1.2", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e8fdae6f29cef959809a3c3afef510c5b715a446a597ab8b791497585363f39" +dependencies = [ + "brotli", + "ctor", + "glob", + "heck 0.4.0", + "html5ever", + "json-patch", + "kuchiki", + "memchr", + "phf 0.10.1", + "proc-macro2", + "quote", + "semver 1.0.14", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows 0.39.0", +] + +[[package]] +name = "tauri-winrt-notification" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b" +dependencies = [ + "quick-xml", + "strum", + "windows 0.39.0", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi 0.3.9", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" + +[[package]] +name = "thin-slice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + +[[package]] +name = "thiserror" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +dependencies = [ + "once_cell", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + +[[package]] +name = "time" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" +dependencies = [ + "itoa 1.0.4", + "libc", + "num_threads", + "time-macros", +] + +[[package]] +name = "time-macros" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio 0.8.4", + "num_cpus", + "parking_lot", + "pin-project-lite", + "socket2", + "tokio-macros", + "winapi 0.3.9", +] + +[[package]] +name = "tokio-macros" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if 1.0.0", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "trash" +version = "2.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe090367848cd40c4230ff3ce4e2ff6a2fd511c1e14ae047a4a4c37ef7965236" +dependencies = [ + "chrono", + "libc", + "log", + "objc", + "once_cell", + "scopeguard", + "url", + "windows 0.37.0", +] + +[[package]] +name = "treediff" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff" +dependencies = [ + "serde_json", +] + +[[package]] +name = "try-lock" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" + +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "ucd-trie" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" + +[[package]] +name = "unicode-bidi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + +[[package]] +name = "uuid" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +dependencies = [ + "getrandom 0.2.7", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[package]] +name = "version-compare" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi 0.3.9", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29952969fb5e10fe834a52eb29ad0814ccdfd8387159b0933edf1344a1c9cdcc" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.0.2", +] + +[[package]] +name = "webview2-com" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "webview2-com-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "webview2-com-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", +] + +[[package]] +name = "widestring" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "window-shadows" +version = "0.2.0" +source = "git+https://github.com/tauri-apps/window-shadows#8a3defc797f3a5b83eb68a0f9cd86ab6fe59ae7f" +dependencies = [ + "cocoa", + "objc", + "raw-window-handle", + "windows-sys 0.42.0", +] + +[[package]] +name = "window-vibrancy" +version = "0.3.0" +source = "git+https://github.com/tauri-apps/window-vibrancy#2eccb51ef7643edf5e15088693cb0b85aef5096e" +dependencies = [ + "cocoa", + "objc", + "raw-window-handle", + "windows-sys 0.42.0", +] + +[[package]] +name = "windows" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec" +dependencies = [ + "windows_aarch64_msvc 0.32.0", + "windows_i686_gnu 0.32.0", + "windows_i686_msvc 0.32.0", + "windows_x86_64_gnu 0.32.0", + "windows_x86_64_msvc 0.32.0", +] + +[[package]] +name = "windows" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +dependencies = [ + "windows_aarch64_msvc 0.37.0", + "windows_i686_gnu 0.37.0", + "windows_i686_msvc 0.37.0", + "windows_x86_64_gnu 0.37.0", + "windows_x86_64_msvc 0.37.0", +] + +[[package]] +name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows-implement", + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows-bindgen" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" +dependencies = [ + "windows-metadata", + "windows-tokens", +] + +[[package]] +name = "windows-implement" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" +dependencies = [ + "syn", + "windows-tokens", +] + +[[package]] +name = "windows-metadata" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" + +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc 0.36.1", + "windows_i686_gnu 0.36.1", + "windows_i686_msvc 0.36.1", + "windows_x86_64_gnu 0.36.1", + "windows_x86_64_msvc 0.36.1", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.0", + "windows_i686_gnu 0.42.0", + "windows_i686_msvc 0.42.0", + "windows_x86_64_gnu 0.42.0", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.0", +] + +[[package]] +name = "windows-tokens" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" + +[[package]] +name = "windows_i686_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" + +[[package]] +name = "windows_i686_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" + +[[package]] +name = "windows_i686_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_i686_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" + +[[package]] +name = "windows_i686_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winres" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +dependencies = [ + "toml", +] + +[[package]] +name = "wry" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff5c1352b4266fdf92c63479d2f58ab4cd29dc4e78fbc1b62011ed1227926945" +dependencies = [ + "base64", + "block", + "cocoa", + "core-graphics", + "crossbeam-channel", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http", + "kuchiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "ws2_32-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "x11" +version = "2.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7ae97874a928d821b061fce3d1fc52f08071dd53c89a6102bc06efcac3b2908" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c83627bc137605acc00bb399c7b908ef460b621fc37c953db2b09f88c449ea6" +dependencies = [ + "lazy_static", + "libc", + "pkg-config", +] + +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "xml-rs" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" + +[[package]] +name = "zip" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf225bcf73bb52cbb496e70475c7bd7a3f769df699c0020f6c7bd9a96dcf0b8d" +dependencies = [ + "aes", + "byteorder", + "bzip2", + "constant_time_eq", + "crc32fast", + "crossbeam-utils", + "flate2", + "hmac", + "pbkdf2", + "sha1", + "time 0.3.15", + "zstd", +] + +[[package]] +name = "zstd" +version = "0.10.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4a6bd64f22b5e3e94b4e238669ff9f10815c27a5180108b849d24174a83847" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "4.1.6+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b61c51bb270702d6167b8ce67340d2754b088d0c091b06e593aa772c3ee9bb" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "1.6.3+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" +dependencies = [ + "cc", + "libc", +] diff --git a/pkgs/applications/file-managers/xplorer/default.nix b/pkgs/applications/file-managers/xplorer/default.nix new file mode 100644 index 000000000000..df39f4cad95e --- /dev/null +++ b/pkgs/applications/file-managers/xplorer/default.nix @@ -0,0 +1,94 @@ +{ lib +, cmake +, dbus +, fetchFromGitHub +, fetchYarnDeps +, freetype +, gtk3 +, libsoup +, mkYarnPackage +, openssl +, pkg-config +, rustPlatform +, webkitgtk +}: + +let + + pname = "xplorer"; + version = "unstable-2023-03-19"; + + src = fetchFromGitHub { + owner = "kimlimjustin"; + repo = pname; + rev = "8d69a281cbceda277958796cb6b77669fb062ee3"; + sha256 = "sha256-VFRdkSfe2mERaYYtZlg9dvH1loGWVBGwiTRj4AoNEAo="; + }; + + frontend-build = mkYarnPackage { + inherit version src; + pname = "xplorer-ui"; + + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + sha256 = "sha256-H37vD0GTSsWV5UH7C6UANDWnExTGh8yqajLn3y7P2T8="; + }; + + packageJSON = ./package.json; + + buildPhase = '' + export HOME=$(mktemp -d) + yarn --offline run prebuild + + cp -r deps/xplorer/out $out + ''; + + distPhase = "true"; + dontInstall = true; + }; +in + +rustPlatform.buildRustPackage { + inherit version src pname; + + sourceRoot = "source/src-tauri"; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tauri-plugin-window-state-0.1.0" = "sha256-DkKiwBwc9jrxMaKWOyvl9nsBJW0jBe8qjtqIdKJmsnc="; + "window-shadows-0.2.0" = "sha256-e1afzVjVUHtckMNQjcbtEQM0md+wPWj0YecbFvD0LKE="; + "window-vibrancy-0.3.0" = "sha256-0psa9ZtdI0T6sC1RJ4GeI3w01FdO2Zjypuk9idI5pBY="; + }; + }; + + # copy the frontend static resources to final build directory + # Also modify tauri.conf.json so that it expects the resources at the new location + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + + mkdir -p frontend-build + cp -R ${frontend-build}/src frontend-build + + substituteInPlace tauri.conf.json --replace '"distDir": "../out/src",' '"distDir": "frontend-build/src",' + ''; + + buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk cmake ]; + nativeBuildInputs = [ pkg-config ]; + + checkFlags = [ + # tries to mutate the parent directory + "--skip=test_file_operation" + ]; + + postInstall = '' + mv $out/bin/app $out/bin/xplorer + ''; + + meta = with lib; { + description = "A customizable, modern file manager"; + homepage = "https://xplorer.space"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/applications/file-managers/xplorer/package.json b/pkgs/applications/file-managers/xplorer/package.json new file mode 100644 index 000000000000..fd381eb347d9 --- /dev/null +++ b/pkgs/applications/file-managers/xplorer/package.json @@ -0,0 +1,88 @@ +{ + "name": "xplorer", + "description": "Xplorer, a customizable, modern file manager", + "version": "0.3.1", + "author": "Justin Maximillian Kimlim ", + "icon": "build/icon.icns", + "private": true, + "homepage": "https://xplorer.space", + "repository": { + "type": "git", + "url": "https://github.com/kimlimjustin/xplorer.git" + }, + "os": ["darwin", "win32", "linux"], + "scripts": { + "start": "yarn dev", + "web": "concurrently \"cd api/web && cargo run\" \"live-server ./out/src --no-browser\"", + "dev": "yarn compile && concurrently --kill-others \"yarn compile:watch\" \"yarn sass:watch\" \"yarn web\" \"tauri dev\"", + "clean": "rimraf out", + "sass": "sass src/Public/style.scss out/src/Public/style.css", + "sass:watch": "node scripts/sass-watcher.js", + "docs": "yarn --cwd ./docs start", + "pretest": "yarn compile", + "test": "jest", + "copyfiles": "node scripts/copyfiles", + "compile": "webpack && yarn sass && yarn copyfiles", + "compile:watch": "webpack --watch", + "crowdin": "crowdin", + "crowdin:pull": "crowdin pull", + "postcrowdin:pull": "node scripts/post_crowdin_pull.js", + "crowdin:sync": "yarn --cwd ./docs write-translations && crowdin upload && crowdin download", + "lint": "eslint -c .eslintrc.yml --ext .ts ./src", + "prettier": "prettier --write src", + "grunt": "grunt", + "css:minify": "cleancss --batch --batch-suffix \"\" out/**/*.css ", + "prebuild": "yarn compile && yarn grunt && yarn css:minify", + "build": "tauri build", + "postinstall": "husky install", + "fakefiles": "python scripts/generate-fake-files.py 1000" + }, + "workspaces": ["packages/*"], + "keywords": [ + "Xplorer", + "File explorer", + "File", + "File manager", + "Folders", + "Directory" + ], + "license": "Apache-2.0", + "devDependencies": { + "@crowdin/cli": "^3.6.5", + "@tauri-apps/cli": "^1.1.1", + "@types/jest": "^27.0.2", + "@types/marked": "^4.0.1", + "@typescript-eslint/eslint-plugin": "^5.4.0", + "@typescript-eslint/parser": "^5.4.0", + "buffer": "^6.0.3", + "clean-css-cli": "^5.3.3", + "concurrently": "^6.2.1", + "cpy": "^8.1.2", + "eslint": "^8.2.0", + "grunt": "^1.4.1", + "grunt-cli": "^1.4.3", + "grunt-contrib-uglify": "^5.0.1", + "grunt-contrib-watch": "^1.1.0", + "husky": "^7.0.2", + "jest": "^27.1.0", + "live-server": "^1.2.1", + "node-watch": "^0.7.1", + "postinstall-postinstall": "^2.1.0", + "prettier": "2.5.1", + "rimraf": "^3.0.2", + "sass": "1.45.2", + "ts-jest": "^27.0.7", + "ts-loader": "^9.2.6", + "typescript": "^4.4.2", + "webpack": "^5.58.2", + "webpack-cli": "^4.9.0" + }, + "dependencies": { + "@tauri-apps/api": "^1.1.0", + "highlight.js": "^11.2.0", + "mammoth": "^1.4.18", + "marked": "^4.0.15", + "xlsx": "^0.17.1" + }, + "optionalDependencies": {} +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 679e3b4beb42..ac013888f76c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2554,6 +2554,8 @@ with pkgs; xplr = callPackage ../applications/file-managers/xplr { }; + xplorer = callPackage ../applications/file-managers/xplorer { }; + ytree = callPackage ../applications/file-managers/ytree { }; ### APPLICATIONS/TERMINAL-EMULATORS From 4b7d12a98aba47a3da87c799ea55d4f934d23a07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 11:20:58 +0000 Subject: [PATCH 145/203] kubernetes-controller-tools: 0.11.4 -> 0.12.0 --- .../tools/kubernetes-controller-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix index 0092c76f128d..c3aefd37da5d 100644 --- a/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cOXN6DZH8uiJNPRZrSr2QIsENZUQrreqYJB6OFALFeA="; + sha256 = "sha256-2nRsaHCqZUF3M1Z0e//IjhYELHRxR6fSCfkWyC1fog4="; }; patches = [ ./version.patch ]; - vendorHash = "sha256-nZyDoME5fVqRoAeLADjrQ7i6mVf3ujGN2+BUfrSHck8="; + vendorHash = "sha256-gztTF8UZ5N4mip8NIyuCfoy16kpJymtggfG0sAcZW6c="; ldflags = [ "-s" From 0d130c22b6d9923112b7f2af33b791a8decfa204 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 5 May 2023 14:31:50 +0300 Subject: [PATCH 146/203] tezos-rust-libs: fix build on darwin --- pkgs/development/libraries/tezos-rust-libs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tezos-rust-libs/default.nix b/pkgs/development/libraries/tezos-rust-libs/default.nix index 72163acba83e..e59e5858eaac 100644 --- a/pkgs/development/libraries/tezos-rust-libs/default.nix +++ b/pkgs/development/libraries/tezos-rust-libs/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitLab, stdenv, llvmPackages_12, cargo }: +{ lib, fetchFromGitLab, stdenv, llvmPackages_12, cargo, libiconv }: stdenv.mkDerivation rec { version = "1.5"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ llvmPackages_12.llvm cargo ]; propagatedBuildDeps = [ llvmPackages_12.libllvm ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; buildPhase = '' runHook preBuild From 3b0954db5ddd38fb421dffddbbcae76af942c83a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 11:36:35 +0000 Subject: [PATCH 147/203] jfrog-cli: 2.36.1 -> 2.37.0 --- pkgs/tools/misc/jfrog-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index 2575482b34e9..4ef276d69484 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.36.1"; - vendorHash = "sha256-i0iZhYcVRxkcCWd9+liX5vvwXCyem3v1sRZYqmsNbgY="; + version = "2.37.0"; + vendorHash = "sha256-0u4sVqquMW3WyF5Uy/DrxwRZLPDARf0rACylc0R22IA="; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "v${version}"; - sha256 = "sha256-C3XoBtJyTQQDC5QKmNAyvdYt4ZyBhHs33bW4DDlv9lU="; + sha256 = "sha256-4BqlKJZQt9X3zIsImGWwGLm9M60XF2oStSV4ef+3L7Q="; }; postInstall = '' From 735777431a2c7b9b9cc29ac0b9af7524ca6b2544 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 11:49:59 +0000 Subject: [PATCH 148/203] pachyderm: 2.5.4 -> 2.5.5 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 6cf37bb9c250..8dcc4a396445 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-VYHSExQDIyK86kCz3gzIR+Q5iYrhkAPx56vST73vPOo="; + hash = "sha256-RaMOn5Cb98wKI9w0+kVUCMiySKGuudXHsi+EXFIm3Zc="; }; vendorHash = "sha256-XmIPifozTYd1rV2wm0dU0GPvg/+HFoSLGHB6DDrkzVc="; From 63ce062e9510e3bed1a827e75e7bef593296bfb6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 12:11:44 +0000 Subject: [PATCH 149/203] ergo: 5.0.9 -> 5.0.10 --- pkgs/applications/blockchains/ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix index 31e4a95503b4..bc8e4f34d0a6 100644 --- a/pkgs/applications/blockchains/ergo/default.nix +++ b/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.9"; + version = "5.0.10"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-EChnLRoInWFRuRMfnyRlZbZBWB6/QG9yRdwW9+IiMYc="; + sha256 = "sha256-T1+xQtXbLyfiV1IAeIiqzIFt1UZuctIkyNGzRc8E+zM="; }; nativeBuildInputs = [ makeWrapper ]; From 0d818ab0db0401b013b48dd08b52ac2c9f546813 Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Fri, 5 May 2023 14:05:07 +0200 Subject: [PATCH 150/203] clipboard-jh: 0.6.0 -> 0.7.0 --- pkgs/tools/misc/clipboard-jh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/clipboard-jh/default.nix b/pkgs/tools/misc/clipboard-jh/default.nix index 177c0b7a67f3..c9d26cfa69f9 100644 --- a/pkgs/tools/misc/clipboard-jh/default.nix +++ b/pkgs/tools/misc/clipboard-jh/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "clipboard-jh"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Slackadays"; repo = "clipboard"; rev = version; - hash = "sha256-o3yCWAy7hlFKAFW3tVRG+hL0SRWlNY4hvnhUoDK8GkI="; + hash = "sha256-+1GgIa0kIOliI0ACiU9zQe24R6488xWEZ7n9nuxv3dY"; }; postPatch = '' @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Slackadays/clipboard"; license = licenses.gpl3Only; maintainers = with maintainers; [ dit7ya ]; - mainProgram = "clipboard"; + mainProgram = "cb"; }; } From bcf4eea3bd7f9200bf3ba25e5670b546ebb05b96 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 5 May 2023 14:22:54 +0200 Subject: [PATCH 151/203] evcxr: skip test broken by rust 1.69 (#230089) Closes #229524 See also https://github.com/evcxr/evcxr/issues/294 While it's unfortunate that unused variable warnings aren't detected properly, the core functionality of the package is still fine, so let's skip the test for now and wait until upstream figures out a solution. --- pkgs/development/interpreters/evcxr/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index eab1f90e5f32..f4d07df624f3 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -20,6 +20,13 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv CoreServices Security ]; + # test broken with rust 1.69: + # * https://github.com/evcxr/evcxr/issues/294 + # * https://github.com/NixOS/nixpkgs/issues/229524 + checkFlags = [ + "--skip=check_for_errors" + ]; + postInstall = let wrap = exe: '' wrapProgram $out/bin/${exe} \ From 2daf4c8949af56047e2589e6cfb766ba4f053727 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 12:27:31 +0000 Subject: [PATCH 152/203] cudatext-qt: 1.192.0 -> 1.193.0 --- pkgs/applications/editors/cudatext/default.nix | 4 ++-- pkgs/applications/editors/cudatext/deps.json | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index 55c5aabaa36d..1b6dda1eeab3 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.192.0"; + version = "1.193.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-uRw4IeTJz5K3EPgEAtvtG938LT0doHh49/y02XlMhzE="; + hash = "sha256-vMTE6oe11ajO+Dw5pcgXEKSl8LR+3GI4DHH5KxS3Msw="; }; postPatch = '' diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 43400ed2c2f9..5b279d495cb0 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,18 +11,18 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.04.26", - "hash": "sha256-OQOIDK3DSWQeKMjHPbJzfB35v+FQXFaoOES0luKSMc0=" + "rev": "2023.05.04", + "hash": "sha256-VdjLHbgj5i7gEavnGLvPlBBlo5HPYUIBX78pkD2CbwI=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.04.26", - "hash": "sha256-RD8ZmRy6jf6pUGPDI3Ft2LBYHXklxXlJXaLHjLv3usE=" + "rev": "2023.05.02", + "hash": "sha256-E3XBPzd8D8SMhjXOj16syzdMgryzOVPxnEuZwpO7Czw=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2023.04.26", - "hash": "sha256-y5+NaTTSS6GI2gLOOewQnWzfAUB1reximvqnWjavORk=" + "rev": "2023.05.02", + "hash": "sha256-bPib2pJqxb+m9eMGerClj1bvAoHcGH2OTmmKon6UQfo=" }, "EControl": { "owner": "Alexey-T", @@ -31,8 +31,8 @@ }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2023.04.17", - "hash": "sha256-ZCRoKuwU+DtXEEZEL2QhhwMfewQMhw+/20vVRgHpHf4=" + "rev": "2023.05.02", + "hash": "sha256-EKJnkwQ7QTUTVaXOA1pi5YUHxaA/hu4qpgpHHaON61k=" }, "Python-for-Lazarus": { "owner": "Alexey-T", From 9839666856f35098cb4dab60a44069dfd37019f1 Mon Sep 17 00:00:00 2001 From: "Emil \"AngryAnt\" Johansen" Date: Tue, 2 May 2023 12:35:45 +0200 Subject: [PATCH 153/203] proxmove: init at 1.2 --- pkgs/tools/admin/proxmove/default.nix | 42 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/tools/admin/proxmove/default.nix diff --git a/pkgs/tools/admin/proxmove/default.nix b/pkgs/tools/admin/proxmove/default.nix new file mode 100644 index 000000000000..6f20e5fe603f --- /dev/null +++ b/pkgs/tools/admin/proxmove/default.nix @@ -0,0 +1,42 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "proxmove"; + version = "1.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ossobv"; + repo = "proxmove"; + rev = "v${version}"; + hash = "sha256-8xzsmQsogoMrdpf8+mVZRWPGQt9BO0dBT0aKt7ygUe4="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + proxmoxer + ]; + + preBuild = '' + rm -R assets + rm -R artwork + ''; + + checkPhase = '' + runHook preCheck + + $out/bin/${pname} --version + + runHook postCheck + ''; + + meta = with lib; { + description = "The Proxmox VM migrator: migrates VMs between different Proxmox VE clusters"; + homepage = "https://github.com/ossobv/proxmove"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ AngryAnt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 962af829b632..3ba0a9dba0ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18797,6 +18797,8 @@ with pkgs; procodile = callPackage ../tools/system/procodile { }; + proxmove = callPackage ../tools/admin/proxmove { }; + pry = callPackage ../development/tools/pry { }; pup = callPackage ../development/tools/pup { }; From d8809422595edb41b081347528cab0b8e7cf971e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 12:53:34 +0000 Subject: [PATCH 154/203] codec2: 1.0.5 -> 1.1.0 --- pkgs/development/libraries/codec2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 018ef10aebd5..6a532a78f2d4 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "codec2"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitHub { owner = "drowe67"; repo = "codec2"; rev = "v${version}"; - hash = "sha256-Q5p6NicwmHBR7drX8Tdgf6Mruqssg9qzMC9sG9DlMbQ="; + hash = "sha256-7E/Iqan3DVFl9pwsY6pwWM64ug1cjN6DH+u7XzraA78="; }; nativeBuildInputs = [ cmake ]; From 093fcd1629c4c0c9bfc0d6c7a538a679e9d481ef Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 5 May 2023 16:02:28 +0300 Subject: [PATCH 155/203] ocamlPackages.hacl-star-raw: use _mm_malloc on darwin --- .../ocaml-modules/hacl-star/aligned-alloc.patch | 14 ++++++++++++++ pkgs/development/ocaml-modules/hacl-star/raw.nix | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/ocaml-modules/hacl-star/aligned-alloc.patch diff --git a/pkgs/development/ocaml-modules/hacl-star/aligned-alloc.patch b/pkgs/development/ocaml-modules/hacl-star/aligned-alloc.patch new file mode 100644 index 000000000000..a5c0b6720699 --- /dev/null +++ b/pkgs/development/ocaml-modules/hacl-star/aligned-alloc.patch @@ -0,0 +1,14 @@ +diff --git a/hacl-star-raw/karamel/include/krml/internal/target.h b/hacl-star-raw/karamel/include/krml/internal/target.h +index 695873a..c0aed18 100644 +--- a/hacl-star-raw/karamel/include/krml/internal/target.h ++++ b/hacl-star-raw/karamel/include/krml/internal/target.h +@@ -82,6 +82,9 @@ + # endif + # if (defined(_MSC_VER) || (defined(__MINGW32__) && defined(__MINGW64_VERSION_MAJOR))) + # define KRML_ALIGNED_MALLOC(X, Y) _aligned_malloc(Y, X) ++# elif defined(__APPLE__) ++# include ++# define KRML_ALIGNED_MALLOC(X, Y) _mm_malloc(Y, X) + # else + # define KRML_ALIGNED_MALLOC(X, Y) aligned_alloc(X, Y) + # endif diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix index 027d6fe17854..de20299cd4a1 100644 --- a/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { stripRoot = false; }; + patches = [ + ./aligned-alloc.patch + ]; + minimalOCamlVersion = "4.08"; # strictoverflow is disabled because it breaks aarch64-darwin From b2963e311a5bafefed14b2d340a153da33c64ef4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 5 May 2023 16:02:39 +0300 Subject: [PATCH 156/203] ligo: fix build on darwin --- pkgs/development/compilers/ligo/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 7493d73787a5..1ebcbe786850 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -10,6 +10,7 @@ , mustache-go , yaml2json , tezos-rust-libs +, darwin }: ocamlPackages.buildDunePackage rec { @@ -110,6 +111,8 @@ ocamlPackages.buildDunePackage rec { pure-splitmix zarith_stubs_js simple-diff + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security ]; preBuild = '' From 549bee98517984cf403584d1c9f8c20256e72964 Mon Sep 17 00:00:00 2001 From: Emily Lange Date: Fri, 5 May 2023 15:14:41 +0200 Subject: [PATCH 157/203] nixos/grafana-agent: add `extraFlags` option (#228883) --- .../services/monitoring/grafana-agent.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana-agent.nix b/nixos/modules/services/monitoring/grafana-agent.nix index b7761c34fe51..a462e760f748 100644 --- a/nixos/modules/services/monitoring/grafana-agent.nix +++ b/nixos/modules/services/monitoring/grafana-agent.nix @@ -13,12 +13,7 @@ in options.services.grafana-agent = { enable = mkEnableOption (lib.mdDoc "grafana-agent"); - package = mkOption { - type = types.package; - default = pkgs.grafana-agent; - defaultText = lib.literalExpression "pkgs.grafana-agent"; - description = lib.mdDoc "The grafana-agent package to use."; - }; + package = mkPackageOptionMD pkgs "grafana-agent" { }; credentials = mkOption { description = lib.mdDoc '' @@ -37,11 +32,22 @@ in }; }; + extraFlags = mkOption { + type = with types; listOf str; + default = [ ]; + example = [ "-enable-features=integrations-next" "-disable-reporting" ]; + description = lib.mdDoc '' + Extra command-line flags passed to {command}`grafana-agent`. + + See + ''; + }; + settings = mkOption { description = lib.mdDoc '' - Configuration for `grafana-agent`. + Configuration for {command}`grafana-agent`. - See https://grafana.com/docs/agent/latest/configuration/ + See ''; type = types.submodule { @@ -140,7 +146,7 @@ in # We can't use Environment=HOSTNAME=%H, as it doesn't include the domain part. export HOSTNAME=$(< /proc/sys/kernel/hostname) - exec ${lib.getExe cfg.package} -config.expand-env -config.file ${configFile} + exec ${lib.getExe cfg.package} -config.expand-env -config.file ${configFile} ${escapeShellArgs cfg.extraFlags} ''; serviceConfig = { Restart = "always"; From 851bfe1816361333a3f7b17ffcee9d94aa3e3458 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 13:21:02 +0000 Subject: [PATCH 158/203] asnmap: 1.0.2 -> 1.0.3 --- pkgs/tools/security/asnmap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/tools/security/asnmap/default.nix index cafc5d4f8d02..e327aa6c0757 100644 --- a/pkgs/tools/security/asnmap/default.nix +++ b/pkgs/tools/security/asnmap/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "asnmap"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7yKOeKSsexqLZ+ep7+mft6GlHrZiwv6OOCeERZu7gAE="; + hash = "sha256-nkDa54+4bAMtQ/s/vn7x9hAt7p+ErKMOZ70MoH45CoM="; }; - vendorHash = "sha256-VmbmRkJB5jme8j/ONMkbsITJxg5inxYnb5AoKUR3Uzg="; + vendorHash = "sha256-owpu0oANYipso33HOwwSqL8G0VDT53B9HeLQA/GvmxU="; # Tests require network access doCheck = false; From 8f797fa93d996ed714c2877af0a663dd0a99d10b Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 5 May 2023 15:28:16 +0200 Subject: [PATCH 159/203] gitlab: 15.11.1 -> 15.11.2 (#230101) https://gitlab.com/gitlab-org/gitlab/-/blob/master/CHANGELOG.md#15112-2023-05-03 --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index c39e428f405f..4a25742d54cc 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.11.1", - "repo_hash": "sha256-xhwWn/+GSAKYy5YcjgIUPJUvhBquvCWu6eFg5ZiNM7s=", + "version": "15.11.2", + "repo_hash": "sha256-4wdbe/DkZdfmOuKHlmBEKQYYduIaB1SD5ZYICHqADeE=", "yarn_hash": "02ipm7agjy3c75df76c00k3qq5gpw3d876f6x91xnwizswsv9agb", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.11.1-ee", + "rev": "v15.11.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.11.1", - "GITLAB_PAGES_VERSION": "15.11.1", + "GITALY_SERVER_VERSION": "15.11.2", + "GITLAB_PAGES_VERSION": "15.11.2", "GITLAB_SHELL_VERSION": "14.18.0", - "GITLAB_WORKHORSE_VERSION": "15.11.1" + "GITLAB_WORKHORSE_VERSION": "15.11.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c8cb7a86bc29..ef4c7ba946b4 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.11.1"; + version = "15.11.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-D12R9liFsrH0XwGSLkmhCbWMbPXrp0kzus4t4Kuw4cg="; + sha256 = "sha256-yX93YHHajXqAQq93mM/bRCQciDfJ0GR3kLSO4MQsWPY="; }; vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 38d076aa29e2..5a3fb60b456e 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "15.11.1"; + version = "15.11.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-BPChY2t0ygH73XZYDWDb0EVPqrniMxzg3JWgcmsAesA="; + sha256 = "sha256-c5brpl9OEW4N8vmphdCRYl5TGkMN3FmXmINPpyEajUs="; }; vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 418930feb52e..5b2827d85441 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.11.1"; + version = "15.11.2"; src = fetchFromGitLab { owner = data.owner; From 746e22ac2fe75648b303470eddc4f32c987a0852 Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 5 May 2023 13:47:15 +0000 Subject: [PATCH 160/203] shotgun: 2.3.1 -> 2.4.0 https://github.com/neXromancers/shotgun/releases/tag/v2.4.0 --- pkgs/tools/graphics/shotgun/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index 37a20c6447b3..8805da7ebe71 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shotgun"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "neXromancers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hu8UYia2tu6I6Ii9aZ6vfpbrcDz4yeEDkljGFa5s6VY="; + sha256 = "sha256-fcb+eZXzpuEPFSZexbgDpoBX85gsiIqPlcPXruNGenk="; }; - cargoSha256 = "sha256-UOchXeBX+sDuLhwWQRVFCj9loJUyr4IltiAKsQoh5/c="; + cargoSha256 = "sha256-n5HPl2h0fr0MyGBivNVrrs23HAllIYtwaw1aaKWHCe4="; nativeBuildInputs = [ pkg-config ]; From c03f37e3b3f867846ca54326b3e9600f7e72631d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 5 May 2023 16:49:29 +0300 Subject: [PATCH 161/203] clipboard-jh: fix build on darwin --- pkgs/tools/misc/clipboard-jh/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/clipboard-jh/default.nix b/pkgs/tools/misc/clipboard-jh/default.nix index c9d26cfa69f9..5ac81b2dc6a3 100644 --- a/pkgs/tools/misc/clipboard-jh/default.nix +++ b/pkgs/tools/misc/clipboard-jh/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = [ + buildInputs = lib.optionals stdenv.isLinux [ libffi wayland-protocols wayland @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Slackadays/clipboard"; license = licenses.gpl3Only; maintainers = with maintainers; [ dit7ya ]; + platforms = platforms.all; mainProgram = "cb"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c666f7182614..14482a260b44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13942,7 +13942,7 @@ with pkgs; clipnotify = callPackage ../tools/misc/clipnotify { }; clipboard-jh = callPackage ../tools/misc/clipboard-jh { - stdenv = if stdenv.isDarwin then llvmPackages_15.stdenv else stdenv; + stdenv = if stdenv.isDarwin then llvmPackages_16.stdenv else stdenv; }; clipbuzz = callPackage ../tools/misc/clipbuzz { }; From f1086cffcf50c10cf19d25b617a2ea35fbe51bd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 13:56:02 +0000 Subject: [PATCH 162/203] google-java-format: 1.16.0 -> 1.17.0 --- pkgs/development/tools/google-java-format/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix index ff31689dcc53..77515f203a2f 100644 --- a/pkgs/development/tools/google-java-format/default.nix +++ b/pkgs/development/tools/google-java-format/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-goGaLF9wZ3EuAjNmG4ZMHANPZlfWO45xi0pQ45qwKPY="; + sha256 = "sha256-MwaLu9zhCZmC7BFx9eICiY6zXykZz0hhQeQ5/G46QgM="; }; dontUnpack = true; From 706a6fb4db5b59819e7c9f5ae760a9da6b62228c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 14:06:02 +0000 Subject: [PATCH 163/203] xemu: 0.7.87 -> 0.7.88 --- pkgs/applications/emulators/xemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/xemu/default.nix b/pkgs/applications/emulators/xemu/default.nix index 2b0b2e755ec1..4fa4fea99727 100644 --- a/pkgs/applications/emulators/xemu/default.nix +++ b/pkgs/applications/emulators/xemu/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.7.87"; + version = "0.7.88"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; rev = "v${finalAttrs.version}"; - hash = "sha256-NPvyXDrTKt7PIspLPrUBo7qs9hsHV+6u7dQlIqdlQtw="; + hash = "sha256-rV90ISPaipczaJgGj0vAO1IJYDMJpncVGOdllO3Km2k="; fetchSubmodules = true; }; From c65b4ec1cf552b03aa425e386e4c6b4b57579845 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 5 May 2023 08:48:26 -0400 Subject: [PATCH 164/203] python310Packages.debugpy: increase timeouts on tests --- pkgs/development/python-modules/debugpy/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix index 583b8a5d5fd5..58bdec7ebc61 100644 --- a/pkgs/development/python-modules/debugpy/default.nix +++ b/pkgs/development/python-modules/debugpy/default.nix @@ -90,7 +90,13 @@ buildPythonPackage rec { requests ]; - preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + preCheck = '' + # Scale default timeouts by a factor of 4 to avoid flaky builds + # https://github.com/microsoft/debugpy/pull/1286 if merged would + # allow us to disable the timeouts altogether + export DEBUGPY_PROCESS_SPAWN_TIMEOUT=60 + export DEBUGPY_PROCESS_EXIT_TIMEOUT=20 + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' # https://github.com/python/cpython/issues/74570#issuecomment-1093748531 export no_proxy='*'; ''; From 5d5bd4b26bc54ff28d3bbb65c2aa22d271d01150 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 14:48:44 +0000 Subject: [PATCH 165/203] asn: 0.73.2 -> 0.73.3 --- pkgs/applications/networking/asn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/asn/default.nix b/pkgs/applications/networking/asn/default.nix index a59f8358ade4..cf1341c43f5c 100644 --- a/pkgs/applications/networking/asn/default.nix +++ b/pkgs/applications/networking/asn/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "asn"; - version = "0.73.2"; + version = "0.73.3"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; rev = "v${version}"; - sha256 = "sha256-aswssP2l7NdjUEwXO2v0nEiZCk6kArnZA3Jch59W+yA="; + sha256 = "sha256-O0Iu+7UAAf+v0gZdGTdBpdn9BZ/9OqTAA/u0WDiz9s8="; }; nativeBuildInputs = [ makeWrapper ]; From e6229ea859e43ef629e36090046f0af3a9f17402 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 14:57:11 +0000 Subject: [PATCH 166/203] alttab: 1.7.0 -> 1.7.1 --- pkgs/tools/X11/alttab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix index ab4a8156f96f..7e675c250175 100644 --- a/pkgs/tools/X11/alttab/default.nix +++ b/pkgs/tools/X11/alttab/default.nix @@ -2,7 +2,7 @@ libpng, uthash , which, xnee, xorg, python3Packages }: stdenv.mkDerivation rec { - version = "1.7.0"; + version = "1.7.1"; pname = "alttab"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "sagb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AxHagyGbU3bWJ+sP2S7YjHBHsIbd/doONPgd2tsBtKY="; + sha256 = "sha256-1+hk0OeSriXPyefv3wOgeiW781PL4VP5Luvt+RS5jmg="; }; nativeBuildInputs = [ From 41db68b03324393cfee5150243c543b5c8de6832 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 10:44:58 +0200 Subject: [PATCH 167/203] python310Packages.starlette: 0.25.0 -> 0.26.1 Diff: https://github.com/encode/starlette/compare/refs/tags/0.25.0...0.26.1 Changelog: https://github.com/encode/starlette/releases/tag/0.26.1 --- pkgs/development/python-modules/starlette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 134b6d37e3c0..20a9a0d81f78 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.25.0"; + version = "0.26.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-s0ADo/+lcH8Y31hf1iSLbfTsV3fZtlCuZf7BS0uQc9Y="; + hash = "sha256-/zYqYmmCcOLU8Di9b4BzDLFtB5wYEEF1bYN6u2rb8Lg="; }; nativeBuildInputs = [ From ef4bfcc59871dda57eedb18d8251e340e0dfcf9e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 10:47:34 +0200 Subject: [PATCH 168/203] python310Packages.fastapi: 0.92.0 -> 0.95.1 --- pkgs/development/python-modules/fastapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index cee29c5eba63..48a4c483c9c3 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "fastapi"; - version = "0.92.0"; + version = "0.95.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4USWfYvPxR+LzPELRTDg0Jl4K5yBnumYKfXT84FWctg="; + hash = "sha256-y6mP2w2d2oabM9bLtWRO/AdRA46LNhVrMB/0qxGxH7I="; }; nativeBuildInputs = [ From 8c33c576389bb10f4e8084740b192befdc3336c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 16:36:02 +0200 Subject: [PATCH 169/203] chatgpt-retrieval-plugin: relax fastapi constraint --- pkgs/servers/chatgpt-retrieval-plugin/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/chatgpt-retrieval-plugin/default.nix b/pkgs/servers/chatgpt-retrieval-plugin/default.nix index 8d9d57a2b2cb..b7accc881e61 100644 --- a/pkgs/servers/chatgpt-retrieval-plugin/default.nix +++ b/pkgs/servers/chatgpt-retrieval-plugin/default.nix @@ -9,6 +9,7 @@ python3Packages.buildPythonApplication { pname = "chatgpt-retrieval-plugin"; version = "unstable-2023-03-28"; + format = "pyproject"; src = fetchFromGitHub { owner = "openai"; @@ -17,14 +18,13 @@ python3Packages.buildPythonApplication { hash = "sha256-fCNGzK5Uji6wGDTEwAf4FF/i+RC7ny3v4AsvQwIbehY="; }; - format = "pyproject"; - postPatch = '' substituteInPlace pyproject.toml \ + --replace 'fastapi = "^0.92.0"' 'fastapi = ">=0.92.0"' \ --replace 'python-dotenv = "^0.21.1"' 'python-dotenv = "*"' \ --replace 'python-multipart = "^0.0.6"' 'python-multipart = "^0.0.5"' \ - --replace 'tiktoken = "^0.2.0"' 'tiktoken = "^0.3.0"' \ --replace 'redis = "4.5.1"' 'redis = "^4.5.1"' \ + --replace 'tiktoken = "^0.2.0"' 'tiktoken = "^0.3.0"' \ --replace 'packages = [{include = "server"}]' 'packages = [{include = "server"}, {include = "models"}, {include = "datastore"}, {include = "services"}]' substituteInPlace server/main.py \ @@ -64,7 +64,7 @@ python3Packages.buildPythonApplication { meta = with lib; { homepage = "https://github.com/openai/chatgpt-retrieval-plugin"; - description = "The ChatGPT Retrieval Plugin lets you easily search and find personal or work documents by asking questions in everyday language. "; + description = "Tool to search and find personal or work documents by asking questions in everyday language"; license = licenses.mit; maintainers = with maintainers; [ happysalada ]; }; From 962fedcc43d4b87cbaebcee255d9a179348d764e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 15:32:20 +0000 Subject: [PATCH 170/203] doh-proxy-rust: 0.9.8 -> 0.9.9 --- pkgs/servers/dns/doh-proxy-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dns/doh-proxy-rust/default.nix b/pkgs/servers/dns/doh-proxy-rust/default.nix index 2e17dd81f6fe..d59b048a181e 100644 --- a/pkgs/servers/dns/doh-proxy-rust/default.nix +++ b/pkgs/servers/dns/doh-proxy-rust/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "doh-proxy-rust"; - version = "0.9.8"; + version = "0.9.9"; src = fetchCrate { inherit version; crateName = "doh-proxy"; - sha256 = "sha256-+Z2eneEK6nhcJEKRa1VIolCTZ8to2mMQ8Ik7WEH+1w0="; + sha256 = "sha256-KvEayC+aY8aC5fSVIV9urNwLJcIfDMaAU+XdlGSmYRI="; }; - cargoHash = "sha256-nlKzVQeLg3/nBIkD7QoBUWC93m9BiJrybf13Y/ns9gA="; + cargoHash = "sha256-eoC90ht9cbMLkPN3S4jxZipbFoZDTU7pIr6GRagGlJE="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; From de7a352fb2c4fd12e404ba4075f85d1e1c4bac9f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 5 May 2023 18:36:04 +0300 Subject: [PATCH 171/203] openvi: misc improvement --- pkgs/applications/editors/openvi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/openvi/default.nix b/pkgs/applications/editors/openvi/default.nix index 43c4d8927268..e104c4dd7591 100644 --- a/pkgs/applications/editors/openvi/default.nix +++ b/pkgs/applications/editors/openvi/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" - # command -p will yield command not found erorr + # command -p will yield command not found error "PAWK=awk" # silently fail the chown command "IUSGR=$(USER)" @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ aleksana ]; + mainProgram = "ovi"; }; } From 05cafbff96fe216df0a1741cb9c7cc6006f7ea69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 15:53:03 +0000 Subject: [PATCH 172/203] rust-analyzer-unwrapped: 2023-04-24 -> 2023-05-01 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index e2bd3b5743c6..9c20f3a0eb46 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-04-24"; - cargoSha256 = "sha256-VLN4VNq1ogh0gdeqiFagdFgMOpg28WACHn1hxMYoBjo="; + version = "2023-05-01"; + cargoSha256 = "sha256-ZjJ4EZYUyeO/IpiYcUaEsTx4aaNf36KoUHG3lt9gKbw="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-Z07/byuJdxLK6E8Yb9qNvUMhUCOWEgYAriojU/wZHu8="; + sha256 = "sha256-FPQKPvlHIU2DsDF6GMoRtrZhil0vHi6MFd8vpKEx/n8="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; From a03c48bbdc711ec9a7256f94212fe3d6920b0a9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 16:04:49 +0000 Subject: [PATCH 173/203] kubeshark: 40.0 -> 40.1 --- pkgs/applications/networking/cluster/kubeshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index 22a4bde4c34d..f3d3a9fdd1ee 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "40.0"; + version = "40.1"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = version; - sha256 = "sha256-Tmk9xbAqEsJ8nffRX6qw3RKKoBbSO2gmVT5Ff4Cn9DA="; + sha256 = "sha256-hRAV8Nnph52Q7fdvW68Ma4DUM0lQdL6e0v1reR/G9Fs="; }; vendorHash = "sha256-ckIjmrXkn1AVBQRwM6+wdRwwYHytxKm3rKEe+csORdU="; From b3ef8214895658542bc3d6a69bf95bb321a3cfa5 Mon Sep 17 00:00:00 2001 From: aktaboot Date: Sat, 22 Apr 2023 20:47:35 +0200 Subject: [PATCH 174/203] nixos/installer: fix util-linux dependencies in install scripts --- nixos/modules/installer/tools/tools.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 08278d3943f3..520d19a5d0f3 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -25,6 +25,7 @@ let path = makeBinPath [ pkgs.jq nixos-enter + pkgs.util-linuxMinimal ]; }; @@ -65,6 +66,9 @@ let name = "nixos-enter"; src = ./nixos-enter.sh; inherit (pkgs) runtimeShell; + path = makeBinPath [ + pkgs.util-linuxMinimal + ]; }; in From 9dd3a860fffc37dade358e50d5015bb95ece0661 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 16:23:40 +0000 Subject: [PATCH 175/203] git-machete: 3.17.1 -> 3.17.3 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index f1b40267d0b8..590948c81a89 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.17.1"; + version = "3.17.3"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-UpByKN2L0g42ProwHNRxPw6ggxyDVTUZfWRF+TpUVKc="; + hash = "sha256-XBgYLrbxHE5czcEzYhX4ORQFtyKHcDw3VmZVx2TtycI="; }; nativeBuildInputs = [ installShellFiles ]; From 726c18e6d6589378af77217965be505d8f968234 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Fri, 5 May 2023 18:35:04 +0200 Subject: [PATCH 176/203] drawio: 21.2.1 -> 21.2.8 --- pkgs/applications/graphics/drawio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 4a793e1adc8a..a46706a74721 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -14,19 +14,19 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "21.2.1"; + version = "21.2.8"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-sjJZwVQdFAMWdaGUyQbv1qfdJWE2tN90z7eFYyAW9ko="; + hash = "sha256-XXtAd29r161rcamZM8QnkJ9mhQeJvqTL4Escdu95me8="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-YlJ84psoEgeDnCX+O8TvwqhTthm5voJ6dfTvTiZlkuk="; + hash = "sha256-H77BfiH3Nqi1a2Uek8N8BgODzMBGgXrBvrcahrKisNo="; }; nativeBuildInputs = [ From 6177f779a476b4090e2e2d9760dc8691ac16561a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 5 May 2023 19:07:45 +0300 Subject: [PATCH 177/203] utm: 4.1.6 -> 4.2.5 --- pkgs/os-specific/darwin/utm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix index da0a722c88fa..d763414f97c0 100644 --- a/pkgs/os-specific/darwin/utm/default.nix +++ b/pkgs/os-specific/darwin/utm/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.1.6"; + version = "4.2.5"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-d0xEND95u/PFnKfogLwO2vLgv+tQubMea8XWSJRuZF4="; + hash = "sha256-T3TA+CwddNtUL80xASRCSczGA2LLTwPEA2+jnc9m6jY="; }; nativeBuildInputs = [ undmg makeWrapper ]; From 20276c15c9ae82a378be1014df93c652fef3f862 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 16:49:41 +0000 Subject: [PATCH 178/203] civo: 1.0.50 -> 1.0.53 --- pkgs/applications/networking/cluster/civo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix index 72108c3e44c3..e533c8bafe1a 100644 --- a/pkgs/applications/networking/cluster/civo/default.nix +++ b/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.50"; + version = "1.0.53"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-w1Ozj9zmeGzuokX0LgHab5TI0WcdtY29n7w4LfOWthI="; + sha256 = "sha256-UE83fnP2cJuRWwyAkZhaF9N64q2Cw4oR/TTnvPbDSxc="; }; - vendorHash = "sha256-7I4V4DVdHSvr/1ic/YT+Vttreg0tFasRNT/aFe4/0OY="; + vendorHash = "sha256-c6Bx/+zyhvV9B1nZ7dJdIsNRSoWeHc2eE81V7Mbkwds="; nativeBuildInputs = [ installShellFiles ]; From 02fe1e94d4c34841ae3d5ffa5a4ca7539946cf2d Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 5 May 2023 12:44:59 -0400 Subject: [PATCH 179/203] dua: 2.19.2 -> 2.20.1, add figsoda as a maintainer Diff: https://github.com/Byron/dua-cli/compare/v2.19.2...v2.20.1 Changelog: https://github.com/Byron/dua-cli/blob/v2.20.1/CHANGELOG.md --- pkgs/tools/misc/dua/default.nix | 25 ++++++++++++++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 40370f33ab7e..767a1f5eaecf 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -1,16 +1,19 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, Foundation }: +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.19.2"; - - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; + version = "2.20.1"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-A39lYXkHinvppZVm2V9HXmtcbR4jOiHRtABQeryqLG8="; + hash = "sha256-yBPzf0ZpL49CupdtxjEo9QiOC5vwTcqdfAC2Q6WcNhE="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -18,15 +21,19 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-7SrNPf1inu8zaIMErJ6zADDFkLMPvR6zCg44Vv1DarM="; + cargoHash = "sha256-jgPOC8xtxYyKhYzsJezefwgopVL+1MED+Wf5h6bCYBg="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + ]; doCheck = false; meta = with lib; { - description = "A tool to conveniently learn about the disk usage of directories, fast!"; + description = "A tool to conveniently learn about the disk usage of directories"; homepage = "https://github.com/Byron/dua-cli"; - changelog = "https://github.com/Byron/dua-cli/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/Byron/dua-cli/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ killercup ]; + maintainers = with maintainers; [ figsoda killercup ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7aa4d2e731b..64c74e807881 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4614,9 +4614,7 @@ with pkgs; dtrx = callPackage ../tools/compression/dtrx { }; - dua = callPackage ../tools/misc/dua { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + dua = callPackage ../tools/misc/dua { }; duf = callPackage ../tools/misc/duf { }; From c79c3562535ae9e51e08439293a7602e939f919b Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri, 5 May 2023 19:17:28 +0200 Subject: [PATCH 180/203] deploy-rs: unstable-2023-01-19 -> unstable-2023-05-05 https://github.com/serokell/deploy-rs/compare/8c9ea9605eed20528bf60fae35a2b613b901fd77...6b0b6a1c2527e8b1ef370a308b6ef8903004ac47 --- pkgs/tools/package-management/deploy-rs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/deploy-rs/default.nix b/pkgs/tools/package-management/deploy-rs/default.nix index cf965b1a6915..1a646204bda1 100644 --- a/pkgs/tools/package-management/deploy-rs/default.nix +++ b/pkgs/tools/package-management/deploy-rs/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage { pname = "deploy-rs"; - version = "unstable-2023-01-19"; + version = "unstable-2023-05-05"; src = fetchFromGitHub { owner = "serokell"; repo = "deploy-rs"; - rev = "8c9ea9605eed20528bf60fae35a2b613b901fd77"; - hash = "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68="; + rev = "6b0b6a1c2527e8b1ef370a308b6ef8903004ac47"; + hash = "sha256-UUxpb5PMkFfP2JGoPMEUvKbxv+wCkTWy4uZs1MyyCes="; }; - cargoHash = "sha256-UKiG2Muw3cT17TCl0pZQGfzVdN5tajSZ1ULyGRaZ9tQ="; + cargoHash = "sha256-6/VSfCNBstr+fQPdpMl5b2MwNxRjSJvTDuTGKySPGsk="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 258fffe9030ba5756315c56498f6ddc5e2534ddc Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 5 May 2023 13:16:23 -0400 Subject: [PATCH 181/203] felix-fm: 2.2.6 -> 2.2.7 Diff: https://github.com/kyoheiu/felix/compare/v2.2.6...v2.2.7 Changelog: https://github.com/kyoheiu/felix/blob/v2.2.7/CHANGELOG.md --- .../file-managers/felix-fm/Cargo.lock | 62 +++++++++++-------- .../file-managers/felix-fm/default.nix | 7 +-- 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/file-managers/felix-fm/Cargo.lock b/pkgs/applications/file-managers/felix-fm/Cargo.lock index ee1a105fae1e..b5faf06c64de 100644 --- a/pkgs/applications/file-managers/felix-fm/Cargo.lock +++ b/pkgs/applications/file-managers/felix-fm/Cargo.lock @@ -127,9 +127,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "num-integer", @@ -306,7 +306,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.105", ] [[package]] @@ -323,7 +323,7 @@ checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.105", ] [[package]] @@ -371,7 +371,7 @@ checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "felix" -version = "2.2.6" +version = "2.2.7" dependencies = [ "chrono", "content_inspector", @@ -409,9 +409,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "miniz_oxide", @@ -611,9 +611,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -796,18 +796,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -901,22 +901,22 @@ checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" [[package]] name = "serde" -version = "1.0.149" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055" +checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.149" +version = "1.0.162" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4" +checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -1029,6 +1029,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syntect" version = "5.0.0" @@ -1086,7 +1097,7 @@ checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.105", ] [[package]] @@ -1150,12 +1161,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -1186,7 +1196,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.105", "wasm-bindgen-shared", ] @@ -1208,7 +1218,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.105", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1333,9 +1343,9 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080" +checksum = "0445d0fbc924bb93539b4316c11afb121ea39296f99a3c4c9edad09e3658cdef" dependencies = [ "aes", "byteorder", diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index 6dbffd06be43..eabae1077017 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.2.6"; + version = "2.2.7"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t/BCRKqCCXZ76bFYyblNnKHB9y0oJ6ajqsbdIGq/YVM="; + sha256 = "sha256-ShC6V3NAD5Gv5nLG5e6inoOEEpZn4EuQkaRoGn94Z1g="; }; cargoLock = { @@ -39,8 +39,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ # extra test files not shipped with the repository "--skip=functions::tests::test_list_up_contents" - "--skip=magic_image::tests::test_inspect_image" - "--skip=magic_packed::tests::test_inspect_signature" + "--skip=state::tests::test_has_write_permission" ]; meta = with lib; { From ee3131ad4015cfef99499283d2989447f4901e06 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 5 May 2023 13:38:42 -0400 Subject: [PATCH 182/203] ruff: 0.0.264 -> 0.0.265 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.264...v0.0.265 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.265 --- pkgs/development/tools/ruff/Cargo.lock | 6 +++--- pkgs/development/tools/ruff/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 7613d1b37225..98183d8a3a4e 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -841,7 +841,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flake8-to-ruff" -version = "0.0.264" +version = "0.0.265" dependencies = [ "anyhow", "clap 4.2.4", @@ -2004,7 +2004,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.264" +version = "0.0.265" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -2093,7 +2093,7 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.264" +version = "0.0.265" dependencies = [ "annotate-snippets 0.9.1", "anyhow", diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 356304f25d52..1a41ce46c6f8 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.264"; + version = "0.0.265"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - hash = "sha256-MDNqoKsXKSM5l351bMs4Z5Voig+HwR2907xlHDFB6x4="; + hash = "sha256-b45kPvN2yILZBvP8eSNfWD6gpinwi9RsvmonRGYj0cI="; }; # We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace From 1d3b0d1aa2995c1b20abba80a5cdd8e86e9c6db7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 17:49:53 +0000 Subject: [PATCH 183/203] flow: 0.205.0 -> 0.205.1 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index b741d104596f..de8610b4f1d3 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.205.0"; + version = "0.205.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-+F0NmE9BN8eSmyLnXkgdYy3qdyBvKfRM+hVgYmLvzOg="; + sha256 = "sha256-fVs2qfA4Tjn1cqeXAXN5kl3q5Ua7sSu8Xca0EPiDLnI="; }; postPatch = '' From c9fd6aa96eeadd9cfb984fc87c513b0421ec68ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 5 May 2023 11:05:03 -0700 Subject: [PATCH 184/203] buildkite-agent: 3.45.0 -> 3.46.0 (#230152) --- .../continuous-integration/buildkite-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 0655246fc671..8854bd65a46e 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,16 +3,16 @@ nixosTests }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.45.0"; + version = "3.46.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-T1B9eo0LVN5FMI76TJQ4yxIXOfqT9wHNO5DHfVaWHBA="; + sha256 = "sha256-4SCQcirphI/vmWa/5OrVh9k8utMmX4pUOYhIE1t1NRU="; }; - vendorHash = "sha256-kxqwGJBm5cT0ay29TlAqq3cFWheLqMwX/MtHpaHohBc="; + vendorHash = "sha256-54v3P4uqU7A77yizjWAIzlvpjUaG8HHmH3j9p8d+LQc="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash From 552dea951cf31e0aa2a316341b0282a7c13252c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 18:15:43 +0000 Subject: [PATCH 185/203] osl: 1.12.11.0 -> 1.12.12.0 --- pkgs/development/compilers/osl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 6830944d81d8..32027deb607b 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "openshadinglanguage"; - version = "1.12.11.0"; + version = "1.12.12.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenShadingLanguage"; rev = "v${version}"; - hash = "sha256-kN0+dWOUPXK8+xtR7onuPNimdn8WcaKcSRkOnaoi7BQ="; + hash = "sha256-kxfDhqF8uTdLqt99rTOk8TWBdN5NF7zm98CT0DbLrW0="; }; cmakeFlags = [ From c8eea6e1348bdd34b6166569c3413b4097c3fe3b Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 5 May 2023 21:47:24 +0300 Subject: [PATCH 186/203] path-of-building: 2.29.0 -> 2.30.1 --- pkgs/games/path-of-building/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 37ead517bda4..a6a51664b088 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, runCommand, unzip, meson, ninja, pkg-config, qtbase, qttools, wrapQtAppsHook, luajit }: let - dataVersion = "2.29.0"; + dataVersion = "2.30.1"; frontendVersion = "unstable-2023-04-09"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${dataVersion}"; - hash = "sha256-uG+Qb50+oG5yd67w2WgnatKpq+/0UA8IfJeJXRKnQXU="; + hash = "sha256-2itcALgl8eDkZylb/hmePDMILM4RxW2u5LYLbg+NNJ4="; }; nativeBuildInputs = [ unzip ]; From 88ae8974f11bf84d6f681e8dbe1dacca93220e05 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 28 Apr 2023 19:17:09 +0300 Subject: [PATCH 187/203] libmongocrypt: init at 1.7.4 --- .../libraries/libmongocrypt/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/libraries/libmongocrypt/default.nix diff --git a/pkgs/development/libraries/libmongocrypt/default.nix b/pkgs/development/libraries/libmongocrypt/default.nix new file mode 100644 index 000000000000..bfa0a4236b47 --- /dev/null +++ b/pkgs/development/libraries/libmongocrypt/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config, mongoc, openssl }: +stdenv.mkDerivation rec { + pname = "libmongocrypt"; + version = "1.7.4"; + + src = fetchFromGitHub { + owner = "mongodb"; + repo = pname; + rev = version; + hash = "sha256-I4KG2BHAovin9EaF8lNzJzucARvi0Qptz5Y9gTt3WkE="; + }; + + patches = [ + # fix pkg-config files + # submitted upstream: https://github.com/mongodb/libmongocrypt/pull/634 + (fetchpatch { + url = "https://github.com/mongodb/libmongocrypt/commit/5514cf0a366c4d0dc1b0f2a62201f0f1161054da.diff"; + hash = "sha256-eMSn6MRnc3yKfU2u/Bg3juWiupDzY1DUGi1/HSRftIs="; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ mongoc openssl ]; + + cmakeFlags = [ + # all three of these are required to use system libbson + "-DUSE_SHARED_LIBBSON=ON" + "-DMONGOCRYPT_MONGOC_DIR=USE-SYSTEM" + "-DENABLE_ONLINE_TESTS=OFF" + + # this pulls in a library we don't have + "-DMONGOCRYPT_ENABLE_DECIMAL128=OFF" + + # this avoids a dependency on Python + "-DBUILD_VERSION=${version}" + ]; + + meta = with lib; { + description = "Required C library for client-side and queryable encryption in MongoDB"; + homepage = "https://github.com/mongodb/libmongocrypt"; + license = licenses.asl20; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2397c4ce5db..0d37445a0205 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9644,6 +9644,8 @@ with pkgs; libmongo-client = callPackage ../development/libraries/libmongo-client { }; + libmongocrypt = callPackage ../development/libraries/libmongocrypt { }; + libmesode = callPackage ../development/libraries/libmesode { }; libmsym = callPackage ../development/libraries/science/chemistry/libmsym { }; From af4cb2e3056dd106a5ea5d2b99931ba984a1d303 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 28 Apr 2023 15:40:54 +0000 Subject: [PATCH 188/203] n8n: 0.218.0 -> 0.225.2 --- pkgs/applications/networking/n8n/default.nix | 6 +- pkgs/applications/networking/n8n/node-env.nix | 7 +- .../networking/n8n/node-packages.nix | 3794 ++++++++++++----- 3 files changed, 2713 insertions(+), 1094 deletions(-) diff --git a/pkgs/applications/networking/n8n/default.nix b/pkgs/applications/networking/n8n/default.nix index 8cc96f1b6e5c..e77bd7963b85 100644 --- a/pkgs/applications/networking/n8n/default.nix +++ b/pkgs/applications/networking/n8n/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nodejs_16, stdenv, lib, nixosTests }: +{ pkgs, stdenv, lib, nixosTests }: let nodePackages = import ./node-composition.nix { @@ -13,6 +13,7 @@ nodePackages.n8n.override { buildInputs = [ pkgs.postgresql + pkgs.libmongocrypt ]; # Oracle's official package on npm is binary only (WHY?!) and doesn't provide binaries for aarch64. @@ -24,6 +25,9 @@ nodePackages.n8n.override { rm -rf node_modules/oracledb ''; + # makes libmongocrypt bindings not look for static libraries in completely wrong places + BUILD_TYPE = "dynamic"; + dontNpmInstall = true; passthru = { diff --git a/pkgs/applications/networking/n8n/node-env.nix b/pkgs/applications/networking/n8n/node-env.nix index 5dad9ec63d47..bc1e36628ac8 100644 --- a/pkgs/applications/networking/n8n/node-env.nix +++ b/pkgs/applications/networking/n8n/node-env.nix @@ -530,12 +530,15 @@ let then ln -s $out/lib/node_modules/.bin $out/bin - # Patch the shebang lines of all the executables + # Fixup all executables ls $out/bin/* | while read i do file="$(readlink -f "$i")" chmod u+rwx "$file" - patchShebangs "$file" + if isScript "$file" + then + sed -i 's/\r$//' "$file" # convert crlf to lf + fi done fi diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 096df023c6f6..3a5c35e870e6 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -31,6 +31,591 @@ let sha512 = "cTlrKttbrRHEw3W+0/I609A2Matj5JQaRvfLtEIGZvlN0RaPi+3ANsMeqAyCAVlH/lUIW2tmtBlSMni74lcXeg=="; }; }; + "@aws-crypto/ie11-detection-3.0.0" = { + name = "_at_aws-crypto_slash_ie11-detection"; + packageName = "@aws-crypto/ie11-detection"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz"; + sha512 = "341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q=="; + }; + }; + "@aws-crypto/sha256-browser-3.0.0" = { + name = "_at_aws-crypto_slash_sha256-browser"; + packageName = "@aws-crypto/sha256-browser"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz"; + sha512 = "8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ=="; + }; + }; + "@aws-crypto/sha256-js-3.0.0" = { + name = "_at_aws-crypto_slash_sha256-js"; + packageName = "@aws-crypto/sha256-js"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz"; + sha512 = "PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ=="; + }; + }; + "@aws-crypto/supports-web-crypto-3.0.0" = { + name = "_at_aws-crypto_slash_supports-web-crypto"; + packageName = "@aws-crypto/supports-web-crypto"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz"; + sha512 = "06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg=="; + }; + }; + "@aws-crypto/util-3.0.0" = { + name = "_at_aws-crypto_slash_util"; + packageName = "@aws-crypto/util"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz"; + sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w=="; + }; + }; + "@aws-sdk/abort-controller-3.310.0" = { + name = "_at_aws-sdk_slash_abort-controller"; + packageName = "@aws-sdk/abort-controller"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.310.0.tgz"; + sha512 = "v1zrRQxDLA1MdPim159Vx/CPHqsB4uybSxRi1CnfHO5ZjHryx3a5htW2gdGAykVCul40+yJXvfpufMrELVxH+g=="; + }; + }; + "@aws-sdk/client-cognito-identity-3.327.0" = { + name = "_at_aws-sdk_slash_client-cognito-identity"; + packageName = "@aws-sdk/client-cognito-identity"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.327.0.tgz"; + sha512 = "wykKOFlEKHGzr5YaHATjYhoZRZbg12nmZhte5BSS5D2ORt+2tAKL1ngCHE/iOtkZ2SLLOSlmMGWM5F6dHJl42A=="; + }; + }; + "@aws-sdk/client-sso-3.327.0" = { + name = "_at_aws-sdk_slash_client-sso"; + packageName = "@aws-sdk/client-sso"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.327.0.tgz"; + sha512 = "4cJzDs5GHSED47QYo3LSgqX+CBtKV0lp6HugkX5pvERB+FGCNLenUcSzyU93BCV2oWUP4K+m7dxV6h3RmD4/ow=="; + }; + }; + "@aws-sdk/client-sso-oidc-3.327.0" = { + name = "_at_aws-sdk_slash_client-sso-oidc"; + packageName = "@aws-sdk/client-sso-oidc"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.327.0.tgz"; + sha512 = "sN7uvHT2TYkLRTNnfrdeWoJoryeWOEuEwd4i52AKSq6QBgRnQm897yAe3y4Pe9vjz3F38butgfx+PKwD0xJQFw=="; + }; + }; + "@aws-sdk/client-sts-3.327.0" = { + name = "_at_aws-sdk_slash_client-sts"; + packageName = "@aws-sdk/client-sts"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.327.0.tgz"; + sha512 = "9gNE2QjcDZIVMSdSYkEX+biWkgn7yhk43j7Mj65o4vVWagv3S2ubDm/ofz4hfaZw16U3je/hyRxprGpT/iCABw=="; + }; + }; + "@aws-sdk/config-resolver-3.310.0" = { + name = "_at_aws-sdk_slash_config-resolver"; + packageName = "@aws-sdk/config-resolver"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.310.0.tgz"; + sha512 = "8vsT+/50lOqfDxka9m/rRt6oxv1WuGZoP8oPMk0Dt+TxXMbAzf4+rejBgiB96wshI1k3gLokYRjSQZn+dDtT8g=="; + }; + }; + "@aws-sdk/credential-provider-cognito-identity-3.327.0" = { + name = "_at_aws-sdk_slash_credential-provider-cognito-identity"; + packageName = "@aws-sdk/credential-provider-cognito-identity"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.327.0.tgz"; + sha512 = "ASw5mEPAeuNPBrwHcXMxsG7Ir3y6hBo+bnLX2VvShTLi4b4g3SVOn+P/cU+sriiNOBVpV4HN1ufFW46nHjg+Ww=="; + }; + }; + "@aws-sdk/credential-provider-env-3.310.0" = { + name = "_at_aws-sdk_slash_credential-provider-env"; + packageName = "@aws-sdk/credential-provider-env"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.310.0.tgz"; + sha512 = "vvIPQpI16fj95xwS7M3D48F7QhZJBnnCgB5lR+b7So+vsG9ibm1mZRVGzVpdxCvgyOhHFbvrby9aalNJmmIP1A=="; + }; + }; + "@aws-sdk/credential-provider-imds-3.310.0" = { + name = "_at_aws-sdk_slash_credential-provider-imds"; + packageName = "@aws-sdk/credential-provider-imds"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.310.0.tgz"; + sha512 = "baxK7Zp6dai5AGW01FIW27xS2KAaPUmKLIXv5SvFYsUgXXvNW55im4uG3b+2gA0F7V+hXvVBH08OEqmwW6we5w=="; + }; + }; + "@aws-sdk/credential-provider-ini-3.327.0" = { + name = "_at_aws-sdk_slash_credential-provider-ini"; + packageName = "@aws-sdk/credential-provider-ini"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.327.0.tgz"; + sha512 = "pB1wb5kbvg77ouXyDXXxZcDkShBq9bk10qdu5nGOlazC5dFZ61lKnVipd/3zkGm0PVdeac7PsHnbi+d8uRKE0Q=="; + }; + }; + "@aws-sdk/credential-provider-node-3.327.0" = { + name = "_at_aws-sdk_slash_credential-provider-node"; + packageName = "@aws-sdk/credential-provider-node"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.327.0.tgz"; + sha512 = "fHlS5/V8qfyPyxPcL609xnpEuDRW2KiVRsi4WkikYdJsUREDS1UeQ5AS9xFY1ARFeQuoFDjJ1XeiWYyKZep1yw=="; + }; + }; + "@aws-sdk/credential-provider-process-3.310.0" = { + name = "_at_aws-sdk_slash_credential-provider-process"; + packageName = "@aws-sdk/credential-provider-process"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.310.0.tgz"; + sha512 = "h73sg6GPMUWC+3zMCbA1nZ2O03nNJt7G96JdmnantiXBwHpRKWW8nBTLzx5uhXn6hTuTaoQRP/P+oxQJKYdMmA=="; + }; + }; + "@aws-sdk/credential-provider-sso-3.327.0" = { + name = "_at_aws-sdk_slash_credential-provider-sso"; + packageName = "@aws-sdk/credential-provider-sso"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.327.0.tgz"; + sha512 = "BiY87WKAgnBjN5Hfm2LBcJ/0gRnRwvBAG09MrsyTwGju8FYGV+e0YvFrT70CKFMUFD9t5/eztntox+q7sHOXkg=="; + }; + }; + "@aws-sdk/credential-provider-web-identity-3.310.0" = { + name = "_at_aws-sdk_slash_credential-provider-web-identity"; + packageName = "@aws-sdk/credential-provider-web-identity"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.310.0.tgz"; + sha512 = "H4SzuZXILNhK6/IR1uVvsUDZvzc051hem7GLyYghBCu8mU+tq28YhKE8MfSroi6eL2e5Vujloij1OM2EQQkPkw=="; + }; + }; + "@aws-sdk/credential-providers-3.327.0" = { + name = "_at_aws-sdk_slash_credential-providers"; + packageName = "@aws-sdk/credential-providers"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.327.0.tgz"; + sha512 = "7FvvWadOZcYR1Yw02/Uo0owEhrxnrQIZljgrDS/O7My+fMrwn9zxq+DWQJAOShNrC6coU6iH+PTrCy843vFOOw=="; + }; + }; + "@aws-sdk/fetch-http-handler-3.310.0" = { + name = "_at_aws-sdk_slash_fetch-http-handler"; + packageName = "@aws-sdk/fetch-http-handler"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.310.0.tgz"; + sha512 = "Bi9vIwzdkw1zMcvi/zGzlWS9KfIEnAq4NNhsnCxbQ4OoIRU9wvU+WGZdBBhxg0ZxZmpp1j1aZhU53lLjA07MHw=="; + }; + }; + "@aws-sdk/hash-node-3.310.0" = { + name = "_at_aws-sdk_slash_hash-node"; + packageName = "@aws-sdk/hash-node"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.310.0.tgz"; + sha512 = "NvE2fhRc8GRwCXBfDehxVAWCmVwVMILliAKVPAEr4yz2CkYs0tqU51S48x23dtna07H4qHtgpeNqVTthcIQOEQ=="; + }; + }; + "@aws-sdk/invalid-dependency-3.310.0" = { + name = "_at_aws-sdk_slash_invalid-dependency"; + packageName = "@aws-sdk/invalid-dependency"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.310.0.tgz"; + sha512 = "1s5RG5rSPXoa/aZ/Kqr5U/7lqpx+Ry81GprQ2bxWqJvWQIJ0IRUwo5pk8XFxbKVr/2a+4lZT/c3OGoBOM1yRRA=="; + }; + }; + "@aws-sdk/is-array-buffer-3.310.0" = { + name = "_at_aws-sdk_slash_is-array-buffer"; + packageName = "@aws-sdk/is-array-buffer"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.310.0.tgz"; + sha512 = "urnbcCR+h9NWUnmOtet/s4ghvzsidFmspfhYaHAmSRdy9yDjdjBJMFjjsn85A1ODUktztm+cVncXjQ38WCMjMQ=="; + }; + }; + "@aws-sdk/middleware-content-length-3.325.0" = { + name = "_at_aws-sdk_slash_middleware-content-length"; + packageName = "@aws-sdk/middleware-content-length"; + version = "3.325.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.325.0.tgz"; + sha512 = "t38VBKCpNqSKqSu0OfWMJs7cwaRHFGQxIF9lV8JMCM/2lyUpN4JcfuzSTK+MFN2eDZEHp5DiNg8w07GXXusRYg=="; + }; + }; + "@aws-sdk/middleware-endpoint-3.325.0" = { + name = "_at_aws-sdk_slash_middleware-endpoint"; + packageName = "@aws-sdk/middleware-endpoint"; + version = "3.325.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.325.0.tgz"; + sha512 = "3CavuOHCKiWUnCtzrUFbhbEP26qIgzzRs5C3vpOJhDUhugBubIWgPGGRLpbnIro+P4XJPwM3pMziNzhKVuSDlQ=="; + }; + }; + "@aws-sdk/middleware-host-header-3.325.0" = { + name = "_at_aws-sdk_slash_middleware-host-header"; + packageName = "@aws-sdk/middleware-host-header"; + version = "3.325.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.325.0.tgz"; + sha512 = "IN28gsxcRy4J+FxxCHvzb2NORBx8uMA+h9QYS4BBZfpKVYIZh+mudHgYcdNHWlKXmlTGjhWBNWTeByhzuSKAiA=="; + }; + }; + "@aws-sdk/middleware-logger-3.325.0" = { + name = "_at_aws-sdk_slash_middleware-logger"; + packageName = "@aws-sdk/middleware-logger"; + version = "3.325.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.325.0.tgz"; + sha512 = "S8rWgTpN2b/+UDDm+yZMFM6rw1zwO8KT0GAIQbAhB96shyD5eKen/UfihCTB7YMvbD2piebymwJTvxv6bn1VqQ=="; + }; + }; + "@aws-sdk/middleware-recursion-detection-3.325.0" = { + name = "_at_aws-sdk_slash_middleware-recursion-detection"; + packageName = "@aws-sdk/middleware-recursion-detection"; + version = "3.325.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.325.0.tgz"; + sha512 = "2l1ABF7KePsoKz8KaNvD2uxo1zHqkFHK4PL/wW/FbcwOcE08f0R7qX++st/bPpVjXX/j/5vWTnNNgJOIOrZhyw=="; + }; + }; + "@aws-sdk/middleware-retry-3.327.0" = { + name = "_at_aws-sdk_slash_middleware-retry"; + packageName = "@aws-sdk/middleware-retry"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.327.0.tgz"; + sha512 = "LCG+oRIPc4XJ+DYqkSCgggavxWi4+hP3Rw40vHdHMNvJpCiUJMwVJ+dULEywEP/WZvr4AEkWiRrHmJVpSLeZ+Q=="; + }; + }; + "@aws-sdk/middleware-sdk-sts-3.326.0" = { + name = "_at_aws-sdk_slash_middleware-sdk-sts"; + packageName = "@aws-sdk/middleware-sdk-sts"; + version = "3.326.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.326.0.tgz"; + sha512 = "suOkuXxyAfOH0hznK63ZU10EoytKX5YPs9amO416VbgYFtuIeliCmntYfnl1jUvutp0fctGGpEGE9OnoYI+fhw=="; + }; + }; + "@aws-sdk/middleware-serde-3.325.0" = { + name = "_at_aws-sdk_slash_middleware-serde"; + packageName = "@aws-sdk/middleware-serde"; + version = "3.325.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.325.0.tgz"; + sha512 = "QAZYaFfAw1a06Vg39JiYIq0kSJ6EuUPOiKfK/Goj0cBv78lrXWuKdf04UF3U8Rqk/4mamnsTqUSwf4NoKkF0hw=="; + }; + }; + "@aws-sdk/middleware-signing-3.325.0" = { + name = "_at_aws-sdk_slash_middleware-signing"; + packageName = "@aws-sdk/middleware-signing"; + version = "3.325.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.325.0.tgz"; + sha512 = "SOwPwaCE3vSCGwFzkIlnOUSkeCUzKTyIQnFVjlQkqGuMxMX/iDaQQGaX+HUbuGIuULCEQqjZH4dLKZcor8eVZw=="; + }; + }; + "@aws-sdk/middleware-stack-3.325.0" = { + name = "_at_aws-sdk_slash_middleware-stack"; + packageName = "@aws-sdk/middleware-stack"; + version = "3.325.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.325.0.tgz"; + sha512 = "cZWehA4grGvX1IKlY9atJgD0bq3ew7YRJgY7GA6DSgsU7GrZ61Qvi+H7IuGx5AdeAwaTnbnTGN4qCaA2EfxNhA=="; + }; + }; + "@aws-sdk/middleware-user-agent-3.327.0" = { + name = "_at_aws-sdk_slash_middleware-user-agent"; + packageName = "@aws-sdk/middleware-user-agent"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.327.0.tgz"; + sha512 = "4rDSNY1xhlqfRcY97CQKcgs6AOe4ovtiRdCAjg2InnLOZHRVFoHhOIDxWNK2W1K2Pl65z4EGH6RXmB1t0srJHA=="; + }; + }; + "@aws-sdk/node-config-provider-3.310.0" = { + name = "_at_aws-sdk_slash_node-config-provider"; + packageName = "@aws-sdk/node-config-provider"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.310.0.tgz"; + sha512 = "T/Pp6htc6hq/Cq+MLNDSyiwWCMVF6GqbBbXKVlO5L8rdHx4sq9xPdoPveZhGWrxvkanjA6eCwUp6E0riBOSVng=="; + }; + }; + "@aws-sdk/node-http-handler-3.321.1" = { + name = "_at_aws-sdk_slash_node-http-handler"; + packageName = "@aws-sdk/node-http-handler"; + version = "3.321.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.321.1.tgz"; + sha512 = "DdQBrtFFDNtzphJIN3s93Vf+qd9LHSzH6WTQRrWoXhTDMHDzSI2Cn+c5KWfk89Nggp/n3+OTwUPQeCiBT5EBuw=="; + }; + }; + "@aws-sdk/property-provider-3.310.0" = { + name = "_at_aws-sdk_slash_property-provider"; + packageName = "@aws-sdk/property-provider"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.310.0.tgz"; + sha512 = "3lxDb0akV6BBzmFe4nLPaoliQbAifyWJhuvuDOu7e8NzouvpQXs0275w9LePhhcgjKAEVXUIse05ZW2DLbxo/g=="; + }; + }; + "@aws-sdk/protocol-http-3.310.0" = { + name = "_at_aws-sdk_slash_protocol-http"; + packageName = "@aws-sdk/protocol-http"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.310.0.tgz"; + sha512 = "fgZ1aw/irQtnrsR58pS8ThKOWo57Py3xX6giRvwSgZDEcxHfVzuQjy9yPuV++v04fdmdtgpbGf8WfvAAJ11yXQ=="; + }; + }; + "@aws-sdk/querystring-builder-3.310.0" = { + name = "_at_aws-sdk_slash_querystring-builder"; + packageName = "@aws-sdk/querystring-builder"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.310.0.tgz"; + sha512 = "ZHH8GV/80+pWGo7DzsvwvXR5xVxUHXUvPJPFAkhr6nCf78igdoF8gR10ScFoEKbtEapoNTaZlKHPXxpD8aPG7A=="; + }; + }; + "@aws-sdk/querystring-parser-3.310.0" = { + name = "_at_aws-sdk_slash_querystring-parser"; + packageName = "@aws-sdk/querystring-parser"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.310.0.tgz"; + sha512 = "YkIznoP6lsiIUHinx++/lbb3tlMURGGqMpo0Pnn32zYzGrJXA6eC3D0as2EcMjo55onTfuLcIiX4qzXes2MYOA=="; + }; + }; + "@aws-sdk/service-error-classification-3.327.0" = { + name = "_at_aws-sdk_slash_service-error-classification"; + packageName = "@aws-sdk/service-error-classification"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.327.0.tgz"; + sha512 = "bCWnw+uH3gI6yPxLi4a4WV71P1KlJU7Z4+iMBY1Gt4+ZsaPAJX9pAbuQcFhFH++4xTk/QaVMzSvD0uQ+u0B/NQ=="; + }; + }; + "@aws-sdk/shared-ini-file-loader-3.310.0" = { + name = "_at_aws-sdk_slash_shared-ini-file-loader"; + packageName = "@aws-sdk/shared-ini-file-loader"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.310.0.tgz"; + sha512 = "N0q9pG0xSjQwc690YQND5bofm+4nfUviQ/Ppgan2kU6aU0WUq8KwgHJBto/YEEI+VlrME30jZJnxtOvcZJc2XA=="; + }; + }; + "@aws-sdk/signature-v4-3.310.0" = { + name = "_at_aws-sdk_slash_signature-v4"; + packageName = "@aws-sdk/signature-v4"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.310.0.tgz"; + sha512 = "1M60P1ZBNAjCFv9sYW29OF6okktaeibWyW3lMXqzoHF70lHBZh+838iUchznXUA5FLabfn4jBFWMRxlAXJUY2Q=="; + }; + }; + "@aws-sdk/smithy-client-3.325.0" = { + name = "_at_aws-sdk_slash_smithy-client"; + packageName = "@aws-sdk/smithy-client"; + version = "3.325.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.325.0.tgz"; + sha512 = "sqDFuhjxd8+Q9qI8MmXe/g1/FgoViwetv14K+bpHK7pGlOIvDyT7TboDNClfgqSLdgTDCEaoC3JRSi9Y5RgbmA=="; + }; + }; + "@aws-sdk/token-providers-3.327.0" = { + name = "_at_aws-sdk_slash_token-providers"; + packageName = "@aws-sdk/token-providers"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.327.0.tgz"; + sha512 = "7x1nXJiFlXz6umdkcvZJAR8GxyhxqmgLi4laBc1ZYcxHzOb02EFqloSmax6/SNJNKlL2QmGbEXuPIGV1wf45uQ=="; + }; + }; + "@aws-sdk/types-3.310.0" = { + name = "_at_aws-sdk_slash_types"; + packageName = "@aws-sdk/types"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.310.0.tgz"; + sha512 = "j8eamQJ7YcIhw7fneUfs8LYl3t01k4uHi4ZDmNRgtbmbmTTG3FZc2MotStZnp3nZB6vLiPF1o5aoJxWVvkzS6A=="; + }; + }; + "@aws-sdk/url-parser-3.310.0" = { + name = "_at_aws-sdk_slash_url-parser"; + packageName = "@aws-sdk/url-parser"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.310.0.tgz"; + sha512 = "mCLnCaSB9rQvAgx33u0DujLvr4d5yEm/W5r789GblwwQnlNXedVu50QRizMLTpltYWyAUoXjJgQnJHmJMaKXhw=="; + }; + }; + "@aws-sdk/util-base64-3.310.0" = { + name = "_at_aws-sdk_slash_util-base64"; + packageName = "@aws-sdk/util-base64"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.310.0.tgz"; + sha512 = "v3+HBKQvqgdzcbL+pFswlx5HQsd9L6ZTlyPVL2LS9nNXnCcR3XgGz9jRskikRUuUvUXtkSG1J88GAOnJ/apTPg=="; + }; + }; + "@aws-sdk/util-body-length-browser-3.310.0" = { + name = "_at_aws-sdk_slash_util-body-length-browser"; + packageName = "@aws-sdk/util-body-length-browser"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.310.0.tgz"; + sha512 = "sxsC3lPBGfpHtNTUoGXMQXLwjmR0zVpx0rSvzTPAuoVILVsp5AU/w5FphNPxD5OVIjNbZv9KsKTuvNTiZjDp9g=="; + }; + }; + "@aws-sdk/util-body-length-node-3.310.0" = { + name = "_at_aws-sdk_slash_util-body-length-node"; + packageName = "@aws-sdk/util-body-length-node"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.310.0.tgz"; + sha512 = "2tqGXdyKhyA6w4zz7UPoS8Ip+7sayOg9BwHNidiGm2ikbDxm1YrCfYXvCBdwaJxa4hJfRVz+aL9e+d3GqPI9pQ=="; + }; + }; + "@aws-sdk/util-buffer-from-3.310.0" = { + name = "_at_aws-sdk_slash_util-buffer-from"; + packageName = "@aws-sdk/util-buffer-from"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.310.0.tgz"; + sha512 = "i6LVeXFtGih5Zs8enLrt+ExXY92QV25jtEnTKHsmlFqFAuL3VBeod6boeMXkN2p9lbSVVQ1sAOOYZOHYbYkntw=="; + }; + }; + "@aws-sdk/util-config-provider-3.310.0" = { + name = "_at_aws-sdk_slash_util-config-provider"; + packageName = "@aws-sdk/util-config-provider"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.310.0.tgz"; + sha512 = "xIBaYo8dwiojCw8vnUcIL4Z5tyfb1v3yjqyJKJWV/dqKUFOOS0U591plmXbM+M/QkXyML3ypon1f8+BoaDExrg=="; + }; + }; + "@aws-sdk/util-defaults-mode-browser-3.325.0" = { + name = "_at_aws-sdk_slash_util-defaults-mode-browser"; + packageName = "@aws-sdk/util-defaults-mode-browser"; + version = "3.325.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.325.0.tgz"; + sha512 = "gcowpXTo8E8N3jxD2KW+csiicJ7HPkhWnpL925xgwe0oq091OpATsKFrBOL18h72VfRWf4FAsR9lVwxSQ78zSA=="; + }; + }; + "@aws-sdk/util-defaults-mode-node-3.325.0" = { + name = "_at_aws-sdk_slash_util-defaults-mode-node"; + packageName = "@aws-sdk/util-defaults-mode-node"; + version = "3.325.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.325.0.tgz"; + sha512 = "/5uoOrgNxoUxv3AwsdXjMA3f6KJA6fi69otA0RiINjilCdcbOxq5GI11AFEyRio/+e+imriX4+UYjsguUR+f4g=="; + }; + }; + "@aws-sdk/util-endpoints-3.327.0" = { + name = "_at_aws-sdk_slash_util-endpoints"; + packageName = "@aws-sdk/util-endpoints"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.327.0.tgz"; + sha512 = "2+2jTfBzhXsfpOci61gzaoBUVdGhFWja7k5cLAfOaRROkK+m+Zv532+m3cCQZjBXJ6pJ952MbiAroRSjFq0/SQ=="; + }; + }; + "@aws-sdk/util-hex-encoding-3.310.0" = { + name = "_at_aws-sdk_slash_util-hex-encoding"; + packageName = "@aws-sdk/util-hex-encoding"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.310.0.tgz"; + sha512 = "sVN7mcCCDSJ67pI1ZMtk84SKGqyix6/0A1Ab163YKn+lFBQRMKexleZzpYzNGxYzmQS6VanP/cfU7NiLQOaSfA=="; + }; + }; + "@aws-sdk/util-locate-window-3.310.0" = { + name = "_at_aws-sdk_slash_util-locate-window"; + packageName = "@aws-sdk/util-locate-window"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.310.0.tgz"; + sha512 = "qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w=="; + }; + }; + "@aws-sdk/util-middleware-3.310.0" = { + name = "_at_aws-sdk_slash_util-middleware"; + packageName = "@aws-sdk/util-middleware"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.310.0.tgz"; + sha512 = "FTSUKL/eRb9X6uEZClrTe27QFXUNNp7fxYrPndZwk1hlaOP5ix+MIHBcI7pIiiY/JPfOUmPyZOu+HetlFXjWog=="; + }; + }; + "@aws-sdk/util-retry-3.327.0" = { + name = "_at_aws-sdk_slash_util-retry"; + packageName = "@aws-sdk/util-retry"; + version = "3.327.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.327.0.tgz"; + sha512 = "y15NLGTAT2vaLzA8klJ6Bo8NGjVAa3/njqc4iCbta/3GqKpQU0zbvw3Y5aWyHp8BhV4DSUTp088jWjaoZlSqgw=="; + }; + }; + "@aws-sdk/util-uri-escape-3.310.0" = { + name = "_at_aws-sdk_slash_util-uri-escape"; + packageName = "@aws-sdk/util-uri-escape"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.310.0.tgz"; + sha512 = "drzt+aB2qo2LgtDoiy/3sVG8w63cgLkqFIa2NFlGpUgHFWTXkqtbgf4L5QdjRGKWhmZsnqkbtL7vkSWEcYDJ4Q=="; + }; + }; + "@aws-sdk/util-user-agent-browser-3.310.0" = { + name = "_at_aws-sdk_slash_util-user-agent-browser"; + packageName = "@aws-sdk/util-user-agent-browser"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.310.0.tgz"; + sha512 = "yU/4QnHHuQ5z3vsUqMQVfYLbZGYwpYblPiuZx4Zo9+x0PBkNjYMqctdDcrpoH9Z2xZiDN16AmQGK1tix117ZKw=="; + }; + }; + "@aws-sdk/util-user-agent-node-3.310.0" = { + name = "_at_aws-sdk_slash_util-user-agent-node"; + packageName = "@aws-sdk/util-user-agent-node"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.310.0.tgz"; + sha512 = "Ra3pEl+Gn2BpeE7KiDGpi4zj7WJXZA5GXnGo3mjbi9+Y3zrbuhJAbdZO3mO/o7xDgMC6ph4xCTbaSGzU6b6EDg=="; + }; + }; + "@aws-sdk/util-utf8-3.310.0" = { + name = "_at_aws-sdk_slash_util-utf8"; + packageName = "@aws-sdk/util-utf8"; + version = "3.310.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-utf8/-/util-utf8-3.310.0.tgz"; + sha512 = "DnLfFT8uCO22uOJc0pt0DsSNau1GTisngBCDw8jQuWT5CqogMJu4b/uXmwEqfj8B3GX6Xsz8zOd6JpRlPftQoA=="; + }; + }; + "@aws-sdk/util-utf8-browser-3.259.0" = { + name = "_at_aws-sdk_slash_util-utf8-browser"; + packageName = "@aws-sdk/util-utf8-browser"; + version = "3.259.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz"; + sha512 = "UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw=="; + }; + }; "@azure/abort-controller-1.1.0" = { name = "_at_azure_slash_abort-controller"; packageName = "@azure/abort-controller"; @@ -58,13 +643,13 @@ let sha512 = "ye5554gnVnXdfZ64hptUtETgacXoRWxYv1JF5MctoAzTSH5dXhDPZd9gOjDPyWMcLIk58pnP5+p5vGX6PYn1ag=="; }; }; - "@azure/core-http-3.0.0" = { + "@azure/core-http-3.0.1" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.0.tgz"; - sha512 = "BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.1.tgz"; + sha512 = "A3x+um3cAPgQe42Lu7Iv/x8/fNjhL/nIoEfqFxfn30EyxK6zC13n+OUxzZBRC0IzQqssqIbt4INf5YG7lYYFtw=="; }; }; "@azure/core-http-compat-1.3.0" = { @@ -76,13 +661,13 @@ let sha512 = "ZN9avruqbQ5TxopzG3ih3KRy52n8OAbitX3fnZT5go4hzu0J+KVPSzkL+Wt3hpJpdG8WIfg1sBD1tWkgUdEpBA=="; }; }; - "@azure/core-lro-2.5.1" = { + "@azure/core-lro-2.5.3" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.5.1"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.1.tgz"; - sha512 = "JHQy/bA3NOz2WuzOi5zEk6n/TJdAropupxUT521JIJvW7EXV2YN2SFYZrf/2RHeD28QAClGdynYadZsbmP+nyQ=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.3.tgz"; + sha512 = "ubkOf2YCnVtq7KqEJQqAI8dDD5rH1M6OP5kW0KO/JQyTaxLA0N0pjFWvvaysCj9eHMNBcuuoZXhhl0ypjod2DA=="; }; }; "@azure/core-paging-1.5.0" = { @@ -94,22 +679,13 @@ let sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; - "@azure/core-rest-pipeline-1.10.2" = { + "@azure/core-rest-pipeline-1.10.3" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.2.tgz"; - sha512 = "e3WzAsRKLor5EgK2bQqR1OY5D7VBqzORHtlqtygZZQGCYOIBsynqrZBa8MFD1Ue9r8TPtofOLditalnlQHS45Q=="; - }; - }; - "@azure/core-tracing-1.0.0-preview.12" = { - name = "_at_azure_slash_core-tracing"; - packageName = "@azure/core-tracing"; - version = "1.0.0-preview.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.12.tgz"; - sha512 = "nvo2Wc4EKZGN6eFu9n3U7OXmASmL8VxoPIH7xaD6OlQqi44bouF0YIi9ID5rEsKLiAU59IYx6M297nqWVMWPDg=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.3.tgz"; + sha512 = "AMQb0ttiGJ0MIV/r+4TVra6U4+90mPeOveehFnrqKlo7dknPJYdJ61wOzYJXJjDxF8LcCtSogfRelkq+fCGFTw=="; }; }; "@azure/core-tracing-1.0.0-preview.13" = { @@ -130,22 +706,13 @@ let sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; }; }; - "@azure/core-util-1.2.0" = { + "@azure/core-util-1.3.1" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.2.0.tgz"; - sha512 = "ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng=="; - }; - }; - "@azure/identity-1.5.2" = { - name = "_at_azure_slash_identity"; - packageName = "@azure/identity"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/identity/-/identity-1.5.2.tgz"; - sha512 = "vqyeRbd2i0h9F4mqW5JbkP1xfabqKQ21l/81osKhpOQ2LtwaJW6nw4+0PsVYnxcbPHFCIZt6EWAk74a3OGYZJA=="; + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.3.1.tgz"; + sha512 = "pjfOUAb+MPLODhGuXot/Hy8wUgPD0UTqYkY3BiYcwEETrLcUCVM1t0roIvlQMgvn1lc48TGy5bsonsFpF862Jw=="; }; }; "@azure/identity-2.1.0" = { @@ -157,13 +724,13 @@ let sha512 = "BPDz1sK7Ul9t0l9YKLEa8PHqWU4iCfhGJ+ELJl6c8CP3TpJt2urNCbm0ZHsthmxRsYoMPbz2Dvzj30zXZVmAFw=="; }; }; - "@azure/keyvault-keys-4.6.0" = { + "@azure/keyvault-keys-4.7.0" = { name = "_at_azure_slash_keyvault-keys"; packageName = "@azure/keyvault-keys"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.6.0.tgz"; - sha512 = "0112LegxeR03L8J4k+q6HwBVvrpd9y+oInG0FG3NaHXN7YUubVBon/eb5jFI6edGrvNigpxSR0XIsprFXdkzCQ=="; + url = "https://registry.npmjs.org/@azure/keyvault-keys/-/keyvault-keys-4.7.0.tgz"; + sha512 = "HScWdORbRCKi1vdKI6EChe/t/P/zV7jcGZWfj18BOyeensk5d1/Ynfx1t6xfAy5zUIQvAWVU97hXdCznDpULbQ=="; }; }; "@azure/logger-1.0.4" = { @@ -175,58 +742,22 @@ let sha512 = "ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg=="; }; }; - "@azure/ms-rest-azure-env-2.0.0" = { - name = "_at_azure_slash_ms-rest-azure-env"; - packageName = "@azure/ms-rest-azure-env"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz"; - sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="; - }; - }; - "@azure/ms-rest-js-2.6.4" = { - name = "_at_azure_slash_ms-rest-js"; - packageName = "@azure/ms-rest-js"; - version = "2.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.4.tgz"; - sha512 = "2sbOpGhlBfv9itWdF7Qlk0CmoQCARxe5unwjNOprU7OdgEgabQncZ35L5u1A+zgdkVtNYF9Eo6XAhXzTweIhag=="; - }; - }; - "@azure/ms-rest-nodeauth-3.1.1" = { - name = "_at_azure_slash_ms-rest-nodeauth"; - packageName = "@azure/ms-rest-nodeauth"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.1.1.tgz"; - sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; - }; - }; - "@azure/msal-browser-2.33.0" = { + "@azure/msal-browser-2.37.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.33.0"; + version = "2.37.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.33.0.tgz"; - sha512 = "c7CVh1tfUfxiWkEIhoIb11hL4PGo4hz0M+gMy34ATagAKdLK7qyEu/5AXJWAf5lz5eE+vQhm7+LKiuETrcXXGw=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.37.0.tgz"; + sha512 = "YNGD/W/tw/5wDWlXOfmrVILaxVsorVLxYU2ovmL1PDvxkdudbQRyGk/76l4emqgDAl/kPQeqyivxjOU6w1YfvQ=="; }; }; - "@azure/msal-common-10.0.0" = { + "@azure/msal-common-13.0.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "10.0.0"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-10.0.0.tgz"; - sha512 = "/LghpT93jsZLy55QzTsRZWMx6R1Mjc1Aktwps8sKSGE3WbrGwbSsh2uhDlpl6FMcKChYjJ0ochThWwwOodrQNg=="; - }; - }; - "@azure/msal-common-4.5.1" = { - name = "_at_azure_slash_msal-common"; - packageName = "@azure/msal-common"; - version = "4.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-4.5.1.tgz"; - sha512 = "/i5dXM+QAtO+6atYd5oHGBAx48EGSISkXNXViheliOQe+SIFMDo3gSq3lL54W0suOSAsVPws3XnTaIHlla0PIQ=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-13.0.0.tgz"; + sha512 = "GqCOg5H5bouvLij9NFXFkh+asRRxsPBRwnTDsfK7o0KcxYHJbuidKw8/VXpycahGXNxgtuhqtK/n5he+5NhyEA=="; }; }; "@azure/msal-common-7.6.0" = { @@ -238,85 +769,76 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-node-1.0.0-beta.6" = { + "@azure/msal-node-1.17.2" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.0.0-beta.6"; + version = "1.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.0.0-beta.6.tgz"; - sha512 = "ZQI11Uz1j0HJohb9JZLRD8z0moVcPks1AFW4Q/Gcl67+QvH4aKEJti7fjCcipEEZYb/qzLSO8U6IZgPYytsiJQ=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.17.2.tgz"; + sha512 = "l8edYnA2LQj4ue3pjxVz1Qy4HuU5xbcoebfe2bGTRvBL9Q6n2Df47aGftkLIyimD1HxHuA4ZZOe23a/HshoYXw=="; }; }; - "@azure/msal-node-1.15.0" = { - name = "_at_azure_slash_msal-node"; - packageName = "@azure/msal-node"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.15.0.tgz"; - sha512 = "fwC5M0c8pxOAzmScPbpx7j28YVTDebUaizlVF7bR0xvlU0r3VWW5OobCcr9ybqKS6wGyO7u4EhXJS9rjRWAuwA=="; - }; - }; - "@azure/storage-blob-12.13.0" = { + "@azure/storage-blob-12.14.0" = { name = "_at_azure_slash_storage-blob"; packageName = "@azure/storage-blob"; - version = "12.13.0"; + version = "12.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.13.0.tgz"; - sha512 = "t3Q2lvBMJucgTjQcP5+hvEJMAsJSk0qmAnjDLie2td017IiduZbbC9BOcFfmwzR6y6cJdZOuewLCNFmEx9IrXA=="; + url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.14.0.tgz"; + sha512 = "g8GNUDpMisGXzBeD+sKphhH5yLwesB4JkHr1U6be/X3F+cAMcyGLPD1P89g2M7wbEtUJWoikry1rlr83nNRBzg=="; }; }; - "@babel/parser-7.21.2" = { + "@babel/parser-7.21.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.21.2"; + version = "7.21.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz"; - sha512 = "URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz"; + sha512 = "6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA=="; }; }; - "@babel/runtime-7.21.0" = { + "@babel/runtime-7.21.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.21.0"; + version = "7.21.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz"; - sha512 = "xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.5.tgz"; + sha512 = "8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q=="; }; }; - "@codemirror/autocomplete-6.4.2" = { + "@codemirror/autocomplete-6.6.1" = { name = "_at_codemirror_slash_autocomplete"; packageName = "@codemirror/autocomplete"; - version = "6.4.2"; + version = "6.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.4.2.tgz"; - sha512 = "8WE2xp+D0MpWEv5lZ6zPW1/tf4AGb358T5GWYiKEuCP8MvFfT3tH2mIF9Y2yr2e3KbHuSvsVhosiEyqCpiJhZQ=="; + url = "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.6.1.tgz"; + sha512 = "RpsvnYOopnyNbZg487qoRD5bKg63KMMUVP5d8MQ4Luc7Mb6JBWTORovLi6cTvWaKlbmLW8Zd2dAJkIdrhBsXug=="; }; }; - "@codemirror/commands-6.2.1" = { + "@codemirror/commands-6.2.4" = { name = "_at_codemirror_slash_commands"; packageName = "@codemirror/commands"; - version = "6.2.1"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.1.tgz"; - sha512 = "FFiNKGuHA5O8uC6IJE5apI5rT9gyjlw4whqy4vlcX0wE/myxL6P1s0upwDhY4HtMWLOwzwsp0ap3bjdQhvfDOA=="; + url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.4.tgz"; + sha512 = "42lmDqVH0ttfilLShReLXsDfASKLXzfyC36bzwcqzox9PlHulMcsUOfHXNo2X2aFMVNUoQ7j+d4q5bnfseYoOA=="; }; }; - "@codemirror/lang-css-6.0.2" = { + "@codemirror/lang-css-6.2.0" = { name = "_at_codemirror_slash_lang-css"; packageName = "@codemirror/lang-css"; - version = "6.0.2"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.2.tgz"; - sha512 = "4V4zmUOl2Glx0GWw0HiO1oGD4zvMlIQ3zx5hXOE6ipCjhohig2bhWRAasrZylH9pRNTcl1VMa59Lsl8lZWlTzw=="; + url = "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.2.0.tgz"; + sha512 = "oyIdJM29AyRPM3+PPq1I2oIk8NpUfEN3kAM05XWDDs6o3gSneIKaVJifT2P+fqONLou2uIgXynFyMUDQvo/szA=="; }; }; - "@codemirror/lang-javascript-6.1.4" = { + "@codemirror/lang-javascript-6.1.7" = { name = "_at_codemirror_slash_lang-javascript"; packageName = "@codemirror/lang-javascript"; - version = "6.1.4"; + version = "6.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.4.tgz"; - sha512 = "OxLf7OfOZBTMRMi6BO/F72MNGmgOd9B0vetOLvHsDACFXayBzW8fm8aWnDM0yuy68wTK03MBf4HbjSBNRG5q7A=="; + url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.7.tgz"; + sha512 = "KXKqxlZ4W6t5I7i2ScmITUD3f/F5Cllk3kj0De9P9mFeYVfhOVOWuDLgYiLpk357u7Xh4dhqjJAnsNPPoTLghQ=="; }; }; "@codemirror/language-6.6.0" = { @@ -328,13 +850,13 @@ let sha512 = "cwUd6lzt3MfNYOobdjf14ZkLbJcnv4WtndYaoBkbor/vF+rCNguMPK0IRtvZJG4dsWiaWPcK8x1VijhvSxnstg=="; }; }; - "@codemirror/lint-6.2.0" = { + "@codemirror/lint-6.2.1" = { name = "_at_codemirror_slash_lint"; packageName = "@codemirror/lint"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.0.tgz"; - sha512 = "KVCECmR2fFeYBr1ZXDVue7x3q5PMI0PzcIbA+zKufnkniMBo1325t0h1jM85AKp8l3tj67LRxVpZfgDxEXlQkg=="; + url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.2.1.tgz"; + sha512 = "y1muai5U/uUPAGRyHMx9mHuHLypPcHWxzlZGknp/U5Mdb5Ol8Q5ZLp67UqyTbNFJJ3unVxZ8iX3g1fMN79S1JQ=="; }; }; "@codemirror/state-6.2.0" = { @@ -346,13 +868,13 @@ let sha512 = "69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA=="; }; }; - "@codemirror/view-6.9.1" = { + "@codemirror/view-6.11.0" = { name = "_at_codemirror_slash_view"; packageName = "@codemirror/view"; - version = "6.9.1"; + version = "6.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/view/-/view-6.9.1.tgz"; - sha512 = "bzfSjJn9dAADVpabLKWKNmMG4ibyTV2e3eOGowjElNPTdTkSbi6ixPYHm2u0ADcETfKsi2/R84Rkmi91dH9yEg=="; + url = "https://registry.npmjs.org/@codemirror/view/-/view-6.11.0.tgz"; + sha512 = "PRpPRkqMkAKKxEuiUBxapE0YR+wqs9At92ujbJo93PwTZ0jEJDzx9wahrDcXEhQ43Pe0RK9DdZMLWrt+QN80DA=="; }; }; "@colors/colors-1.5.0" = { @@ -427,13 +949,13 @@ let sha512 = "CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w=="; }; }; - "@fortawesome/fontawesome-common-types-6.3.0" = { + "@fortawesome/fontawesome-common-types-6.4.0" = { name = "_at_fortawesome_slash_fontawesome-common-types"; packageName = "@fortawesome/fontawesome-common-types"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz"; - sha512 = "4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz"; + sha512 = "HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ=="; }; }; "@fortawesome/fontawesome-svg-core-1.3.0" = { @@ -445,13 +967,13 @@ let sha512 = "UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg=="; }; }; - "@fortawesome/free-regular-svg-icons-6.3.0" = { + "@fortawesome/free-regular-svg-icons-6.4.0" = { name = "_at_fortawesome_slash_free-regular-svg-icons"; packageName = "@fortawesome/free-regular-svg-icons"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.3.0.tgz"; - sha512 = "cZnwiVHZ51SVzWHOaNCIA+u9wevZjCuAGSvSYpNlm6A4H4Vhwh8481Bf/5rwheIC3fFKlgXxLKaw8Xeroz8Ntg=="; + url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.4.0.tgz"; + sha512 = "ZfycI7D0KWPZtf7wtMFnQxs8qjBXArRzczABuMQqecA/nXohquJ5J/RCR77PmY5qGWkxAZDxpnUFVXKwtY/jPw=="; }; }; "@fortawesome/free-solid-svg-icons-5.15.4" = { @@ -490,6 +1012,15 @@ let sha512 = "XMbJYMh/ZSaZnbnrrOFfR/oQrb0SxG4qh6hDisWCoEbFcBHV0qHQo4uXfeMCzolx2Mfkh6VDaOGg+hyJsmxrlw=="; }; }; + "@google-cloud/paginator-3.0.7" = { + name = "_at_google-cloud_slash_paginator"; + packageName = "@google-cloud/paginator"; + version = "3.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-3.0.7.tgz"; + sha512 = "jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ=="; + }; + }; "@google-cloud/precise-date-2.0.4" = { name = "_at_google-cloud_slash_precise-date"; packageName = "@google-cloud/precise-date"; @@ -508,6 +1039,15 @@ let sha512 = "+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ=="; }; }; + "@google-cloud/projectify-3.0.0" = { + name = "_at_google-cloud_slash_projectify"; + packageName = "@google-cloud/projectify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-3.0.0.tgz"; + sha512 = "HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA=="; + }; + }; "@google-cloud/promisify-2.0.4" = { name = "_at_google-cloud_slash_promisify"; packageName = "@google-cloud/promisify"; @@ -517,6 +1057,15 @@ let sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; }; }; + "@google-cloud/promisify-3.0.1" = { + name = "_at_google-cloud_slash_promisify"; + packageName = "@google-cloud/promisify"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-3.0.1.tgz"; + sha512 = "z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA=="; + }; + }; "@google-cloud/spanner-5.18.0" = { name = "_at_google-cloud_slash_spanner"; packageName = "@google-cloud/spanner"; @@ -526,6 +1075,15 @@ let sha512 = "KcfepoEuGsjqjeI8cVWfJ9yPdYJFPnpMzdZg3FX2W4MzNOzeNrJEB/EfD/epOOZ/fNhRlUTl+tLFN3WjVxcWlw=="; }; }; + "@google-cloud/storage-6.10.0" = { + name = "_at_google-cloud_slash_storage"; + packageName = "@google-cloud/storage"; + version = "6.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@google-cloud/storage/-/storage-6.10.0.tgz"; + sha512 = "MaFNtMxPpnv6c43HcRsJTUiYhXgcjy+mshLyZpfGKMpE2vJ8C1mBFK/ZrlcPBt47ZK0tz9p/mNTyvi8dRsdKPw=="; + }; + }; "@grpc/grpc-js-1.6.12" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -544,13 +1102,22 @@ let sha512 = "FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g=="; }; }; - "@grpc/proto-loader-0.7.5" = { + "@grpc/proto-loader-0.7.7" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.7.5"; + version = "0.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.5.tgz"; - sha512 = "mfcTuMbFowq1wh/Rn5KQl6qb95M21Prej3bewD9dUQMurYGVckGO/Pbe2Ocwto6sD05b/mxZLspvqwx60xO2Rg=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.7.tgz"; + sha512 = "1TIeXOi8TuSCQprPItwoMymZXxWT0CPxUhkrkeCUH+D8U7QDwQ6b7SUz2MaLuWM2llT+J/TVFLmQI5KtML3BhQ=="; + }; + }; + "@httptoolkit/websocket-stream-6.0.1" = { + name = "_at_httptoolkit_slash_websocket-stream"; + packageName = "@httptoolkit/websocket-stream"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@httptoolkit/websocket-stream/-/websocket-stream-6.0.1.tgz"; + sha512 = "A0NOZI+Glp3Xgcz6Na7i7o09+/+xm2m0UCU8gdtM2nIv6/cjLmhMZMqehSpTlgbx9omtLmV8LVqOskPEyWnmZQ=="; }; }; "@icetee/ftp-0.3.15" = { @@ -571,22 +1138,31 @@ let sha512 = "Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg=="; }; }; - "@jridgewell/resolve-uri-3.1.0" = { - name = "_at_jridgewell_slash_resolve-uri"; - packageName = "@jridgewell/resolve-uri"; - version = "3.1.0"; + "@isaacs/cliui-8.0.2" = { + name = "_at_isaacs_slash_cliui"; + packageName = "@isaacs/cliui"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; - sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; + url = "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz"; + sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="; }; }; - "@jridgewell/sourcemap-codec-1.4.14" = { + "@jridgewell/resolve-uri-3.1.1" = { + name = "_at_jridgewell_slash_resolve-uri"; + packageName = "@jridgewell/resolve-uri"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz"; + sha512 = "dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="; + }; + }; + "@jridgewell/sourcemap-codec-1.4.15" = { name = "_at_jridgewell_slash_sourcemap-codec"; packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.14"; + version = "1.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; - sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"; + sha512 = "eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="; }; }; "@jridgewell/trace-mapping-0.3.9" = { @@ -598,22 +1174,13 @@ let sha512 = "3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="; }; }; - "@js-joda/core-3.2.0" = { + "@js-joda/core-5.5.3" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "3.2.0"; + version = "5.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-3.2.0.tgz"; - sha512 = "PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg=="; - }; - }; - "@js-joda/core-5.5.2" = { - name = "_at_js-joda_slash_core"; - packageName = "@js-joda/core"; - version = "5.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.5.2.tgz"; - sha512 = "retLUN4TwCJ0QJDi9OCJwYVaXAz93NeOkEtEQL98M2bykBOxmURlP0YlfsuE46kItOOVZIWRYC3KsSLhQ1R2Qw=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.5.3.tgz"; + sha512 = "7dqNYwG8gCt4hfg5PKgM7xLEcgSBcx/UgC92OMnhMmvAnq11QzDFPrxUkNR/u5kn17WWLZ8beZ4A3Qrz4pZcmQ=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -625,49 +1192,49 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsplumb/browser-ui-5.13.4" = { + "@jsplumb/browser-ui-5.13.7" = { name = "_at_jsplumb_slash_browser-ui"; packageName = "@jsplumb/browser-ui"; - version = "5.13.4"; + version = "5.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/browser-ui/-/browser-ui-5.13.4.tgz"; - sha512 = "N+Sp/jrrpYhWd7KTcMhsqoMjzmlNE/9RUYslKh7D9U9V9p0pTVfRftU7dSsoaP76Gi+juZmIGU/drSqG+z64OA=="; + url = "https://registry.npmjs.org/@jsplumb/browser-ui/-/browser-ui-5.13.7.tgz"; + sha512 = "rVw6DrDpUlBOOxggSWgWagf/PoXB+mQx+jCK0IXWEpmsaYfFp+4sx8qhH8jrLQf3LMEsXeQA2YI7Mi3Dz+4bRQ=="; }; }; - "@jsplumb/common-5.13.4" = { + "@jsplumb/common-5.13.7" = { name = "_at_jsplumb_slash_common"; packageName = "@jsplumb/common"; - version = "5.13.4"; + version = "5.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/common/-/common-5.13.4.tgz"; - sha512 = "pgWUAYmMbdpTyZV252N1sT+dyGFuRrl5yIprhQk1xlhTgh4korYVrzNH4594KujQB45gBuIKpSyauwh5FzlFAA=="; + url = "https://registry.npmjs.org/@jsplumb/common/-/common-5.13.7.tgz"; + sha512 = "NTQ/N3qRaY+axpOVrTtFPq6l36zsJx6TDlpUo3FGh0KhXd0BE7TRNkDUijNsXXj8aVFJ4djlqFuMYoroonYA+Q=="; }; }; - "@jsplumb/connector-bezier-5.13.4" = { + "@jsplumb/connector-bezier-5.13.7" = { name = "_at_jsplumb_slash_connector-bezier"; packageName = "@jsplumb/connector-bezier"; - version = "5.13.4"; + version = "5.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/connector-bezier/-/connector-bezier-5.13.4.tgz"; - sha512 = "ucnzBRwgWWwNQwgyUKZSg4QM5Pu19rYhpozHI5/FrZ8jxk1f3xEa4jv8teHvZO1MKs5ZGXfBobuy54wT5O+gtw=="; + url = "https://registry.npmjs.org/@jsplumb/connector-bezier/-/connector-bezier-5.13.7.tgz"; + sha512 = "UtmIAabkNJx13nM335CKb4OSy9dTJrNorBY+DJ6rN63pG/eHhWZKW3Mwdxv/mGX1OT7sNK+N71qi+/QtqidbGw=="; }; }; - "@jsplumb/core-5.13.4" = { + "@jsplumb/core-5.13.7" = { name = "_at_jsplumb_slash_core"; packageName = "@jsplumb/core"; - version = "5.13.4"; + version = "5.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/core/-/core-5.13.4.tgz"; - sha512 = "dlgvw1oYGmakV+HrfyRf1hJB9XwmfmgCakwuhLoSJz+IEaJ136QjEmmcoH/mf4x5GCnraUieI6LaYUskjDhtmQ=="; + url = "https://registry.npmjs.org/@jsplumb/core/-/core-5.13.7.tgz"; + sha512 = "24SfEuyjmOSdrN3m3gDesAFzlZARJIYiV8CEtoK6tBwaVwoqSSiUvY4zGHrppwx2yWDOEO5Vwv5iyw6OYlUjGw=="; }; }; - "@jsplumb/util-5.13.4" = { + "@jsplumb/util-5.13.7" = { name = "_at_jsplumb_slash_util"; packageName = "@jsplumb/util"; - version = "5.13.4"; + version = "5.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/util/-/util-5.13.4.tgz"; - sha512 = "dLwr9qb7kQy0KKaiFRfe+6lxN9StxpZAxT/QQwfBkYE2Iwify372pK92vM5HEc62Me12pS/s6F3qXj3sDKlUmQ=="; + url = "https://registry.npmjs.org/@jsplumb/util/-/util-5.13.7.tgz"; + sha512 = "DEoDaKDl0e8Y8P6rKGfpnRaaSUVDvZ52cvULLWiZIYQuo3K328vSAIoYVef3V6OSxmpfndOSfkO7oqfY0pWh0g=="; }; }; "@kafkajs/confluent-schema-registry-1.0.6" = { @@ -715,40 +1282,40 @@ let sha512 = "mSjx+unLLapEqdOYDejnGBokB5+AiJKZVclmud0MKQOKx3DLJ5b5VTCstgDDknR6iIV4gVrN6euzsCnj0A2gQA=="; }; }; - "@lezer/highlight-1.1.3" = { + "@lezer/highlight-1.1.4" = { name = "_at_lezer_slash_highlight"; packageName = "@lezer/highlight"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.3.tgz"; - sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw=="; + url = "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.4.tgz"; + sha512 = "IECkFmw2l7sFcYXrV8iT9GeY4W0fU4CxX0WMwhmhMIVjoDdD1Hr6q3G2NqVtLg/yVe5n7i4menG3tJ2r4eCrPQ=="; }; }; - "@lezer/html-1.3.3" = { + "@lezer/html-1.3.4" = { name = "_at_lezer_slash_html"; packageName = "@lezer/html"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.3.tgz"; - sha512 = "04Fyvu66DjV2EjhDIG1kfDdktn5Pfw56SXPrzKNQH5B2m7BDfc6bDsz+ZJG8dLS3kIPEKbyyq1Sm2/kjeG0+AA=="; + url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.4.tgz"; + sha512 = "HdJYMVZcT4YsMo7lW3ipL4NoyS2T67kMPuSVS5TgLGqmaCjEU/D6xv7zsa1ktvTK5lwk7zzF1e3eU6gBZIPm5g=="; }; }; - "@lezer/javascript-1.4.1" = { + "@lezer/javascript-1.4.3" = { name = "_at_lezer_slash_javascript"; packageName = "@lezer/javascript"; - version = "1.4.1"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.1.tgz"; - sha512 = "Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA=="; + url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.3.tgz"; + sha512 = "k7Eo9z9B1supZ5cCD4ilQv/RZVN30eUQL+gGbr6ybrEY3avBAL5MDiYi2aa23Aj0A79ry4rJRvPAwE2TM8bd+A=="; }; }; - "@lezer/lr-1.3.3" = { + "@lezer/lr-1.3.4" = { name = "_at_lezer_slash_lr"; packageName = "@lezer/lr"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.3.tgz"; - sha512 = "JPQe3mwJlzEVqy67iQiiGozhcngbO8QBgpqZM6oL1Wj/dXckrEexpBLeFkq0edtW5IqnPRFxA24BHJni8Js69w=="; + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.4.tgz"; + sha512 = "7o+e4og/QoC/6btozDPJqnzBhUaD1fMfmvnEKQO1wRRiTse1WxaJ3OMEXZJnkgT6HCcTVOctSoXK9jGJw2oe9g=="; }; }; "@mapbox/node-pre-gyp-1.0.10" = { @@ -760,22 +1327,22 @@ let sha512 = "4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA=="; }; }; - "@n8n_io/license-sdk-1.8.0" = { + "@n8n_io/license-sdk-2.1.0" = { name = "_at_n8n_io_slash_license-sdk"; packageName = "@n8n_io/license-sdk"; - version = "1.8.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@n8n_io/license-sdk/-/license-sdk-1.8.0.tgz"; - sha512 = "dSBD6EHTu6kWWz1ILxtCcaQqVZu+p/8J0eQ2ntx7Jk8BYSvn5Hh4Oz5M81ut9Pz+2uak+GnIuI6KeYUe1QBXIQ=="; + url = "https://registry.npmjs.org/@n8n_io/license-sdk/-/license-sdk-2.1.0.tgz"; + sha512 = "SwIm9b6a30/fAvl1aY0a6cgoSyQBgKHX44M4Ykesn45VSGBKlzO5uuIiIcEPdVjjLEelm7u6wLoDFdIVG37b7Q=="; }; }; - "@n8n_io/riot-tmpl-2.0.0" = { + "@n8n_io/riot-tmpl-3.0.0" = { name = "_at_n8n_io_slash_riot-tmpl"; packageName = "@n8n_io/riot-tmpl"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@n8n_io/riot-tmpl/-/riot-tmpl-2.0.0.tgz"; - sha512 = "gQNJYlek30YIWLru2CdyFgU/0uvPAbbQwt2G5EN0PDxXD1rGAYWZsd2c94bW3YlvXT6V2GEd7Bt/gT6QUwhzfQ=="; + url = "https://registry.npmjs.org/@n8n_io/riot-tmpl/-/riot-tmpl-3.0.0.tgz"; + sha512 = "bExAbGAp+LE4EXUcXl/kcZofKefrLIVZl8Kg36fim6KZATrWF8Nh7cdp/dOWzgZT6h8/ScqKxjv23W3KoeR40Q=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -823,13 +1390,13 @@ let sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; - "@oclif/command-1.8.22" = { + "@oclif/command-1.8.24" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.22"; + version = "1.8.24"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.22.tgz"; - sha512 = "lystv7IKsWRmCv6K68jSvHrO/DILUPBDb5GZ3absTA5XTnNXTaMrcwVzTcMPfTf+gCrgIaPPD1bmbRStwfQxFw=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.24.tgz"; + sha512 = "FbSChfBO2QFeC5eEeXmi8+kZvBCDzYdpEKhOMaz0sfKMerwSlKxsqWQPGWCjTHaowIUMtnMD3VZ8yfX5qE7SAQ=="; }; }; "@oclif/config-1.18.6" = { @@ -904,13 +1471,13 @@ let sha512 = "IMsTN1dXEXaOSre27j/ywGbBjrzx0FNd1XmuhCWCB9NTPrhWI1Ifbz+YLSEcstfQfocYsrbrIessxXb2oon4lA=="; }; }; - "@opentelemetry/api-1.4.0" = { + "@opentelemetry/api-1.4.1" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.0.tgz"; - sha512 = "IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz"; + sha512 = "O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -1012,13 +1579,13 @@ let sha512 = "HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg=="; }; }; - "@redis/client-1.5.6" = { + "@redis/client-1.5.7" = { name = "_at_redis_slash_client"; packageName = "@redis/client"; - version = "1.5.6"; + version = "1.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/client/-/client-1.5.6.tgz"; - sha512 = "dFD1S6je+A47Lj22jN/upVU2fj4huR7S9APd7/ziUXsIXDL+11GPYti4Suv5y8FuXaN+0ZG4JF+y1houEJ7ToA=="; + url = "https://registry.npmjs.org/@redis/client/-/client-1.5.7.tgz"; + sha512 = "gaOBOuJPjK5fGtxSseaKgSvjiZXQCdLlGg9WYQst+/GRUjmXaiB5kVkeQMRtPc7Q2t93XZcJfBMSwzs/XS9UZw=="; }; }; "@redis/graph-1.1.0" = { @@ -1066,13 +1633,13 @@ let sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; }; }; - "@sap/hana-client-2.15.22" = { + "@sap/hana-client-2.16.26" = { name = "_at_sap_slash_hana-client"; packageName = "@sap/hana-client"; - version = "2.15.22"; + version = "2.16.26"; src = fetchurl { - url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.15.22.tgz"; - sha512 = "mzqWiZ5Its8aCXGdv9EA4ROgwoLdqKoEgbKOnLjUtk2xuliGJ2L9Y54xcMSTtzDAUUEhZCKMDPTXloCqYAUpCQ=="; + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.16.26.tgz"; + sha512 = "9OTdCkhhJXS9HTaynJC9SUzrP46rYeje6kM8V5SMA5atJtOUn0DQt7i7CToVV6xWQrfBZj/U6UwMImxik6/O1w=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -1093,49 +1660,58 @@ let sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA=="; }; }; - "@sentry/core-7.40.0" = { + "@sentry-internal/tracing-7.51.0" = { + name = "_at_sentry-internal_slash_tracing"; + packageName = "@sentry-internal/tracing"; + version = "7.51.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.51.0.tgz"; + sha512 = "mhXl4B02OQq6/vevjX04OchmQbxPRaLci9vTTPcPcIz/n+wkum29ze35gHcJsPJUesScjd0m19Xou3C8fNnZRA=="; + }; + }; + "@sentry/core-7.51.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.40.0"; + version = "7.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.40.0.tgz"; - sha512 = "OPAobQG0GTY++r5LWUcOA1lS+2TY2Lmw/i5s4kL9WbY+f08dbLNEGNBObY7/V98OL4f7OG+nWaPFybgM7kqUTQ=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.51.0.tgz"; + sha512 = "GgYwlXU8Y1kDEHsJO1Bmr2CNan5BzoNRR0TDBmxRgI/DgTNNSYrXeFDELgPi9/p/0XENeuttzDZ3iYd1nF7meA=="; }; }; - "@sentry/integrations-7.40.0" = { + "@sentry/integrations-7.51.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.40.0"; + version = "7.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.40.0.tgz"; - sha512 = "8TLo7RKKpTXRDdeeBFNaA3YA4NG5hbAkl2o9wDHJW5NJouyr7IK6ia6qd2v94RXJAVB7nnjtQUdnkXGR59E4RA=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.51.0.tgz"; + sha512 = "xmWUKZyRDfl8tRsZWDRwxeXGwsvlJytQSYnJMPwohUq+VKs1KAarsuIxWQQMosNOvCYaio8VLfMxureqk2Wb/w=="; }; }; - "@sentry/node-7.40.0" = { + "@sentry/node-7.51.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.40.0"; + version = "7.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.40.0.tgz"; - sha512 = "S2pcLBUsCg3+WYlyQbXKPey3H1yaZPt9fpJTPAoabbidYXweBAbtFjSCRwPFwCQMzWusWxlYEwWRT77C07pHVg=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.51.0.tgz"; + sha512 = "UHJ0yN3I8hSrythr3/KPewh+xLIdjF6AU+BW3bgsP0ZtztrftrQk9+XnWRIX0p6ZstzoP4F3arkJIXkWfOk5Pg=="; }; }; - "@sentry/types-7.40.0" = { + "@sentry/types-7.51.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.40.0"; + version = "7.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.40.0.tgz"; - sha512 = "dIbqBenbmDx1F8pvfC11C88J83ecwumUhV+YOIxcmVd1fmlPF2hXWZ01+NTkTDkCu341sJx4wPQogByFy8FwGA=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.51.0.tgz"; + sha512 = "8REzzY0DslDryp6Yxj+tJ4NkXFHulLW9k8dgZV2Qo/0rBDMKir8g0IHYeN8ZBcnWrx2F+6rQb6uN6BjyLZY7Dg=="; }; }; - "@sentry/utils-7.40.0" = { + "@sentry/utils-7.51.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.40.0"; + version = "7.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.40.0.tgz"; - sha512 = "ZdCbTpAXPiVVfvNJVftnDhsctOui71MDUhVIdLkgg4Cuic+WHGPRmmZ+H6uZdp7vRaeB+Uvnn5+t2iSAVo/mAA=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.51.0.tgz"; + sha512 = "y5zq4IfZDCm6cg0EQJMghUM4YjZToFni7J5OKopLXKVtc9YtRtkYoFuFqEWm4HBuBwplreiS/KkDQgWn3FVn7A=="; }; }; "@servie/events-1.0.0" = { @@ -1156,22 +1732,31 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; - "@swc/core-1.3.37" = { + "@swc/core-1.3.56" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.37"; + version = "1.3.56"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.37.tgz"; - sha512 = "VOFlEQ1pReOM73N9A7R8rt561GU8Rxsq833jiimWDUB2sXEN3V6n6wFTgYmZuMz2T4/R0cQA1nV48KkaT4gkFw=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.56.tgz"; + sha512 = "yz/EeXT+PMZucUNrYceRUaTfuNS4IIu5EDZSOlvCEvm4jAmZi7CYH1B/kvzEzoAOzr7zkQiDPNJftcQXLkjbjA=="; }; }; - "@swc/wasm-1.3.37" = { + "@swc/helpers-0.5.1" = { + name = "_at_swc_slash_helpers"; + packageName = "@swc/helpers"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.1.tgz"; + sha512 = "sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg=="; + }; + }; + "@swc/wasm-1.3.56" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.37"; + version = "1.3.56"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.37.tgz"; - sha512 = "cRlyLuQrMKE6ppo07jVcYAEK69l+O+g+u5xZBon466vA416IK86jHYxGZqXRP+HEF6P/imntLbJgj9F/AGFEBA=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.56.tgz"; + sha512 = "2VhX4swDfvN8yd/DDvanOBEHTTYbjcypCGHTOoN9tdqPDkJOvrOO4+uVkGjhOjqqF63f3Fb6VF/r7CtkVd4gyw=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -1192,6 +1777,15 @@ let sha512 = "d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ=="; }; }; + "@tediousjs/connection-string-0.4.2" = { + name = "_at_tediousjs_slash_connection-string"; + packageName = "@tediousjs/connection-string"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.4.2.tgz"; + sha512 = "1R9UC7Qc5wief2oJL+c1+d7v1/oPBayL85u8L/jV2DzIKput1TZ8ZUjj2nxQaSfzu210zp0oFWUrYUiUs8NhBQ=="; + }; + }; "@tokenizer/token-0.3.0" = { name = "_at_tokenizer_slash_token"; packageName = "@tokenizer/token"; @@ -1318,22 +1912,13 @@ let sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; }; }; - "@types/express-serve-static-core-4.17.33" = { + "@types/express-serve-static-core-4.17.34" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.33"; + version = "4.17.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz"; - sha512 = "TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA=="; - }; - }; - "@types/js-nacl-1.3.1" = { - name = "_at_types_slash_js-nacl"; - packageName = "@types/js-nacl"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/js-nacl/-/js-nacl-1.3.1.tgz"; - sha512 = "flSA1xio62MepOtcglW7s+V7jFoJqGAAQXFRKZ3NkLbw36LEoQYQQ2jighvbr7DB1g6bCFB4YOx+x/CNQj1TsA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.34.tgz"; + sha512 = "fvr49XlCGoUj2Pp730AItckfjat4WNb0lb3kfrLWffd+RLeoGAMsq7UOy04PAPtoL01uKwcp6u8nhzpgpDYr3w=="; }; }; "@types/json-schema-7.0.11" = { @@ -1345,22 +1930,22 @@ let sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; }; }; - "@types/jsonwebtoken-9.0.1" = { + "@types/jsonwebtoken-9.0.2" = { name = "_at_types_slash_jsonwebtoken"; packageName = "@types/jsonwebtoken"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz"; - sha512 = "c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw=="; + url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz"; + sha512 = "drE6uz7QBKq1fYqqoFKTDRdFCPHd5TCub75BM+D+cMx7NU9hUz7SESLfC2fSCXVFMO5Yj8sOWHuGqPgjc+fz0Q=="; }; }; - "@types/lodash-4.14.191" = { + "@types/lodash-4.14.194" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.191"; + version = "4.14.194"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"; - sha512 = "BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.194.tgz"; + sha512 = "r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g=="; }; }; "@types/long-4.0.2" = { @@ -1372,13 +1957,13 @@ let sha512 = "MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="; }; }; - "@types/mime-3.0.1" = { + "@types/mime-1.3.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "3.0.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz"; - sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; + sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; "@types/multer-1.4.7" = { @@ -1390,22 +1975,22 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.14.6" = { + "@types/node-20.0.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.14.6"; + version = "20.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz"; - sha512 = "93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.0.0.tgz"; + sha512 = "cD2uPTDnQQCVpmRefonO98/PPijuOnnEy5oytWJFPY1N9aJCz2wJ5kSGWO+zJoed2cY2JxQh6yBuUq4vIn61hw=="; }; }; - "@types/node-fetch-2.6.2" = { + "@types/node-fetch-2.6.3" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.2.tgz"; - sha512 = "DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.3.tgz"; + sha512 = "ETTL1mOEdq/sxUtgtOhKjyB2Irra4cjxksvcMUR5Zr4n+PxVhsCD9WS46oPbHL3et9Zde7CNRr+WUNlcHvsX+w=="; }; }; "@types/pumpify-1.4.1" = { @@ -1435,6 +2020,15 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; + "@types/send-0.17.1" = { + name = "_at_types_slash_send"; + packageName = "@types/send"; + version = "0.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/send/-/send-0.17.1.tgz"; + sha512 = "Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q=="; + }; + }; "@types/serve-static-1.15.1" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; @@ -1453,15 +2047,6 @@ let sha512 = "TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g=="; }; }; - "@types/stoppable-1.1.1" = { - name = "_at_types_slash_stoppable"; - packageName = "@types/stoppable"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/stoppable/-/stoppable-1.1.1.tgz"; - sha512 = "b8N+fCADRIYYrGZOcmOR8ZNBOqhktWTB/bMUl5LvGtT201QKJZOOH5UsFyI3qtteM6ZAJbJqZoBcLqqxKIwjhw=="; - }; - }; "@types/tough-cookie-2.3.8" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; @@ -1498,13 +2083,13 @@ let sha512 = "rFT3ak0/2trgvp4yYZo5iKFEPsET7vKydKF+VRCxlQ9bpheehyAJH89dAkaLEq/j/RZXJIqcgsmPJKUP1Z28HA=="; }; }; - "@types/validator-13.7.13" = { + "@types/validator-13.7.15" = { name = "_at_types_slash_validator"; packageName = "@types/validator"; - version = "13.7.13"; + version = "13.7.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.13.tgz"; - sha512 = "EMfHccxNKXaSxTK6DN0En9WsXa7uR4w3LQtx31f6Z2JjG5hJQeVX5zUYMZoatjZgnoQmRcT94WnNWwi0BzQW6Q=="; + url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.15.tgz"; + sha512 = "yeinDVQunb03AEP8luErFcyf/7Lf7AzKCD0NXfgVoGCCQDNpZET8Jgq74oBgqKld3hafLbfzt/3inUdQvaFeXQ=="; }; }; "@types/webidl-conversions-7.0.0" = { @@ -1525,6 +2110,15 @@ let sha512 = "FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="; }; }; + "@types/ws-8.5.4" = { + name = "_at_types_slash_ws"; + packageName = "@types/ws"; + version = "8.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.4.tgz"; + sha512 = "zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg=="; + }; + }; "@vue/compiler-sfc-2.7.14" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; @@ -1552,13 +2146,13 @@ let sha512 = "o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="; }; }; - "@xmldom/xmldom-0.8.6" = { + "@xmldom/xmldom-0.8.7" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; - version = "0.8.6"; + version = "0.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.6.tgz"; - sha512 = "uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg=="; + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.7.tgz"; + sha512 = "sI1Ly2cODlWStkINzqGrZ8K6n+MTSbAeQnAipGyL+KZCXuHaRlj2gyyy8B/9MvsFFqN7XHryQnB2QwhzvJXovg=="; }; }; "a-sync-waterfall-1.0.1" = { @@ -1615,15 +2209,6 @@ let sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; }; }; - "adal-node-0.2.4" = { - name = "adal-node"; - packageName = "adal-node"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/adal-node/-/adal-node-0.2.4.tgz"; - sha512 = "zIcvbwQFKMUtKxxj8YMHeTT1o/TPXfVNsTXVgXD8sxwV6h4AFQgK77dRciGhuEF9/Sdm3UQPJVPc/6XxrccSeA=="; - }; - }; "adler-32-1.2.0" = { name = "adler-32"; packageName = "adler-32"; @@ -1687,6 +2272,15 @@ let sha512 = "UHmuSa7n8vVW/a5HGh2nFPqAEr8+cD4dEZ6u9GjP91nHfr1a54RyAKyra7Sb5NH7NBKOUlyQSMXIp0qAixKexw=="; }; }; + "ansi-0.3.1" = { + name = "ansi"; + packageName = "ansi"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"; + sha512 = "iFY7JCgHbepc0b82yLaw4IMortylNb6wG4kL+4R0C3iv6i+RHGHux/yUX5BTiRvSX/shMnngjR1YyNMnXEFh5A=="; + }; + }; "ansi-escapes-3.2.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; @@ -1705,6 +2299,15 @@ let sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; + }; + }; "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -1714,6 +2317,15 @@ let sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; + "ansi-regex-6.0.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz"; + sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; + }; + }; "ansi-styles-4.3.0" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -1723,6 +2335,15 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; + "ansi-styles-6.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz"; + sha512 = "bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="; + }; + }; "ansicolors-0.3.2" = { name = "ansicolors"; packageName = "ansicolors"; @@ -1777,6 +2398,15 @@ let sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; }; }; + "are-we-there-yet-1.0.6" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.6.tgz"; + sha512 = "Zfw6bteqM9gQXZ1BIWOgM8xEwMrUGoyL8nW13+O+OOgNX3YhuDN1GDgg1NzdTlmm3j+9sHy7uBZ12r+z9lXnZQ=="; + }; + }; "are-we-there-yet-2.0.0" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; @@ -1822,6 +2452,15 @@ let sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; }; + "array-buffer-byte-length-1.0.0" = { + name = "array-buffer-byte-length"; + packageName = "array-buffer-byte-length"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"; + sha512 = "LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A=="; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -1975,6 +2614,15 @@ let sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; }; }; + "async-retry-1.3.3" = { + name = "async-retry"; + packageName = "async-retry"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz"; + sha512 = "wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw=="; + }; + }; "async-validator-1.8.5" = { name = "async-validator"; packageName = "async-validator"; @@ -2029,13 +2677,22 @@ let sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; }; }; - "aws-sdk-2.1328.0" = { + "aws-crt-1.15.16" = { + name = "aws-crt"; + packageName = "aws-crt"; + version = "1.15.16"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.15.16.tgz"; + sha512 = "p/ImGq8duQ4sOqRzB5dJ81T2jto2LcfxEgSHuSHH9+pzOyHdkoMLAgMtVfX9bt9m4i0EP/20jLM2ydID8G7Umw=="; + }; + }; + "aws-sdk-2.1372.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1328.0"; + version = "2.1372.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1328.0.tgz"; - sha512 = "ud8ieE+hGX/cWHkQ9kMxQw6w+onbv71PDrcPmP2j8cmYv5IPlM5Zh8/tpsmXApLYDmQMuZ3TtssiB1KmoSbzgA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1372.0.tgz"; + sha512 = "SkpBohTXS7yJL6I/k+Dk5o2k8xgyVKs1n9zo08DvCaheSmvpMKQHqdj/wCbf1cjLRFr/Ckc1YGDj3SsikPsBgw=="; }; }; "aws-sign2-0.7.0" = { @@ -2065,6 +2722,15 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; + "axios-0.24.0" = { + name = "axios"; + packageName = "axios"; + version = "0.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; + sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; + }; + }; "axios-0.27.2" = { name = "axios"; packageName = "axios"; @@ -2074,15 +2740,6 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-1.1.3" = { - name = "axios"; - packageName = "axios"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.1.3.tgz"; - sha512 = "00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA=="; - }; - }; "axios-retry-3.4.0" = { name = "axios-retry"; packageName = "axios-retry"; @@ -2155,13 +2812,22 @@ let sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; }; }; - "better-sqlite3-8.1.0" = { + "better-eval-1.3.0" = { + name = "better-eval"; + packageName = "better-eval"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/better-eval/-/better-eval-1.3.0.tgz"; + sha512 = "rQdKZHTWok2uC3wHyGwoV6mOxhnOyp07iHhyWQlS+U5zkYyhOEOT6Ri4Q0vPThTqCYs6RCbtAfTbPG+lUZkocw=="; + }; + }; + "better-sqlite3-8.3.0" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "8.1.0"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.1.0.tgz"; - sha512 = "p1m09H+Oi8R9TPj810pdNswMFuVgRNgCJEWypp6jlkOgSwMIrNyuj3hW78xEuBRGok5RzeaUW8aBtTWF3l/TQA=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.3.0.tgz"; + sha512 = "JTmvBZL/JLTc+3Msbvq6gK6elbU9/wVMqiudplHrVJpr7sVMR9KJrNhZAbW+RhXKlpMcuEhYkdcHa3TXKNXQ1w=="; }; }; "big-integer-1.6.51" = { @@ -2200,6 +2866,15 @@ let sha512 = "pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="; }; }; + "binary-0.3.0" = { + name = "binary"; + packageName = "binary"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz"; + sha512 = "D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg=="; + }; + }; "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; @@ -2236,15 +2911,6 @@ let sha512 = "VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw=="; }; }; - "bl-2.2.1" = { - name = "bl"; - packageName = "bl"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-2.2.1.tgz"; - sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; - }; - }; "bl-4.1.0" = { name = "bl"; packageName = "bl"; @@ -2272,6 +2938,24 @@ let sha512 = "UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ=="; }; }; + "bluebird-3.4.7" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz"; + sha512 = "iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA=="; + }; + }; + "bluebird-3.7.2" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"; + sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; + }; + }; "bn.js-4.12.0" = { name = "bn.js"; packageName = "bn.js"; @@ -2299,13 +2983,13 @@ let sha512 = "ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA=="; }; }; - "body-parser-xml-2.0.3" = { + "body-parser-xml-2.0.5" = { name = "body-parser-xml"; packageName = "body-parser-xml"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser-xml/-/body-parser-xml-2.0.3.tgz"; - sha512 = "tWvcAbh8QPd/lj+yfGZBMY/roof/e2iSXrJbYXYjxVhHQ88D2CF3AxDTdwhb9wcNdHVNbCttaWipchJPEs5r0g=="; + url = "https://registry.npmjs.org/body-parser-xml/-/body-parser-xml-2.0.5.tgz"; + sha512 = "m1Kvr+0OVo1+t5hEgTrEQMIxFomck4682EJgFx4UpKcKVk9gViifgaFvSNwnQE+S10pPy8Q+dz9iWHYCol51Hw=="; }; }; "boolbase-1.0.0" = { @@ -2317,6 +3001,15 @@ let sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="; }; }; + "bowser-2.11.0" = { + name = "bowser"; + packageName = "bowser"; + version = "2.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bowser/-/bowser-2.11.0.tgz"; + sha512 = "AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="; + }; + }; "brace-expansion-1.1.11" = { name = "brace-expansion"; packageName = "brace-expansion"; @@ -2353,15 +3046,6 @@ let sha512 = "YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg=="; }; }; - "bson-1.1.6" = { - name = "bson"; - packageName = "bson"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz"; - sha512 = "EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg=="; - }; - }; "bson-4.7.2" = { name = "bson"; packageName = "bson"; @@ -2371,6 +3055,15 @@ let sha512 = "Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ=="; }; }; + "bson-5.2.0" = { + name = "bson"; + packageName = "bson"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bson/-/bson-5.2.0.tgz"; + sha512 = "HevkSpDbpUfsrHWmWiAsNavANKYIErV2ePXllp1bwq5CDreAaFVj6RVlZpJnxK4WWDCJ/5jMUpaY6G526q3Hjg=="; + }; + }; "buffer-4.9.2" = { name = "buffer"; packageName = "buffer"; @@ -2416,6 +3109,15 @@ let sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; }; + "buffer-indexof-polyfill-1.0.2" = { + name = "buffer-indexof-polyfill"; + packageName = "buffer-indexof-polyfill"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz"; + sha512 = "I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A=="; + }; + }; "buffer-more-ints-1.0.0" = { name = "buffer-more-ints"; packageName = "buffer-more-ints"; @@ -2425,6 +3127,15 @@ let sha512 = "EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg=="; }; }; + "buffer-shims-1.0.0" = { + name = "buffer-shims"; + packageName = "buffer-shims"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; + sha512 = "Zy8ZXMyxIT6RMTeY7OP/bDndfj6bwCan7SS98CEndS6deHwWPpseeHlwarNcBim+etXnF9HBc1non5JgDaJU1g=="; + }; + }; "buffer-writer-2.0.0" = { name = "buffer-writer"; packageName = "buffer-writer"; @@ -2434,6 +3145,15 @@ let sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; }; }; + "buffers-0.1.1" = { + name = "buffers"; + packageName = "buffers"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz"; + sha512 = "9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ=="; + }; + }; "bufferutil-4.0.7" = { name = "bufferutil"; packageName = "bufferutil"; @@ -2551,6 +3271,15 @@ let sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; }; }; + "camelcase-2.1.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + sha512 = "DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw=="; + }; + }; "camelcase-6.3.0" = { name = "camelcase"; packageName = "camelcase"; @@ -2560,6 +3289,15 @@ let sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; + "canvas-confetti-1.6.0" = { + name = "canvas-confetti"; + packageName = "canvas-confetti"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/canvas-confetti/-/canvas-confetti-1.6.0.tgz"; + sha512 = "ej+w/m8Jzpv9Z7W7uJZer14Ke8P2ogsjg4ZMGIuq4iqUOqY2Jq8BNW42iGmNfRwREaaEfFIczLuZZiEVSYNHAA=="; + }; + }; "capital-case-1.0.4" = { name = "capital-case"; packageName = "capital-case"; @@ -2596,6 +3334,15 @@ let sha512 = "KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA=="; }; }; + "chainsaw-0.1.0" = { + name = "chainsaw"; + packageName = "chainsaw"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz"; + sha512 = "75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ=="; + }; + }; "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; @@ -2794,6 +3541,15 @@ let sha512 = "k8AvUYJon0vv75ufoVo4nALYb/qwFFicO3I0+39C6xEdflqVtr+f9cy+0ZxAduoVSTfhP5DX2tY2XICAd5hy6Q=="; }; }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha512 = "0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w=="; + }; + }; "cliui-7.0.4" = { name = "cliui"; packageName = "cliui"; @@ -2821,6 +3577,24 @@ let sha512 = "RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA=="; }; }; + "cmake-js-6.3.2" = { + name = "cmake-js"; + packageName = "cmake-js"; + version = "6.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cmake-js/-/cmake-js-6.3.2.tgz"; + sha512 = "7MfiQ/ijzeE2kO+WFB9bv4QP5Dn2yVaAP2acFJr4NIFy2hT4w6O4EpOTLNcohR5IPX7M4wNf/5taIqMj7UA9ug=="; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha512 = "RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="; + }; + }; "codemirror-lang-html-n8n-1.0.0" = { name = "codemirror-lang-html-n8n"; packageName = "codemirror-lang-html-n8n"; @@ -3145,6 +3919,15 @@ let sha512 = "3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="; }; }; + "copy-to-clipboard-3.3.3" = { + name = "copy-to-clipboard"; + packageName = "copy-to-clipboard"; + version = "3.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz"; + sha512 = "2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA=="; + }; + }; "core-js-2.6.12" = { name = "core-js"; packageName = "core-js"; @@ -3154,13 +3937,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.29.0" = { + "core-js-3.30.1" = { name = "core-js"; packageName = "core-js"; - version = "3.29.0"; + version = "3.30.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.29.0.tgz"; - sha512 = "VG23vuEisJNkGl6XQmFJd3rEG/so/CNatqeE+7uZAwTSwFeB/qaO0be8xZYUNWprJ/GIwL8aMt9cj1kvbpTZhg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.30.1.tgz"; + sha512 = "ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ=="; }; }; "core-util-is-1.0.2" = { @@ -3226,13 +4009,13 @@ let sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; }; }; - "cron-parser-4.8.0" = { + "cron-parser-4.8.1" = { name = "cron-parser"; packageName = "cron-parser"; - version = "4.8.0"; + version = "4.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.8.0.tgz"; - sha512 = "VjwVZx26j7lukZmG3gtAvPYkD6wuMuIdYhEzrmpHtSGO9dvKkv+EhReFY7HQPsGuGUfy+by3IOriuzyrzxl9MQ=="; + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.8.1.tgz"; + sha512 = "jbokKWGcyU4gl6jAfX97E1gDpY12DJ1cLJZmoDzaAln/shZ+S3KBFBuA2Q6WeUN4gJf/8klnV1EfvhA2lK5IRQ=="; }; }; "cross-spawn-4.0.2" = { @@ -3253,6 +4036,15 @@ let sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; + "cross-spawn-7.0.3" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; + }; + }; "crypt-0.0.2" = { name = "crypt"; packageName = "crypt"; @@ -3316,13 +4108,13 @@ let sha512 = "FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="; }; }; - "csstype-3.1.1" = { + "csstype-3.1.2" = { name = "csstype"; packageName = "csstype"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz"; - sha512 = "DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="; + url = "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz"; + sha512 = "I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="; }; }; "curlconverter-3.21.0" = { @@ -3370,24 +4162,6 @@ let sha512 = "WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="; }; }; - "date-fns-2.29.3" = { - name = "date-fns"; - packageName = "date-fns"; - version = "2.29.3"; - src = fetchurl { - url = "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz"; - sha512 = "dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA=="; - }; - }; - "date-utils-1.2.21" = { - name = "date-utils"; - packageName = "date-utils"; - version = "1.2.21"; - src = fetchurl { - url = "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz"; - sha512 = "wJMBjqlwXR0Iv0wUo/lFbhSQ7MmG1hl36iuxuE91kW+5b5sWbase73manEqNH9sOLFAMG83B4ffNKq9/Iq0FVA=="; - }; - }; "dateformat-3.0.3" = { name = "dateformat"; packageName = "dateformat"; @@ -3460,6 +4234,15 @@ let sha512 = "syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw=="; }; }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; + }; + }; "decode-uri-component-0.2.2" = { name = "decode-uri-component"; packageName = "decode-uri-component"; @@ -3478,13 +4261,13 @@ let sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; }; }; - "deep-equal-2.2.0" = { + "deep-equal-2.2.1" = { name = "deep-equal"; packageName = "deep-equal"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz"; - sha512 = "RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.1.tgz"; + sha512 = "lKdkdV6EOGoVn65XaOsPdH4rMxTZOnmFyuIkMjM1i5HHCbfjC97dawgTAy0deYNfuqUqW+Q5VrVaQYtUpSd6yQ=="; }; }; "deep-extend-0.6.0" = { @@ -3514,13 +4297,13 @@ let sha512 = "95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="; }; }; - "deepmerge-4.3.0" = { + "deepmerge-4.3.1" = { name = "deepmerge"; packageName = "deepmerge"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz"; - sha512 = "z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og=="; + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz"; + sha512 = "3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="; }; }; "default-user-agent-1.0.0" = { @@ -3550,13 +4333,13 @@ let sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; }; }; - "degenerator-3.0.2" = { + "degenerator-3.0.4" = { name = "degenerator"; packageName = "degenerator"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/degenerator/-/degenerator-3.0.2.tgz"; - sha512 = "c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ=="; + url = "https://registry.npmjs.org/degenerator/-/degenerator-3.0.4.tgz"; + sha512 = "Z66uPeBfHZAHVmue3HPfyKu2Q0rC2cRxbTOsvmU/po5fvvcx27W4mIu9n0PUlQih4oUYvcG1BsbtVv8x7KDOSw=="; }; }; "delayed-stream-1.0.0" = { @@ -3640,13 +4423,13 @@ let sha512 = "9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w=="; }; }; - "digest-header-1.0.0" = { + "digest-header-1.1.0" = { name = "digest-header"; packageName = "digest-header"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/digest-header/-/digest-header-1.0.0.tgz"; - sha512 = "sRTuakZ2PkOUCuAaVv+SLjhr/hRf8ldZP0XnGEQ69RFGxmll5fVaMsnRXWKKK4XsUTnJf8+eRPSFNgE/lWa9wQ=="; + url = "https://registry.npmjs.org/digest-header/-/digest-header-1.1.0.tgz"; + sha512 = "glXVh42vz40yZb9Cq2oMOt70FIoWiv+vxNvdKdU8CwjLad25qHM3trLxhl9bVjdr6WaslIXhWpn0NO8T/67Qjg=="; }; }; "dir-glob-3.0.1" = { @@ -3721,13 +4504,13 @@ let sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; }; }; - "domutils-3.0.1" = { + "domutils-3.1.0" = { name = "domutils"; packageName = "domutils"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz"; - sha512 = "z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q=="; + url = "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz"; + sha512 = "H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA=="; }; }; "dot-case-3.0.4" = { @@ -3766,6 +4549,15 @@ let sha512 = "KRJa47iBEK0y6ZtgCgy2ykuvMT8c9gj3ua9Dv7vCkclFJJeH2FjhGY2xO5qBoWGahsjCGMlk4Cq9wJYeWxuYhQ=="; }; }; + "duplexer2-0.1.4" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; + sha512 = "asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA=="; + }; + }; "duplexify-3.7.1" = { name = "duplexify"; packageName = "duplexify"; @@ -3784,6 +4576,15 @@ let sha512 = "fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw=="; }; }; + "eastasianwidth-0.2.0" = { + name = "eastasianwidth"; + packageName = "eastasianwidth"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz"; + sha512 = "I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="; + }; + }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -3811,13 +4612,13 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "ejs-3.1.8" = { + "ejs-3.1.9" = { name = "ejs"; packageName = "ejs"; - version = "3.1.8"; + version = "3.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz"; - sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; + url = "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz"; + sha512 = "rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ=="; }; }; "element-ui-2.15.13" = { @@ -3838,6 +4639,15 @@ let sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; }; }; + "emoji-regex-9.2.2" = { + name = "emoji-regex"; + packageName = "emoji-regex"; + version = "9.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"; + sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="; + }; + }; "enabled-2.0.0" = { name = "enabled"; packageName = "enabled"; @@ -3901,13 +4711,13 @@ let sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; }; }; - "entities-4.4.0" = { + "entities-4.5.0" = { name = "entities"; packageName = "entities"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz"; - sha512 = "oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA=="; + url = "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz"; + sha512 = "V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="; }; }; "env-paths-2.2.1" = { @@ -3928,13 +4738,13 @@ let sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; }; }; - "es-abstract-1.21.1" = { + "es-abstract-1.21.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.21.1"; + version = "1.21.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.1.tgz"; - sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz"; + sha512 = "y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg=="; }; }; "es-aggregate-error-1.0.9" = { @@ -4198,6 +5008,15 @@ let sha512 = "h6aK1da4tpqWSbyCa3FxB/V6Ehd4EEB15zyQq9qe75OZBp0krinNKuH4rAY+S/U/2I36vdLAUFSjQJ+TFmODng=="; }; }; + "express-handlebars-7.0.7" = { + name = "express-handlebars"; + packageName = "express-handlebars"; + version = "7.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-7.0.7.tgz"; + sha512 = "O4jUlkEVvqwyhkcmjWOqAEcV3JbcaGnlyS0oSgI3vyXO59Fco5JJtUboU2VHqv3Em3Q0VFC2VhRsmaUeNCOr5Q=="; + }; + }; "express-openapi-validator-4.13.8" = { name = "express-openapi-validator"; packageName = "express-openapi-validator"; @@ -4297,6 +5116,24 @@ let sha512 = "VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w=="; }; }; + "fast-xml-parser-4.1.2" = { + name = "fast-xml-parser"; + packageName = "fast-xml-parser"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.1.2.tgz"; + sha512 = "CDYeykkle1LiA/uqQyNwYpFbyF6Axec6YapmpUP+/RHWIoR1zKjocdvNaTsxCxZzQ6v9MLXaSYm9Qq0thv0DHg=="; + }; + }; + "fast-xml-parser-4.2.2" = { + name = "fast-xml-parser"; + packageName = "fast-xml-parser"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.2.2.tgz"; + sha512 = "DLzIPtQqmvmdq3VUKR7T6omPK/VCRNqgFlGtbESfyhcH2R4I8EzK1/K6E8PkRCK2EabWrUHK32NjYRbEFnnz0Q=="; + }; + }; "fastq-1.15.0" = { name = "fastq"; packageName = "fastq"; @@ -4450,6 +5287,15 @@ let sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; }; }; + "foreground-child-3.1.1" = { + name = "foreground-child"; + packageName = "foreground-child"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz"; + sha512 = "TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg=="; + }; + }; "forever-agent-0.6.1" = { name = "forever-agent"; packageName = "forever-agent"; @@ -4468,15 +5314,6 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; - "form-data-2.5.1" = { - name = "form-data"; - packageName = "form-data"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz"; - sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA=="; - }; - }; "form-data-3.0.1" = { name = "form-data"; packageName = "form-data"; @@ -4504,13 +5341,13 @@ let sha512 = "KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ=="; }; }; - "formstream-1.1.1" = { + "formstream-1.2.0" = { name = "formstream"; packageName = "formstream"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/formstream/-/formstream-1.1.1.tgz"; - sha512 = "yHRxt3qLFnhsKAfhReM4w17jP+U1OlhUjnKPPtonwKbIJO7oBP0MvoxkRUwb8AU9n0MIkYy5X5dK6pQnbj+R2Q=="; + url = "https://registry.npmjs.org/formstream/-/formstream-1.2.0.tgz"; + sha512 = "ef4F+FQLnQLly1/AZ5OGNgGzzlOmp+T7+L/TaXASJ1GrETrpZb78/Mz7z+1Ra5FX3nLZE0WIOInGOoa81LxWew=="; }; }; "forwarded-0.2.0" = { @@ -4549,6 +5386,15 @@ let sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; }; }; + "fs-extra-5.0.0" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz"; + sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ=="; + }; + }; "fs-extra-8.1.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -4567,6 +5413,15 @@ let sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; }; }; + "fs-minipass-1.2.7" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz"; + sha512 = "GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA=="; + }; + }; "fs-minipass-2.1.0" = { name = "fs-minipass"; packageName = "fs-minipass"; @@ -4585,6 +5440,15 @@ let sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; }; + "fstream-1.0.12" = { + name = "fstream"; + packageName = "fstream"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz"; + sha512 = "WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg=="; + }; + }; "ftp-0.3.10" = { name = "ftp"; packageName = "ftp"; @@ -4621,6 +5485,15 @@ let sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; }; }; + "gauge-1.2.7" = { + name = "gauge"; + packageName = "gauge"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz"; + sha512 = "fVbU2wRE91yDvKUnrIaQlHKAWKY5e08PmztCrwuH5YVQ+Z/p3d0ny2T48o6uvAAXHIUnfaQdHkmxYbQft1eHVA=="; + }; + }; "gauge-3.0.2" = { name = "gauge"; packageName = "gauge"; @@ -4648,6 +5521,15 @@ let sha512 = "gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA=="; }; }; + "gaxios-5.1.0" = { + name = "gaxios"; + packageName = "gaxios"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gaxios/-/gaxios-5.1.0.tgz"; + sha512 = "aezGIjb+/VfsJtIcHGcBSerNEDdfdHeMros+RbYbGpmonKWQCOVOes0LVZhn1lDtIgq55qq0HaxymIoae3Fl/A=="; + }; + }; "gcp-metadata-4.3.1" = { name = "gcp-metadata"; packageName = "gcp-metadata"; @@ -4657,6 +5539,15 @@ let sha512 = "x850LS5N7V1F3UcV7PoupzGsyD6iVwTVvsh3tbXfkctZnBnjW5yu5z1/3k3SehF7TyoTIe78rJs02GMMy+LF+A=="; }; }; + "gcp-metadata-5.2.0" = { + name = "gcp-metadata"; + packageName = "gcp-metadata"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.2.0.tgz"; + sha512 = "aFhhvvNycky2QyhG+dcfEdHBF0FRbYcf39s6WNHUDysKSrbJ5vuFbjydxBcmewtXeV248GP8dWT3ByPNxsyHCw=="; + }; + }; "generate-function-2.3.1" = { name = "generate-function"; packageName = "generate-function"; @@ -4765,6 +5656,15 @@ let sha512 = "SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="; }; }; + "glob-10.2.2" = { + name = "glob"; + packageName = "glob"; + version = "10.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-10.2.2.tgz"; + sha512 = "Xsa0BcxIC6th9UwNjZkhrMtNo/MnyRL8jGCP+uEwhA5oFOCY1f2s1/oNKY47xQ0Bg5nkjsfAEIej1VeH62bDDQ=="; + }; + }; "glob-7.2.3" = { name = "glob"; packageName = "glob"; @@ -4846,6 +5746,15 @@ let sha512 = "5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA=="; }; }; + "google-auth-library-8.8.0" = { + name = "google-auth-library"; + packageName = "google-auth-library"; + version = "8.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.8.0.tgz"; + sha512 = "0iJn7IDqObDG5Tu9Tn2WemmJ31ksEa96IyK0J0OZCpTh6CrC6FrattwKX87h3qKVuprCJpdOGKc1Xi8V0kMh8Q=="; + }; + }; "google-gax-2.30.5" = { name = "google-gax"; packageName = "google-gax"; @@ -4864,13 +5773,22 @@ let sha512 = "HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg=="; }; }; - "google-timezones-json-1.0.2" = { + "google-p12-pem-4.0.1" = { + name = "google-p12-pem"; + packageName = "google-p12-pem"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-4.0.1.tgz"; + sha512 = "WPkN4yGtz05WZ5EhtlxNDWPhC4JIic6G8ePitwUWy4l+XPVYec+a0j0Ts47PDtW59y3RwAhUd9/h9ZZ63px6RQ=="; + }; + }; + "google-timezones-json-1.1.0" = { name = "google-timezones-json"; packageName = "google-timezones-json"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-timezones-json/-/google-timezones-json-1.0.2.tgz"; - sha512 = "UWXQ7BpSCW8erDespU2I4cri22xsKgwOCyhsJal0OJhi2tFpwJpsYNJt4vCiFPL1p2HzCGiS713LKpNR25n9Kg=="; + url = "https://registry.npmjs.org/google-timezones-json/-/google-timezones-json-1.1.0.tgz"; + sha512 = "6BmBx9gJVALV2jsfMks8PwmkWT5ip3+bmMyTgXu4PY+G8nKjHi61yrL7rSXpMYRsIzUXhVKpj+MnjhnwG9nung=="; }; }; "gopd-1.0.1" = { @@ -4882,13 +5800,13 @@ let sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; }; }; - "graceful-fs-4.2.10" = { + "graceful-fs-4.2.11" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.10"; + version = "4.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"; + sha512 = "RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="; }; }; "grpc-gcp-0.3.3" = { @@ -4909,6 +5827,15 @@ let sha512 = "gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ=="; }; }; + "gtoken-6.1.2" = { + name = "gtoken"; + packageName = "gtoken"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/gtoken/-/gtoken-6.1.2.tgz"; + sha512 = "4ccGpzz7YAr7lxrT2neugmXQ3hP9ho2gcaityLVkiUecAiwiy60Ii8gRbZeOsXV19fYaRjgBSshs8kXw+NKCPQ=="; + }; + }; "handlebars-4.7.7" = { name = "handlebars"; packageName = "handlebars"; @@ -5053,6 +5980,15 @@ let sha512 = "P/IZ8yOMne3SCTHbVY429NZ67B/2bVQlcYGZh2iPPbdLrEQ/qY5aGChn0YTDmt7Sb4IKRI51fypItav+lNl76w=="; }; }; + "help-me-3.0.0" = { + name = "help-me"; + packageName = "help-me"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/help-me/-/help-me-3.0.0.tgz"; + sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ=="; + }; + }; "highlight.js-10.7.3" = { name = "highlight.js"; packageName = "highlight.js"; @@ -5089,13 +6025,13 @@ let sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; - "htmlparser2-8.0.1" = { + "htmlparser2-8.0.2" = { name = "htmlparser2"; packageName = "htmlparser2"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz"; - sha512 = "4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA=="; + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz"; + sha512 = "GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA=="; }; }; "http-cache-semantics-4.1.1" = { @@ -5341,6 +6277,15 @@ let sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; }; }; + "invert-kv-1.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ=="; + }; + }; "ioredis-4.28.5" = { name = "ioredis"; packageName = "ioredis"; @@ -5350,13 +6295,13 @@ let sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; - "ioredis-5.3.1" = { + "ioredis-5.3.2" = { name = "ioredis"; packageName = "ioredis"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.1.tgz"; - sha512 = "C+IBcMysM6v52pTLItYMeV4Hz7uriGtoJdz7SSBDX6u+zwSYGirLdQh3L7t/OItWITcw3gTFMjJReYUwS4zihg=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.2.tgz"; + sha512 = "1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA=="; }; }; "ip-1.1.8" = { @@ -5485,13 +6430,13 @@ let sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; }; }; - "is-core-module-2.11.0" = { + "is-core-module-2.12.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.11.0"; + version = "2.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz"; - sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz"; + sha512 = "RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ=="; }; }; "is-date-object-1.0.5" = { @@ -5530,6 +6475,15 @@ let sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="; + }; + }; "is-fullwidth-code-point-3.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -5566,6 +6520,15 @@ let sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; }; + "is-iojs-1.1.0" = { + name = "is-iojs"; + packageName = "is-iojs"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-iojs/-/is-iojs-1.1.0.tgz"; + sha512 = "tLn1j3wYSL6DkvEI+V/j0pKohpa5jk+ER74v6S4SgCXnjS0WA+DoZbwZBrrhgwksMvtuwndyGeG5F8YMsoBzSA=="; + }; + }; "is-lambda-1.0.1" = { name = "is-lambda"; packageName = "is-lambda"; @@ -5836,13 +6799,13 @@ let sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; }; }; - "isbot-3.6.6" = { + "isbot-3.6.10" = { name = "isbot"; packageName = "isbot"; - version = "3.6.6"; + version = "3.6.10"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.6.6.tgz"; - sha512 = "98aGl1Spbx1led422YFrusDJ4ZutSNOymb2avZ2V4BCCjF3MqAF2k+J2zoaLYahubaFkb+3UyvbVDVlk/Ngrew=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.6.10.tgz"; + sha512 = "+I+2998oyP4oW9+OTQD8TS1r9P6wv10yejukj+Ksj3+UR5pUhsZN3f8W7ysq0p1qxpOVNbl5mCuv0bCaF8y5iQ=="; }; }; "isexe-2.0.0" = { @@ -5863,6 +6826,15 @@ let sha512 = "7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg=="; }; }; + "isomorphic-ws-4.0.1" = { + name = "isomorphic-ws"; + packageName = "isomorphic-ws"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz"; + sha512 = "BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w=="; + }; + }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -5872,6 +6844,15 @@ let sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="; }; }; + "jackspeak-2.2.0" = { + name = "jackspeak"; + packageName = "jackspeak"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.0.tgz"; + sha512 = "r5XBrqIJfwRIjRt/Xr5fv9Wh09qyhHfKnYddDlpM+ibRR20qrYActpCAgU6U+d53EOEjzkvxPMVHSlgR7leXrQ=="; + }; + }; "jake-10.8.5" = { name = "jake"; packageName = "jake"; @@ -5899,22 +6880,22 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; - "jose-4.13.1" = { + "jose-4.14.4" = { name = "jose"; packageName = "jose"; - version = "4.13.1"; + version = "4.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/jose/-/jose-4.13.1.tgz"; - sha512 = "MSJQC5vXco5Br38mzaQKiq9mwt7lwj2eXpgpRyQYNHYt2lq1PjkWa7DLXX0WVcQLE9HhMh3jPiufS7fhJf+CLQ=="; + url = "https://registry.npmjs.org/jose/-/jose-4.14.4.tgz"; + sha512 = "j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g=="; }; }; - "jquery-3.6.3" = { + "jquery-3.6.4" = { name = "jquery"; packageName = "jquery"; - version = "3.6.3"; + version = "3.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz"; - sha512 = "bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="; + url = "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz"; + sha512 = "v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ=="; }; }; "js-base64-3.7.5" = { @@ -5944,6 +6925,15 @@ let sha512 = "HgYLcutGbMYBJrwgVICiHliuw1OJLy2U3tIuK6a1rZ06KC84TPl81WG1hcBRrBCiIIuBe3PSo9G4IZOMGdSg3Q=="; }; }; + "js-sdsl-4.3.0" = { + name = "js-sdsl"; + packageName = "js-sdsl"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz"; + sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; + }; + }; "js-yaml-3.14.1" = { name = "js-yaml"; packageName = "js-yaml"; @@ -5962,15 +6952,6 @@ let sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; }; }; - "jsbi-3.2.5" = { - name = "jsbi"; - packageName = "jsbi"; - version = "3.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbi/-/jsbi-3.2.5.tgz"; - sha512 = "aBE4n43IPvjaddScbvWRA2YlTzKEynHzu7MqOyTipdHucf/VxS63ViCjxYRg86M8Rxwbt/GfzHl1kKERkt45fQ=="; - }; - }; "jsbi-4.3.0" = { name = "jsbi"; packageName = "jsbi"; @@ -6097,15 +7078,6 @@ let sha512 = "S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ=="; }; }; - "jsonwebtoken-8.5.1" = { - name = "jsonwebtoken"; - packageName = "jsonwebtoken"; - version = "8.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz"; - sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; - }; - }; "jsonwebtoken-9.0.0" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; @@ -6124,6 +7096,15 @@ let sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="; }; }; + "jssha-3.3.0" = { + name = "jssha"; + packageName = "jssha"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jssha/-/jssha-3.3.0.tgz"; + sha512 = "w9OtT4ALL+fbbwG3gw7erAO0jvS5nfvrukGPMWIAoea359B26ALXGpzy4YJSp9yGnpUvuvOw1nSjSoHDfWSr1w=="; + }; + }; "jwa-1.4.1" = { name = "jwa"; packageName = "jwa"; @@ -6187,13 +7168,22 @@ let sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; }; - "ldapts-4.2.4" = { + "lcid-1.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + sha512 = "YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw=="; + }; + }; + "ldapts-4.2.6" = { name = "ldapts"; packageName = "ldapts"; - version = "4.2.4"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/ldapts/-/ldapts-4.2.4.tgz"; - sha512 = "crE50bd+UA7bJcbOy2IynWJHTQwrG2FeySo1AqokGtApG7xoCVxz/sO5JLe2Xso1zb/Z+Zh65ERHkpJaGRJaEA=="; + url = "https://registry.npmjs.org/ldapts/-/ldapts-4.2.6.tgz"; + sha512 = "r1eOj2PtTJi+9aZxLirktoHntuYXlbQD9ZXCjiZmJx0VBQtBcWc+rueqABuh/AxMcFHNPDSJLJAXxoj5VevTwQ=="; }; }; "leac-0.6.0" = { @@ -6250,13 +7240,13 @@ let sha512 = "A0z9O4+5q+ZTj7QwNe/Juy1KARNb4WaviO4mYeFC4b8dBT2EEqK2pkM+GC8MVnkOjqhl5nYQxRgnPYRRTNmuSQ=="; }; }; - "libphonenumber-js-1.10.21" = { + "libphonenumber-js-1.10.30" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.21"; + version = "1.10.30"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.21.tgz"; - sha512 = "/udZhx49av2r2gZR/+xXSrwcR8smX/sDNrVpOFrvW+CA26TfYTVZfwb3MIDvmwAYMLs7pXuJjZX0VxxGpqPhsA=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.30.tgz"; + sha512 = "PLGc+xfrQrkya/YK2/5X+bPpxRmyJBHM+xxz9krUdSgk4Vs2ZwxX5/Ow0lv3r9PDlDtNWb4u+it8MY5rZ0IyGw=="; }; }; "libpq-1.8.12" = { @@ -6313,6 +7303,15 @@ let sha512 = "C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw=="; }; }; + "listenercount-1.0.1" = { + name = "listenercount"; + packageName = "listenercount"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz"; + sha512 = "3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ=="; + }; + }; "localforage-1.10.0" = { name = "localforage"; packageName = "localforage"; @@ -6493,15 +7492,6 @@ let sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="; }; }; - "lodash.includes-4.3.0" = { - name = "lodash.includes"; - packageName = "lodash.includes"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"; - sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; - }; - }; "lodash.intersection-4.4.0" = { name = "lodash.intersection"; packageName = "lodash.intersection"; @@ -6529,15 +7519,6 @@ let sha512 = "V8ViWvoNlXpCrB6Ewaj3ScRXUpmCvqp4tJUxa3dlovuJj/8lp3SND5Kw4v5OeuHgoyw4qJN+gl36qZqp6WYQ6g=="; }; }; - "lodash.isboolean-3.0.3" = { - name = "lodash.isboolean"; - packageName = "lodash.isboolean"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; - sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="; - }; - }; "lodash.isempty-4.4.0" = { name = "lodash.isempty"; packageName = "lodash.isempty"; @@ -6556,24 +7537,6 @@ let sha512 = "pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="; }; }; - "lodash.isinteger-4.0.4" = { - name = "lodash.isinteger"; - packageName = "lodash.isinteger"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; - sha512 = "DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="; - }; - }; - "lodash.isnumber-3.0.3" = { - name = "lodash.isnumber"; - packageName = "lodash.isnumber"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; - sha512 = "QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="; - }; - }; "lodash.isobject-3.0.2" = { name = "lodash.isobject"; packageName = "lodash.isobject"; @@ -6583,15 +7546,6 @@ let sha512 = "3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="; }; }; - "lodash.isplainobject-4.0.6" = { - name = "lodash.isplainobject"; - packageName = "lodash.isplainobject"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha512 = "oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="; - }; - }; "lodash.isstring-4.0.1" = { name = "lodash.isstring"; packageName = "lodash.isstring"; @@ -6664,15 +7618,6 @@ let sha512 = "XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg=="; }; }; - "lodash.once-4.1.1" = { - name = "lodash.once"; - packageName = "lodash.once"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; - sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; - }; - }; "lodash.orderby-4.6.0" = { name = "lodash.orderby"; packageName = "lodash.orderby"; @@ -6682,6 +7627,33 @@ let sha512 = "T0rZxKmghOOf5YPnn8EY5iLYeWCpZq8G41FfqoVHH5QDTAFaghJRmAdLiadEDq+ztgM2q5PjA+Z1fOwGrLgmtg=="; }; }; + "lodash.pad-4.5.1" = { + name = "lodash.pad"; + packageName = "lodash.pad"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz"; + sha512 = "mvUHifnLqM+03YNzeTBS1/Gr6JRFjd3rRx88FHWUvamVaT9k2O/kXha3yBSOwB9/DTQrSTLJNHvLBBt2FdX7Mg=="; + }; + }; + "lodash.padend-4.6.1" = { + name = "lodash.padend"; + packageName = "lodash.padend"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz"; + sha512 = "sOQs2aqGpbl27tmCS1QNZA09Uqp01ZzWfDUoD+xzTii0E7dSQfRKcRetFwa+uXaxaqL+TKm7CgD2JdKP7aZBSw=="; + }; + }; + "lodash.padstart-4.6.1" = { + name = "lodash.padstart"; + packageName = "lodash.padstart"; + version = "4.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz"; + sha512 = "sW73O6S8+Tg66eY56DBk85aQzzUJDtpoXFBgELMd5P/SotAguo+1kYO6RuYgXxA4HJH3LFTFPASX6ET6bjfriw=="; + }; + }; "lodash.partialright-4.2.1" = { name = "lodash.partialright"; packageName = "lodash.partialright"; @@ -6898,13 +7870,13 @@ let sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; }; }; - "long-5.2.1" = { + "long-5.2.3" = { name = "long"; packageName = "long"; - version = "5.2.1"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-5.2.1.tgz"; - sha512 = "GKSNGeNAtw8IryjjkhZxuKB3JzlcLTwjtiQCHKvqQet81I93kXslhDQruGI/QsddO83mcDToBVy7GqGS/zYf/A=="; + url = "https://registry.npmjs.org/long/-/long-5.2.3.tgz"; + sha512 = "lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="; }; }; "lossless-json-1.0.5" = { @@ -6934,6 +7906,15 @@ let sha512 = "uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw=="; }; }; + "lru-cache-4.1.5" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"; + sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; + }; + }; "lru-cache-5.1.1" = { name = "lru-cache"; packageName = "lru-cache"; @@ -6961,6 +7942,15 @@ let sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="; }; }; + "lru-cache-9.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "9.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.1.tgz"; + sha512 = "65/Jky17UwSb0BuB9V+MyDpsOtXKmYwzhyl+cOa9XUiI4uV2Ouy/2voFP3+al0BjZbJgMBD8FojMpAf+Z+qn4A=="; + }; + }; "lru-memoizer-2.2.0" = { name = "lru-memoizer"; packageName = "lru-memoizer"; @@ -7141,6 +8131,15 @@ let sha512 = "aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="; }; }; + "memory-stream-0.0.3" = { + name = "memory-stream"; + packageName = "memory-stream"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/memory-stream/-/memory-stream-0.0.3.tgz"; + sha512 = "q0D3m846qY6ZkIt+19ZemU5vH56lpOZZwoJc3AICARKh/menBuayQUjAGPrqtHQQMUYERSdOrej92J9kz7LgYA=="; + }; + }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -7204,6 +8203,15 @@ let sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; }; }; + "mime-3.0.0" = { + name = "mime"; + packageName = "mime"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz"; + sha512 = "jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="; + }; + }; "mime-db-1.52.0" = { name = "mime-db"; packageName = "mime-db"; @@ -7267,6 +8275,15 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; + "minimatch-9.0.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.0.tgz"; + sha512 = "0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w=="; + }; + }; "minimist-1.2.8" = { name = "minimist"; packageName = "minimist"; @@ -7276,6 +8293,15 @@ let sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; }; }; + "minipass-2.9.0" = { + name = "minipass"; + packageName = "minipass"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz"; + sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; + }; + }; "minipass-3.3.6" = { name = "minipass"; packageName = "minipass"; @@ -7285,13 +8311,13 @@ let sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; }; - "minipass-4.2.4" = { + "minipass-5.0.0" = { name = "minipass"; packageName = "minipass"; - version = "4.2.4"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-4.2.4.tgz"; - sha512 = "lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ=="; + url = "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz"; + sha512 = "3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="; }; }; "minipass-collect-1.0.2" = { @@ -7339,6 +8365,15 @@ let sha512 = "MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g=="; }; }; + "minizlib-1.3.3" = { + name = "minizlib"; + packageName = "minizlib"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz"; + sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; + }; + }; "minizlib-2.1.2" = { name = "minizlib"; packageName = "minizlib"; @@ -7366,13 +8401,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mkdirp-2.1.5" = { + "mkdirp-2.1.6" = { name = "mkdirp"; packageName = "mkdirp"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.5.tgz"; - sha512 = "jbjfql+shJtAPrFoKxHOXip4xS+kul9W3OzfzzrqueWK2QMGon2bFH2opl6W9EagBThjEz+iysyi/swOoVfB/w=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz"; + sha512 = "+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A=="; }; }; "mkdirp-classic-0.5.3" = { @@ -7402,13 +8437,13 @@ let sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; }; }; - "moment-timezone-0.5.41" = { + "moment-timezone-0.5.43" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.41"; + version = "0.5.43"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.41.tgz"; - sha512 = "e0jGNZDOHfBXJGz8vR/sIMXvBIGJJcqFjmlg9lmE+5KX1U7/RZNMswfD8nKnNCnQdKTIj50IaRKwl1fvMLyyRg=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz"; + sha512 = "72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ=="; }; }; "monaco-editor-0.33.0" = { @@ -7420,22 +8455,31 @@ let sha512 = "VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="; }; }; - "mongodb-3.7.3" = { + "mongodb-4.16.0" = { name = "mongodb"; packageName = "mongodb"; - version = "3.7.3"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-3.7.3.tgz"; - sha512 = "Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.16.0.tgz"; + sha512 = "0EB113Fsucaq1wsY0dOhi1fmZOwFtLOtteQkiqOXGklvWMnSH3g2QS53f0KTP+/6qOkuoXE2JksubSZNmxeI+g=="; }; }; - "mongodb-4.14.0" = { + "mongodb-5.4.0" = { name = "mongodb"; packageName = "mongodb"; - version = "4.14.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.14.0.tgz"; - sha512 = "coGKkWXIBczZPr284tYKFLg+KbGPPLlSbdgfKAb6QqCFt5bo5VFZ50O3FFzsw4rnkqjwT6D8Qcoo9nshYKM7Mg=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-5.4.0.tgz"; + sha512 = "6GDKgO7WiYUw+ILap143VXfAou06hjxDGgYUZWGnI4hgoZfP3el0G3l69JqJF8SEQbZmC+SN/2a0aWI/aWJoxA=="; + }; + }; + "mongodb-client-encryption-2.7.1" = { + name = "mongodb-client-encryption"; + packageName = "mongodb-client-encryption"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb-client-encryption/-/mongodb-client-encryption-2.7.1.tgz"; + sha512 = "LN1udDf9nZ/paUcuY2AATIVWKf7oGHb2IKMQqGu/7iiqpNlV0M6xjbQix0bxEQvzZZW0T9PG6PN8mYeMR+YDnA=="; }; }; "mongodb-connection-string-url-2.6.0" = { @@ -7456,6 +8500,15 @@ let sha512 = "GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q=="; }; }; + "mqtt-4.3.7" = { + name = "mqtt"; + packageName = "mqtt"; + version = "4.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.7.tgz"; + sha512 = "ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw=="; + }; + }; "mqtt-packet-6.10.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; @@ -7492,31 +8545,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "msal-1.4.17" = { - name = "msal"; - packageName = "msal"; - version = "1.4.17"; - src = fetchurl { - url = "https://registry.npmjs.org/msal/-/msal-1.4.17.tgz"; - sha512 = "RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ=="; - }; - }; - "msgpackr-1.8.4" = { + "msgpackr-1.9.1" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.8.4"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.4.tgz"; - sha512 = "BE3hD3PqV7jsNaV022uq0jMW+ZVc32wSYyQmwAoJUc+vPtCeyro2MOtAW61Fd9ZKNySM6y913E9fBY0mG+hKXg=="; - }; - }; - "mssql-7.3.5" = { - name = "mssql"; - packageName = "mssql"; - version = "7.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-7.3.5.tgz"; - sha512 = "LTOSQ3k8yZTBfO/5XwH7zC6fDPBx1sYgMXZyP/k+ErWrhZN8faAvDq+/gMlm9DaFG9yaOipHedF5JSPV17EHNw=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.9.1.tgz"; + sha512 = "jJdrNH8tzfCtT0rjPFryBXjRDQE7rqfLkah4/8B4gYa7NNZYFBcGxqWBtfQpGC+oYyBwlkj3fARk4aooKNPHxg=="; }; }; "mssql-8.1.4" = { @@ -7528,6 +8563,15 @@ let sha512 = "nqkYYehETWVvFLB9zAGJV2kegOsdtLjUnkHA52aFhlE0ZIoOXC3BL8pLERwFicFypM4i3DX1hYeuM726EEIxjQ=="; }; }; + "mssql-9.1.1" = { + name = "mssql"; + packageName = "mssql"; + version = "9.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mssql/-/mssql-9.1.1.tgz"; + sha512 = "m0yTx9xzUtTvJpWJHqknUXUDPRnJXZYOOFNygnNIXn1PBkLsC/rkXQdquObd+M0ZPlBhGC00Jg28zG0wCl7VWg=="; + }; + }; "multer-1.4.5-lts.1" = { name = "multer"; packageName = "multer"; @@ -7564,49 +8608,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.157.0" = { + "n8n-core-0.164.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.157.0"; + version = "0.164.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.157.0.tgz"; - sha512 = "NYUqQGUJKNNEf39ZDzQsGSBlSxsTV47S0LPLvAy+7jlOXw9ZiITJC2bX9s3DHotN0rPm+asBGs3aZeUWb+Ygyw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.164.0.tgz"; + sha512 = "IBGgiikfI5U49o7vEo6rDelYNAw4XSSxU0WhmyJuEcyVipal0VT3A3bfYQzb46Bms9M+H5TfxvCviWnw2sY38A=="; }; }; - "n8n-design-system-0.56.0" = { + "n8n-design-system-0.62.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.56.0"; + version = "0.62.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.56.0.tgz"; - sha512 = "DY7U6jCp9MxHc0n69WqdGSVBCZTv4O5S/FuPrppYWH+OkI2kZxxidFi28HmTM/VnQo53A3pKFG5oDBbZDFt8wA=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.62.0.tgz"; + sha512 = "mngSO/XHPjLdjr6GBT/6t9qzbCXyfhGsgB05pdnYIDhERdyrXh6S3HhFLdVZ2c+kYewMwb8mXUYjg2UmpO3ujw=="; }; }; - "n8n-editor-ui-0.184.0" = { + "n8n-editor-ui-0.191.1" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.184.0"; + version = "0.191.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.184.0.tgz"; - sha512 = "fXxMKEhcgx205P5flp1sqTinrgtZIL6xthCZ92uEoT90pnTiZ54nCCgmY8QftMwhuAgomaJ/Ud6i93LJo0CA8A=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.191.1.tgz"; + sha512 = "TvmnWyVF2j7UIBqQX6DIc2fdgLABWRAfv7QTTJLt+qokkvs78RM6F7r1jaIszWnLdn17NGgWol0F5Dch4ZJFOA=="; }; }; - "n8n-nodes-base-0.216.0" = { + "n8n-nodes-base-0.223.2" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.216.0"; + version = "0.223.2"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.216.0.tgz"; - sha512 = "/78YbR/SQCXrkYNwco7Y2kzu+IneHNDPULfySPgbstqFrpiUvJhcaQbb7fAVGA/L/C+Wk9+EEXknZdjrvFVzow=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.223.2.tgz"; + sha512 = "CuSdOoQAcosgZLzF+Sow5fEJAMOVsRJ2+gAkoUEXSjRrwviutS+R8xShXN/8AfCj9CII2wpN0dqANtpomV8IxQ=="; }; }; - "n8n-workflow-0.139.0" = { + "n8n-workflow-0.146.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.139.0"; + version = "0.146.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.139.0.tgz"; - sha512 = "dNf58QHqORHQCpxPlrkydonKapKo+goNRIvS43L5zupNsLqvGbvu8p6GkdeUQwXEO7RnJ/xcUIaLrKMm+8nE9A=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.146.0.tgz"; + sha512 = "ZFvsQvDyoAV/I3RxAVRvRz38OuxW4UrOXeb/jkTMHUkNNEbIndsWmu47fmYjqqon/pgZunIi783+TY5tTcsEaw=="; }; }; "named-placeholders-1.1.3" = { @@ -7636,13 +8680,13 @@ let sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="; }; }; - "nanoid-3.3.4" = { + "nanoid-3.3.6" = { name = "nanoid"; packageName = "nanoid"; - version = "3.3.4"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; - sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"; + sha512 = "BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="; }; }; "napi-build-utils-1.0.2" = { @@ -7717,22 +8761,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.33.0" = { + "node-abi-3.40.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.33.0"; + version = "3.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.33.0.tgz"; - sha512 = "7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog=="; - }; - }; - "node-abort-controller-2.0.0" = { - name = "node-abort-controller"; - packageName = "node-abort-controller"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-2.0.0.tgz"; - sha512 = "L8RfEgjBTHAISTuagw51PprVAqNZoG6KSB6LQ6H1bskMVkFs5E71IyjauLBv3XbuomJlguWF/VnRHdJ1gqiAqA=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.40.0.tgz"; + sha512 = "zNy02qivjjRosswoYmPi8hIKJRr8MpQyeKT6qlcq/OnOgA3Rhoae+IYOqsM9V5+JnHWmxKnWOT2GxvtqdtOCXA=="; }; }; "node-abort-controller-3.1.1" = { @@ -7897,6 +8932,15 @@ let sha512 = "1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="; }; }; + "npmlog-1.2.1" = { + name = "npmlog"; + packageName = "npmlog"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-1.2.1.tgz"; + sha512 = "1J5KqSRvESP6XbjPaXt2H6qDzgizLTM7x0y1cXIjP2PpvdCqyNC7TO3cPRKsuYlElbi/DwkzRRdG2zpmE0IktQ=="; + }; + }; "npmlog-5.0.1" = { name = "npmlog"; packageName = "npmlog"; @@ -7933,13 +8977,31 @@ let sha512 = "dK0Ss9C34R/vV0FfYJXuqDAqHlaW9fvWVufq9MmGF2umCuDbd5GRfRD9fpi/LiM0l4ZXf8IBB+RYmZExqCrf0w=="; }; }; - "nunjucks-3.2.3" = { + "number-allocator-1.0.14" = { + name = "number-allocator"; + packageName = "number-allocator"; + version = "1.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.14.tgz"; + sha512 = "OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="; + }; + }; + "nunjucks-3.2.4" = { name = "nunjucks"; packageName = "nunjucks"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.3.tgz"; - sha512 = "psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ=="; + url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz"; + sha512 = "26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ=="; }; }; "oauth-1.0a-2.2.6" = { @@ -8023,13 +9085,13 @@ let sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; }; }; - "object.getownpropertydescriptors-2.1.5" = { + "object.getownpropertydescriptors-2.1.6" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz"; - sha512 = "yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz"; + sha512 = "lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ=="; }; }; "on-finished-2.4.1" = { @@ -8122,15 +9184,6 @@ let sha512 = "d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA=="; }; }; - "optional-require-1.1.8" = { - name = "optional-require"; - packageName = "optional-require"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/optional-require/-/optional-require-1.1.8.tgz"; - sha512 = "jq83qaUb0wNg9Krv1c5OQ+58EK+vHde6aBPzLvPPqJm89UQWsvSuFy9X/OSNJnFeSOKo7btE0n8Nl2+nE+z5nA=="; - }; - }; "optionator-0.8.3" = { name = "optionator"; packageName = "optionator"; @@ -8158,6 +9211,15 @@ let sha512 = "Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw=="; }; }; + "os-locale-1.4.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + sha512 = "PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g=="; + }; + }; "os-name-1.0.3" = { name = "os-name"; packageName = "os-name"; @@ -8185,6 +9247,15 @@ let sha512 = "ixCMMwnVxyHFQLQnINhmIpWqXIfS2YOXchwQrk+OFzmo6nDjQ0E4KXAyyUh0T0MZgV4bUhkRrAbVqlE4yLVq4A=="; }; }; + "otpauth-9.1.1" = { + name = "otpauth"; + packageName = "otpauth"; + version = "9.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/otpauth/-/otpauth-9.1.1.tgz"; + sha512 = "XhimxmkREwf6GJvV4svS9OVMFJ/qRGz+QBEGwtW5OMf9jZlx9yw25RZMXdrO6r7DHgfIaETJb1lucZXZtn3jgw=="; + }; + }; "p-cancelable-2.1.1" = { name = "p-cancelable"; packageName = "p-cancelable"; @@ -8203,6 +9274,15 @@ let sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; }; }; + "p-limit-3.1.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; + }; + }; "p-map-2.1.0" = { name = "p-map"; packageName = "p-map"; @@ -8446,6 +9526,15 @@ let sha512 = "fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="; }; }; + "path-key-3.1.1" = { + name = "path-key"; + packageName = "path-key"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; + sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; + }; + }; "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; @@ -8455,6 +9544,15 @@ let sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; + "path-scurry-1.7.0" = { + name = "path-scurry"; + packageName = "path-scurry"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-scurry/-/path-scurry-1.7.0.tgz"; + sha512 = "UkZUeDjczjYRE495+9thsgcVgsaCPkaw80slmfVFgllxY+IO8ubTsOpFVjDPROBqJdHfVPUFRHPBV/WciOVfWg=="; + }; + }; "path-to-regexp-0.1.7" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -8536,6 +9634,15 @@ let sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; }; + "pg-8.10.0" = { + name = "pg"; + packageName = "pg"; + version = "8.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg/-/pg-8.10.0.tgz"; + sha512 = "ke7o7qSTMb47iwzOSaZMfeR7xToFdkE71ifIipOAAaLIM0DYzfOAXlgFFmYUIE2BcJtvnVlGCID84ZzCegE8CQ=="; + }; + }; "pg-8.8.0" = { name = "pg"; packageName = "pg"; @@ -8545,15 +9652,6 @@ let sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; }; }; - "pg-8.9.0" = { - name = "pg"; - packageName = "pg"; - version = "8.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz"; - sha512 = "ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg=="; - }; - }; "pg-connection-string-2.5.0" = { name = "pg-connection-string"; packageName = "pg-connection-string"; @@ -8563,13 +9661,13 @@ let sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; - "pg-cursor-2.8.0" = { + "pg-cursor-2.9.0" = { name = "pg-cursor"; packageName = "pg-cursor"; - version = "2.8.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.8.0.tgz"; - sha512 = "LrOaEHK+R1C40e+xeri3FTRY/VKp9uTOCVsKtGB7LJ57qbeaphYvWjbVly8AesdT1GfHXYcAnVdExKhW7DKOvA=="; + url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.9.0.tgz"; + sha512 = "tNX0FbHX6+hlhZVNbxhSQPDMNMFF6mOWQvwDobPROAFpilmXrZo3FozawqaBQKonFKpBloZZyWUL3Kkf5rLn6A=="; }; }; "pg-int8-1.0.1" = { @@ -8599,13 +9697,13 @@ let sha512 = "LBVNWkNh0fVx/cienARRP2y22J5OpUsKBe0TpxzAx3arEUUdIs77aLSAHS3scS7SMaqc+OkG40CEu5fN0/cjIw=="; }; }; - "pg-pool-3.5.2" = { + "pg-pool-3.6.0" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.5.2"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz"; - sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.0.tgz"; + sha512 = "clFRf2ksqd+F497kWFyM21tMjeikn60oGDmqMT8UBrynEwVEX/5R5xd2sdvdo1cZCFlguORNpVuqxIj+aK4cfQ=="; }; }; "pg-promise-10.15.4" = { @@ -8626,13 +9724,13 @@ let sha512 = "M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="; }; }; - "pg-query-stream-4.3.0" = { + "pg-query-stream-4.4.0" = { name = "pg-query-stream"; packageName = "pg-query-stream"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.3.0.tgz"; - sha512 = "+Eer4Y1e43rAaphFNu9/VJKn9nKTApFKCSwVtDjXYnuO4QYqWHOEkApmGJv8gvaU5T6fcuEtjsN24gk+Rx7X9A=="; + url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.4.0.tgz"; + sha512 = "shmP973/ruBw3exSmIEBW9iubWvyyZMzp6oWfcHgvlqAe4LtaRyVqPGxgnuorbRqksK03mjOC9PU+Ohz3b0GkQ=="; }; }; "pg-types-1.13.0" = { @@ -8680,13 +9778,13 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; - "pinia-2.0.32" = { + "pinia-2.0.35" = { name = "pinia"; packageName = "pinia"; - version = "2.0.32"; + version = "2.0.35"; src = fetchurl { - url = "https://registry.npmjs.org/pinia/-/pinia-2.0.32.tgz"; - sha512 = "8Tw4OrpCSJ028UUyp0gYPP/wyjigLoEceuO/x1G+FlHVf73337e5vLm4uDmrRIoBG1hvaed/eSHnrCFjOc4nkA=="; + url = "https://registry.npmjs.org/pinia/-/pinia-2.0.35.tgz"; + sha512 = "P1IKKQWhxGXiiZ3atOaNI75bYlFUbRxtJdhPLX059Z7+b9Z04rnTZdSY8Aph1LA+/4QEMAYHsTQ638Wfe+6K5g=="; }; }; "popsicle-12.1.0" = { @@ -8752,13 +9850,13 @@ let sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA=="; }; }; - "postcss-8.4.21" = { + "postcss-8.4.23" = { name = "postcss"; packageName = "postcss"; - version = "8.4.21"; + version = "8.4.23"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz"; - sha512 = "tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz"; + sha512 = "bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA=="; }; }; "postgres-array-1.0.3" = { @@ -8806,13 +9904,13 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; - "posthog-node-2.5.4" = { + "posthog-node-2.6.0" = { name = "posthog-node"; packageName = "posthog-node"; - version = "2.5.4"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.5.4.tgz"; - sha512 = "CdywlVh0CZU05/3MrBc0qY/zsLdU2X9XSz/yL1qMRhbyZhD8lrnuGlI69G2cpzZtli6S/nu64wcmULz/mFFA5w=="; + url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.6.0.tgz"; + sha512 = "/BiFw/jwdP0uJSRAIoYqLoBTjZ612xv74b1L/a3T/p1nJVL8e0OrHuxbJW56c6WVW/IKm9gBF/zhbqfaz0XgJQ=="; }; }; "prebuild-install-7.1.1" = { @@ -8833,13 +9931,13 @@ let sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; }; - "prettier-2.8.4" = { + "prettier-2.8.8" = { name = "prettier"; packageName = "prettier"; - version = "2.8.4"; + version = "2.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.8.4.tgz"; - sha512 = "vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz"; + sha512 = "tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q=="; }; }; "pretty-bytes-5.6.0" = { @@ -8878,6 +9976,15 @@ let sha512 = "cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="; }; }; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha512 = "yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw=="; + }; + }; "process-nextick-args-2.0.1" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -8977,13 +10084,13 @@ let sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; }; }; - "protobufjs-7.2.2" = { + "protobufjs-7.2.3" = { name = "protobufjs"; packageName = "protobufjs"; - version = "7.2.2"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.2.tgz"; - sha512 = "++PrQIjrom+bFDPpfmqXfAGSQs40116JRrqqyf53dymUMvvb5d/LMRyicRoF1AUKoXVS1/IgJXlEgcpr4gTF3Q=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.3.tgz"; + sha512 = "TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg=="; }; }; "proxy-addr-2.0.7" = { @@ -9211,6 +10318,15 @@ let sha512 = "tco/Dwv1f/sgIgN6CWdj/restacPKNskK6yps1981ivH2ZmLYcs5o5rVzL3qaO/cSkhN8hYOMWs7+glzOLSgRg=="; }; }; + "readable-stream-1.0.34" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.34"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; + sha512 = "ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg=="; + }; + }; "readable-stream-1.1.14" = { name = "readable-stream"; packageName = "readable-stream"; @@ -9220,6 +10336,15 @@ let sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="; }; }; + "readable-stream-2.1.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; + sha512 = "NkXT2AER7VKXeXtJNSaWLpWIhmtSE3K2PguaLEeWr4JILghcIKqoLt1A3wHrnpDC5+ekf8gfk1GKWkFXe4odMw=="; + }; + }; "readable-stream-2.3.8" = { name = "readable-stream"; packageName = "readable-stream"; @@ -9229,13 +10354,13 @@ let sha512 = "8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="; }; }; - "readable-stream-3.6.1" = { + "readable-stream-3.6.2" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz"; - sha512 = "+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"; + sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="; }; }; "readable-web-to-node-stream-3.0.2" = { @@ -9292,13 +10417,13 @@ let sha512 = "grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw=="; }; }; - "redis-4.6.5" = { + "redis-4.6.6" = { name = "redis"; packageName = "redis"; - version = "4.6.5"; + version = "4.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-4.6.5.tgz"; - sha512 = "O0OWA36gDQbswOdUuAhRL6mTZpHFN525HlgZgDaVNgCJIAZR3ya06NTESb0R+TUZ+BFaDpz6NnnVvoMx9meUFg=="; + url = "https://registry.npmjs.org/redis/-/redis-4.6.6.tgz"; + sha512 = "aLs2fuBFV/VJ28oLBqYykfnhGGkFxvx0HdCEBYdJ99FFbSEMZ7c1nVKwR6ZRv+7bb7JnC0mmCzaqu8frgOYhpA=="; }; }; "redis-commands-1.7.0" = { @@ -9355,13 +10480,13 @@ let sha512 = "kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="; }; }; - "regexp.prototype.flags-1.4.3" = { + "regexp.prototype.flags-1.5.0" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; - sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz"; + sha512 = "0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA=="; }; }; "reinterval-1.1.0" = { @@ -9427,15 +10552,6 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; - "require-at-1.0.6" = { - name = "require-at"; - packageName = "require-at"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/require-at/-/require-at-1.0.6.tgz"; - sha512 = "7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g=="; - }; - }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -9463,13 +10579,13 @@ let sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; }; }; - "resolve-1.22.1" = { + "resolve-1.22.3" = { name = "resolve"; packageName = "resolve"; - version = "1.22.1"; + version = "1.22.3"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; - sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.3.tgz"; + sha512 = "P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw=="; }; }; "restore-cursor-3.1.0" = { @@ -9490,6 +10606,15 @@ let sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; }; }; + "retry-0.13.1" = { + name = "retry"; + packageName = "retry"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"; + sha512 = "XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="; + }; + }; "retry-request-4.2.2" = { name = "retry-request"; packageName = "retry-request"; @@ -9499,6 +10624,15 @@ let sha512 = "xA93uxUD/rogV7BV59agW/JHPGXeREMWiZc9jhcwY4YdZ7QOtC7qbomYg0n4wyk2lJhggjvKvhNX8wln/Aldhg=="; }; }; + "retry-request-5.0.2" = { + name = "retry-request"; + packageName = "retry-request"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/retry-request/-/retry-request-5.0.2.tgz"; + sha512 = "wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ=="; + }; + }; "reusify-1.0.4" = { name = "reusify"; packageName = "reusify"; @@ -9526,6 +10660,15 @@ let sha512 = "PEl62U2EhxCO5wMUZ2/bCBcXAVKN9AdMSNQOrp3+R5b77TEaOSiy16MQ0sIOmzj/iqsgIAgPs1mt3FYfu1vIXA=="; }; }; + "rimraf-2.7.1" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz"; + sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; + }; + }; "rimraf-3.0.2" = { name = "rimraf"; packageName = "rimraf"; @@ -9544,13 +10687,13 @@ let sha512 = "fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw=="; }; }; - "rss-parser-3.12.0" = { + "rss-parser-3.13.0" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.12.0.tgz"; - sha512 = "aqD3E8iavcCdkhVxNDIdg1nkBI17jgqF+9OqPS1orwNaOgySdpvq6B+DoONLhzjzwV8mWg37sb60e4bmLK117A=="; + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.13.0.tgz"; + sha512 = "7jWUBV5yGN3rqMMj7CZufl/291QAhvrrGpDNE4k/02ZchL0npisiYYqULF71jCEKoIiHvK/Q2e6IkDwPziT7+w=="; }; }; "run-async-2.4.1" = { @@ -9580,6 +10723,15 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; + "safe-array-concat-1.0.0" = { + name = "safe-array-concat"; + packageName = "safe-array-concat"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz"; + sha512 = "9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ=="; + }; + }; "safe-buffer-5.1.2" = { name = "safe-buffer"; packageName = "safe-buffer"; @@ -9607,13 +10759,13 @@ let sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; }; }; - "safe-stable-stringify-2.4.2" = { + "safe-stable-stringify-2.4.3" = { name = "safe-stable-stringify"; packageName = "safe-stable-stringify"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz"; - sha512 = "gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA=="; + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz"; + sha512 = "e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g=="; }; }; "safer-buffer-2.1.2" = { @@ -9634,13 +10786,13 @@ let sha512 = "g2M1Qq2uL7GHtmBRaTVYcJD0Vb+XOyvXHsPARHCoqQ54Vp7m5h3NMUGzvLEIFGujxaamyM3BhEi9fdVAkJMvHw=="; }; }; - "sanitize-html-2.9.0" = { + "sanitize-html-2.10.0" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.9.0.tgz"; - sha512 = "KY1hpSbqFNcpoLf+nP7iStbP5JfQZ2Nd19ZEE7qFsQqRdp+sO5yX/e5+HoG9puFAcSTEpzQuihfKUltDcLlQjg=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.10.0.tgz"; + sha512 = "JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ=="; }; }; "sax-1.2.1" = { @@ -9715,13 +10867,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.8" = { + "semver-7.5.0" = { name = "semver"; packageName = "semver"; - version = "7.3.8"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"; - sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; + url = "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz"; + sha512 = "+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA=="; }; }; "send-0.18.0" = { @@ -9787,6 +10939,15 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha512 = "MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="; + }; + }; "setprototypeof-1.2.0" = { name = "setprototypeof"; packageName = "setprototypeof"; @@ -9814,6 +10975,15 @@ let sha512 = "EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="; }; }; + "shebang-command-2.0.0" = { + name = "shebang-command"; + packageName = "shebang-command"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; + sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; + }; + }; "shebang-regex-1.0.0" = { name = "shebang-regex"; packageName = "shebang-regex"; @@ -9823,6 +10993,15 @@ let sha512 = "wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="; }; }; + "shebang-regex-3.0.0" = { + name = "shebang-regex"; + packageName = "shebang-regex"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; + }; + }; "shell-escape-0.2.0" = { name = "shell-escape"; packageName = "shell-escape"; @@ -9868,6 +11047,15 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; + "signal-exit-4.0.1" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.1.tgz"; + sha512 = "uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw=="; + }; + }; "simple-concat-1.0.1" = { name = "simple-concat"; packageName = "simple-concat"; @@ -9886,13 +11074,13 @@ let sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; }; - "simple-git-3.17.0" = { + "simple-git-3.18.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.17.0"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.17.0.tgz"; - sha512 = "JozI/s8jr3nvLd9yn2jzPVHnhVzt7t7QWfcIoDcqRIGN+f1IINGv52xoZti2kkYfoRhhRvzMSNPfogHMp97rlw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.18.0.tgz"; + sha512 = "Yt0GJ5aYrpPci3JyrYcsPz8Xc05Hi4JPSOb+Sgn/BmPX35fn/6Fp9Mef8eMBCrL2siY5w4j49TA5Q+bxPpri1Q=="; }; }; "simple-lru-cache-0.0.2" = { @@ -9940,13 +11128,22 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.19" = { + "snappy-7.2.2" = { + name = "snappy"; + packageName = "snappy"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snappy/-/snappy-7.2.2.tgz"; + sha512 = "iADMq1kY0v3vJmGTuKcFWSXt15qYUz7wFkArOrsSg0IFfI3nJqIJvK2/ZbEIndg7erIJLtAVX2nSOqPz7DcwbA=="; + }; + }; + "snowflake-sdk-1.6.21" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.19"; + version = "1.6.21"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.19.tgz"; - sha512 = "aTN9/aqIy7oqz3KPb4iJVfmG7na+FvEQgJVZtSHODAnhOAH4OVBtvdlTTK15rld5NixxYYhIyzi1K6oXythEPA=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.21.tgz"; + sha512 = "pvVrZPfsujBkgIU2ibgV0g1LjA9Dyc/Fmyj2t1NKKzKIXD88E0T43RsOblpHGANgh3cmpZkhOGy8i8aY3feZUw=="; }; }; "socks-2.7.1" = { @@ -10048,13 +11245,22 @@ let sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; }; }; - "split2-4.1.0" = { + "split2-4.2.0" = { name = "split2"; packageName = "split2"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz"; - sha512 = "VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ=="; + url = "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz"; + sha512 = "UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg=="; + }; + }; + "splitargs-0.0.7" = { + name = "splitargs"; + packageName = "splitargs"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/splitargs/-/splitargs-0.0.7.tgz"; + sha512 = "UUFYD2oWbNwULH6WoVtLUOw8ch586B+HUqcsAjjjeoBQAM1bD4wZRXu01koaxyd8UeYpybWqW4h+lO1Okv40Tg=="; }; }; "sprintf-js-1.0.3" = { @@ -10084,13 +11290,13 @@ let sha512 = "3HD8pSkZL+5YvYUI8nlvNILs61ALqq34xgmF+BHpqxe68yZIJ1H+sIVIODvni25+CcxHUxDyrTJUL0lE/m7afw=="; }; }; - "sqlite3-5.1.4" = { + "sqlite3-5.1.6" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.1.4"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.4.tgz"; - sha512 = "i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.6.tgz"; + sha512 = "olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw=="; }; }; "sqlstring-2.3.3" = { @@ -10120,13 +11326,13 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-1.11.0" = { + "ssh2-1.12.0" = { name = "ssh2"; packageName = "ssh2"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz"; - sha512 = "nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.12.0.tgz"; + sha512 = "7mcLu8biO6/BjQQ1iCjCmuBiF0hXxo+JlHpJBPDTVsxU7evscWWiRUgYF5XIs4gLKmiPRHA0maund11QLWyDJg=="; }; }; "ssh2-sftp-client-7.2.3" = { @@ -10291,6 +11497,15 @@ let sha512 = "/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ=="; }; }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="; + }; + }; "string-width-4.2.3" = { name = "string-width"; packageName = "string-width"; @@ -10300,6 +11515,24 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; + "string-width-5.1.2" = { + name = "string-width"; + packageName = "string-width"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz"; + sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="; + }; + }; + "string-width-cjs-4.2.3" = { + name = "string-width-cjs"; + packageName = "string-width-cjs"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; + }; + }; "string.prototype.startswith-1.0.0" = { name = "string.prototype.startswith"; packageName = "string.prototype.startswith"; @@ -10309,6 +11542,15 @@ let sha512 = "VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg=="; }; }; + "string.prototype.trim-1.2.7" = { + name = "string.prototype.trim"; + packageName = "string.prototype.trim"; + version = "1.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz"; + sha512 = "p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg=="; + }; + }; "string.prototype.trimend-1.0.6" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; @@ -10345,6 +11587,15 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; + }; + }; "strip-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -10354,6 +11605,24 @@ let sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; }; + "strip-ansi-7.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz"; + sha512 = "cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw=="; + }; + }; + "strip-ansi-cjs-6.0.1" = { + name = "strip-ansi-cjs"; + packageName = "strip-ansi-cjs"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; + }; + }; "strip-json-comments-2.0.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -10363,6 +11632,15 @@ let sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; }; }; + "strnum-1.0.5" = { + name = "strnum"; + packageName = "strnum"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz"; + sha512 = "J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="; + }; + }; "strtok3-6.3.0" = { name = "strtok3"; packageName = "strtok3"; @@ -10381,13 +11659,13 @@ let sha512 = "PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw=="; }; }; - "style-mod-4.0.0" = { + "style-mod-4.0.3" = { name = "style-mod"; packageName = "style-mod"; - version = "4.0.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz"; - sha512 = "OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw=="; + url = "https://registry.npmjs.org/style-mod/-/style-mod-4.0.3.tgz"; + sha512 = "78Jv8kYJdjbvRwwijtCevYADfsI0lGzYJe4mMFdceO8l75DFFDoqBhR1jVDicDRRaX4//g1u9wKeo+ztc2h1Rw=="; }; }; "supports-color-7.2.0" = { @@ -10426,22 +11704,22 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-4.17.0" = { + "swagger-ui-dist-4.18.3" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.17.0"; + version = "4.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.17.0.tgz"; - sha512 = "31zNkTaOItkhyoKQMs1HIRZ+0kwBPcmp1R0TcVsAmZpT8QGWFI6k9wfTfllQ1t2oE8IoHVUwL5V0VTAKUosvNg=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.18.3.tgz"; + sha512 = "QW280Uvt234+TLo9NMPRa2Sj17RoorbQlR2eEY4R6Cs0LbdXhiO14YWX9OPBkBdiN64GQYz4zU8wlHLVi81lBg=="; }; }; - "swagger-ui-express-4.6.2" = { + "swagger-ui-express-4.6.3" = { name = "swagger-ui-express"; packageName = "swagger-ui-express"; - version = "4.6.2"; + version = "4.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.6.2.tgz"; - sha512 = "MHIOaq9JrTTB3ygUJD+08PbjM5Tt/q7x80yz9VTFIatw8j5uIWKcr90S0h5NLMzFEDC6+eVprtoeA5MDZXCUKQ=="; + url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.6.3.tgz"; + sha512 = "CDje4PndhTD2HkgyKH3pab+LKspDeB/NhPN2OF1j+piYIamQqBYwAXWESOT1Yju2xFg51bRW9sUng2WxDjzArw=="; }; }; "syslog-client-1.1.1" = { @@ -10453,13 +11731,22 @@ let sha512 = "c3qKw8JzCuHt0mwrzKQr8eqOc3RB28HgOpFuwGMO3GLscVpfR+0ECevWLZq/yIJTbx3WTb3QXBFVpTFtKAPDrw=="; }; }; - "tar-6.1.13" = { + "tar-4.4.19" = { name = "tar"; packageName = "tar"; - version = "6.1.13"; + version = "4.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"; - sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz"; + sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; + }; + }; + "tar-6.1.14" = { + name = "tar"; + packageName = "tar"; + version = "6.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz"; + sha512 = "piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw=="; }; }; "tar-fs-2.1.1" = { @@ -10498,15 +11785,6 @@ let sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA=="; }; }; - "tedious-11.8.0" = { - name = "tedious"; - packageName = "tedious"; - version = "11.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tedious/-/tedious-11.8.0.tgz"; - sha512 = "GtFrO694x/7CRiUBt0AI4jrMtrkXV+ywifiOrDy4K0ufJLeKB4rgmPjy5Ws366fCaBaKlqQ9RnJ+sCJ1Jbd1lw=="; - }; - }; "tedious-14.7.0" = { name = "tedious"; packageName = "tedious"; @@ -10516,6 +11794,15 @@ let sha512 = "d3qlmZcvZyt7akyPHiOdR+knfzObWZH3mW+gouQTSb7YTSwtpHuYHcvsQabfbY7oOvgbs51xRb7CwOahWK/t9w=="; }; }; + "tedious-15.1.3" = { + name = "tedious"; + packageName = "tedious"; + version = "15.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tedious/-/tedious-15.1.3.tgz"; + sha512 = "166EpRm5qknwhEisjZqz/mF7k14fXKJYHRg6XiAXVovd/YkyHJ3SG4Ppy89caPaNFfRr7PVYe+s4dAvKaCMFvw=="; + }; + }; "teeny-request-7.2.0" = { name = "teeny-request"; packageName = "teeny-request"; @@ -10525,6 +11812,15 @@ let sha512 = "SyY0pek1zWsi0LRVAALem+avzMLc33MKW/JLLakdP4s9+D7+jHcy5x6P+h94g2QNZsAqQNfX5lsbd3WSeJXrrw=="; }; }; + "teeny-request-8.0.3" = { + name = "teeny-request"; + packageName = "teeny-request"; + version = "8.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/teeny-request/-/teeny-request-8.0.3.tgz"; + sha512 = "jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww=="; + }; + }; "test-console-2.0.0" = { name = "test-console"; packageName = "test-console"; @@ -10696,6 +11992,15 @@ let sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; + "toggle-selection-1.0.6" = { + name = "toggle-selection"; + packageName = "toggle-selection"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz"; + sha512 = "BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ=="; + }; + }; "toidentifier-1.0.1" = { name = "toidentifier"; packageName = "toidentifier"; @@ -10768,6 +12073,15 @@ let sha512 = "HAGI4Lq4Q9dZ3Utu2phaWgtm3vB6PkLUFqWAScg/UW+1eZ/Tg6Exo4oC0/3VUol/w4BlefLhUUSVBr/9/ZGQOw=="; }; }; + "traverse-0.3.9" = { + name = "traverse"; + packageName = "traverse"; + version = "0.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; + sha512 = "iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ=="; + }; + }; "triple-beam-1.3.0" = { name = "triple-beam"; packageName = "triple-beam"; @@ -10903,13 +12217,13 @@ let sha512 = "v3UJF8xm68BBj6AF4oQML3ikrfK2c9EmZUyLOfShpJuItAqVBHWP/KtpGinkSsIiP6EZyyb6Z3NXyW9dgS9X1w=="; }; }; - "typeorm-0.3.12" = { + "typeorm-0.3.15" = { name = "typeorm"; packageName = "typeorm"; - version = "0.3.12"; + version = "0.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/typeorm/-/typeorm-0.3.12.tgz"; - sha512 = "sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA=="; + url = "https://registry.npmjs.org/typeorm/-/typeorm-0.3.15.tgz"; + sha512 = "R4JSw8QjDP1W+ypeRz/XrCXIqubrLSnNAzJAp9EQSQIPHTv+YmUHZis8g08lOwFpuhqL9m8jkPSz8GWEKlU/ow=="; }; }; "typeorm-aurora-data-api-driver-2.4.4" = { @@ -10921,13 +12235,13 @@ let sha512 = "EqrdoXr0FbUrAMmkNQQuPwlhUGM7SJnpwUlWTWNlK2mOhOUyM+33fhm1f1hz3nnJJV8fTxzS3kTDq6pkVASLAw=="; }; }; - "typescript-4.9.5" = { + "typescript-5.0.4" = { name = "typescript"; packageName = "typescript"; - version = "4.9.5"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"; - sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz"; + sha512 = "cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw=="; }; }; "uc.micro-1.0.6" = { @@ -10975,13 +12289,13 @@ let sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="; }; }; - "underscore-1.13.6" = { - name = "underscore"; - packageName = "underscore"; - version = "1.13.6"; + "undici-5.22.0" = { + name = "undici"; + packageName = "undici"; + version = "5.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz"; - sha512 = "+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="; + url = "https://registry.npmjs.org/undici/-/undici-5.22.0.tgz"; + sha512 = "fR9RXCc+6Dxav4P9VV/sp5w3eFiSdOjJYsbtWfd4s5L5C4ogyuVpdKIVHeW0vV1MloM65/f7W45nR9ZxwVdyiA=="; }; }; "unescape-1.0.1" = { @@ -11047,6 +12361,15 @@ let sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; }; }; + "unzipper-0.8.14" = { + name = "unzipper"; + packageName = "unzipper"; + version = "0.8.14"; + src = fetchurl { + url = "https://registry.npmjs.org/unzipper/-/unzipper-0.8.14.tgz"; + sha512 = "8rFtE7EP5ssOwGpN2dt1Q4njl0N1hUXJ7sSPz0leU2hRdq6+pra57z4YPBlVqm40vcgv6ooKZEAx48fMTv9x4w=="; + }; + }; "upper-case-2.0.2" = { name = "upper-case"; packageName = "upper-case"; @@ -11083,6 +12406,15 @@ let sha512 = "hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ=="; }; }; + "url-join-0.0.1" = { + name = "url-join"; + packageName = "url-join"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/url-join/-/url-join-0.0.1.tgz"; + sha512 = "H6dnQ/yPAAVzMQRvEvyz01hhfQL5qRWSEt7BX8t9DqnPw9BjMb64fjIRq76Uvf1hkHp+mTZvEVJ5guXOT0Xqaw=="; + }; + }; "url-parse-1.5.10" = { name = "url-parse"; packageName = "url-parse"; @@ -11119,15 +12451,6 @@ let sha512 = "Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ=="; }; }; - "utf-8-validate-6.0.3" = { - name = "utf-8-validate"; - packageName = "utf-8-validate"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.3.tgz"; - sha512 = "uIuGf9TWQ/y+0Lp+KGZCMuJWc3N9BHA+l/UmHd/oUHwJJDeysyTRxNQVkbzsIWfGFbRe3OcgML/i0mvVRPOyDA=="; - }; - }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -11164,22 +12487,22 @@ let sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; }; - "util.promisify-1.1.1" = { + "util.promisify-1.1.2" = { name = "util.promisify"; packageName = "util.promisify"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.1.tgz"; - sha512 = "/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw=="; + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.2.tgz"; + sha512 = "PBdZ03m1kBnQ5cjjO0ZvJMJS+QsbyIcFwi4hY4U76OQsCO9JrOYjbCFgIF76ccFg9xnJo7ZHPkqyj1GqmdS7MA=="; }; }; - "utility-1.17.0" = { + "utility-1.18.0" = { name = "utility"; packageName = "utility"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/utility/-/utility-1.17.0.tgz"; - sha512 = "KdVkF9An/0239BJ4+dqOa7NPrPIOeQE9AGfx0XS16O9DBiHNHRJMoeU5nL6pRGAkgJOqdOu8R4gBRcXnAocJKw=="; + url = "https://registry.npmjs.org/utility/-/utility-1.18.0.tgz"; + sha512 = "PYxZDA+6QtvRvm//++aGdmKG/cI07jNwbROz0Ql+VzFV1+Z0Dy55NI4zZ7RHc9KKpBePNFwoErqIuqQv/cjiTA=="; }; }; "utils-merge-1.0.1" = { @@ -11281,13 +12604,13 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; - "vm2-3.9.14" = { + "vm2-3.9.17" = { name = "vm2"; packageName = "vm2"; - version = "3.9.14"; + version = "3.9.17"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.14.tgz"; - sha512 = "HgvPHYHeQy8+QhzlFryvSteA4uQLBCOub02mgqdR+0bN/akRZ48TGB1v0aCv7ksyc0HXx16AZtMHKS38alc6TA=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.17.tgz"; + sha512 = "AqwtCnZ/ERcX+AVj9vUsphY56YANXxRuqMb7GsDtAr0m0PcQX3u0Aj3KWiXM0YAHy7i6JEeHrwOnwXbGYgRpAw=="; }; }; "vue-2.6.14" = { @@ -11326,13 +12649,13 @@ let sha512 = "BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw=="; }; }; - "vue-demi-0.13.11" = { + "vue-demi-0.14.0" = { name = "vue-demi"; packageName = "vue-demi"; - version = "0.13.11"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-demi/-/vue-demi-0.13.11.tgz"; - sha512 = "IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="; + url = "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.0.tgz"; + sha512 = "gt58r2ogsNQeVoQ3EhoUAvUsH9xviydl0dWJj7dabBC/2L4uBId7ujtCwDRD0JhkGsV1i0CtfLAeyYKBht9oWg=="; }; }; "vue-fragment-1.5.1" = { @@ -11560,6 +12883,15 @@ let sha512 = "iCRnKVvGxOQdsKhcQId2PXV1vV3J/sDPXKA4Oe9+Eti2nb2ESEsYHRYls/UjoUW3bIc5ZDO8dTH50A/5iVN+bw=="; }; }; + "window-size-0.1.4" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; + sha512 = "2thx4pB0cV3h+Bw7QmMXcEbdmOzv9t0HFplJH/Lz6yu60hXYy5RT8rUu+wlIreVxWsGN20mo+MHeCSfUpQBwPw=="; + }; + }; "winston-3.8.2" = { name = "winston"; packageName = "winston"; @@ -11614,6 +12946,15 @@ let sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="; }; }; + "wrap-ansi-2.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha512 = "vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw=="; + }; + }; "wrap-ansi-6.2.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -11632,6 +12973,24 @@ let sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; }; + "wrap-ansi-8.1.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"; + sha512 = "si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="; + }; + }; + "wrap-ansi-cjs-7.0.0" = { + name = "wrap-ansi-cjs"; + packageName = "wrap-ansi-cjs"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; @@ -11650,13 +13009,13 @@ let sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; - "ws-8.12.1" = { + "ws-8.13.0" = { name = "ws"; packageName = "ws"; - version = "8.12.1"; + version = "8.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.12.1.tgz"; - sha512 = "1qo+M9Ba+xNhPB+YTWUlK6M17brTut5EXbcBaMRN5pH5dFrXz7lzz1ChFSUq3bOUl8yEvSenhHmYUNJxFzdJew=="; + url = "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"; + sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="; }; }; "xlsx-0.17.5" = { @@ -11686,22 +13045,13 @@ let sha512 = "7XrwB3ujd95KCO6+u9fidb8ajvRJvIfGNWD0XLJoTWlBKz+tFpUzEYxsN+Il/6/gHtEs1RgRh2RH+TzhcWBZUw=="; }; }; - "xml2js-0.4.19" = { + "xml2js-0.5.0" = { name = "xml2js"; packageName = "xml2js"; - version = "0.4.19"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz"; - sha512 = "esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q=="; - }; - }; - "xml2js-0.4.23" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.4.23"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz"; - sha512 = "ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug=="; + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz"; + sha512 = "drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA=="; }; }; "xmlbuilder-11.0.1" = { @@ -11713,13 +13063,13 @@ let sha512 = "fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="; }; }; - "xmlbuilder-9.0.7" = { - name = "xmlbuilder"; - packageName = "xmlbuilder"; - version = "9.0.7"; + "xmllint-wasm-3.0.1" = { + name = "xmllint-wasm"; + packageName = "xmllint-wasm"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; - sha512 = "7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ=="; + url = "https://registry.npmjs.org/xmllint-wasm/-/xmllint-wasm-3.0.1.tgz"; + sha512 = "t+aKQXJQNAt9/qLgCjhHUmCnPXAyqBKiyh8oV0ZwBMar/uB+5F40tqOJZ97JwLADcqQr5WB2bjCxLKrm+DHz1g=="; }; }; "xpath-0.0.32" = { @@ -11731,15 +13081,6 @@ let sha512 = "rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw=="; }; }; - "xpath.js-1.1.0" = { - name = "xpath.js"; - packageName = "xpath.js"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xpath.js/-/xpath.js-1.1.0.tgz"; - sha512 = "jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ=="; - }; - }; "xregexp-2.0.0" = { name = "xregexp"; packageName = "xregexp"; @@ -11767,6 +13108,15 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; + "y18n-3.2.2" = { + name = "y18n"; + packageName = "y18n"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz"; + sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="; + }; + }; "y18n-5.0.8" = { name = "y18n"; packageName = "y18n"; @@ -11830,13 +13180,22 @@ let sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; - "yargs-17.7.1" = { + "yargs-17.7.2" = { name = "yargs"; packageName = "yargs"; - version = "17.7.1"; + version = "17.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz"; - sha512 = "cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw=="; + url = "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz"; + sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w=="; + }; + }; + "yargs-3.32.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.32.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; + sha512 = "ONJZiimStfZzhKamYvR/xvmgW3uEkAUFSP91y2caTEPhzF6uP2JfPiVZcq66b/YR0C3uitxSV7+T1x8p5bkmMg=="; }; }; "yargs-parser-20.2.9" = { @@ -11866,6 +13225,15 @@ let sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; }; }; + "yocto-queue-0.1.0" = { + name = "yocto-queue"; + packageName = "yocto-queue"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; + }; + }; "yup-0.32.11" = { name = "yup"; packageName = "yup"; @@ -11881,10 +13249,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.218.0"; + version = "0.225.2"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.218.0.tgz"; - sha512 = "U8BRKXk1rQxF8QwPJfZwNJ9K0uTdxPXzulN1EQokOwm12MzRCBIocTYzTzGu9I8pHvyQMhcev8T4zLmZd5bvhw=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.225.2.tgz"; + sha512 = "eyWmIP0IdjuEHdHq33DCPEHOGxqOA7LI/EsH+fSUyaJSNBujEpJGJyP30DvB1H399ekRASr2Si7heRB7ubL/VA=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -11899,77 +13267,145 @@ in ]; }) sources."@authenio/xml-encryption-2.0.2" - sources."@azure/abort-controller-1.1.0" - sources."@azure/core-auth-1.4.0" - (sources."@azure/core-client-1.7.2" // { + (sources."@aws-crypto/ie11-detection-3.0.0" // { dependencies = [ - sources."@azure/core-tracing-1.0.1" + sources."tslib-1.14.1" ]; }) - (sources."@azure/core-http-3.0.0" // { + (sources."@aws-crypto/sha256-browser-3.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@aws-crypto/sha256-js-3.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@aws-crypto/supports-web-crypto-3.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@aws-crypto/util-3.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."@aws-sdk/abort-controller-3.310.0" + sources."@aws-sdk/client-cognito-identity-3.327.0" + sources."@aws-sdk/client-sso-3.327.0" + sources."@aws-sdk/client-sso-oidc-3.327.0" + sources."@aws-sdk/client-sts-3.327.0" + sources."@aws-sdk/config-resolver-3.310.0" + sources."@aws-sdk/credential-provider-cognito-identity-3.327.0" + sources."@aws-sdk/credential-provider-env-3.310.0" + sources."@aws-sdk/credential-provider-imds-3.310.0" + sources."@aws-sdk/credential-provider-ini-3.327.0" + sources."@aws-sdk/credential-provider-node-3.327.0" + sources."@aws-sdk/credential-provider-process-3.310.0" + sources."@aws-sdk/credential-provider-sso-3.327.0" + sources."@aws-sdk/credential-provider-web-identity-3.310.0" + sources."@aws-sdk/credential-providers-3.327.0" + sources."@aws-sdk/fetch-http-handler-3.310.0" + sources."@aws-sdk/hash-node-3.310.0" + sources."@aws-sdk/invalid-dependency-3.310.0" + sources."@aws-sdk/is-array-buffer-3.310.0" + sources."@aws-sdk/middleware-content-length-3.325.0" + sources."@aws-sdk/middleware-endpoint-3.325.0" + sources."@aws-sdk/middleware-host-header-3.325.0" + sources."@aws-sdk/middleware-logger-3.325.0" + sources."@aws-sdk/middleware-recursion-detection-3.325.0" + sources."@aws-sdk/middleware-retry-3.327.0" + sources."@aws-sdk/middleware-sdk-sts-3.326.0" + sources."@aws-sdk/middleware-serde-3.325.0" + sources."@aws-sdk/middleware-signing-3.325.0" + sources."@aws-sdk/middleware-stack-3.325.0" + sources."@aws-sdk/middleware-user-agent-3.327.0" + sources."@aws-sdk/node-config-provider-3.310.0" + sources."@aws-sdk/node-http-handler-3.321.1" + sources."@aws-sdk/property-provider-3.310.0" + sources."@aws-sdk/protocol-http-3.310.0" + sources."@aws-sdk/querystring-builder-3.310.0" + sources."@aws-sdk/querystring-parser-3.310.0" + sources."@aws-sdk/service-error-classification-3.327.0" + sources."@aws-sdk/shared-ini-file-loader-3.310.0" + sources."@aws-sdk/signature-v4-3.310.0" + sources."@aws-sdk/smithy-client-3.325.0" + sources."@aws-sdk/token-providers-3.327.0" + sources."@aws-sdk/types-3.310.0" + sources."@aws-sdk/url-parser-3.310.0" + sources."@aws-sdk/util-base64-3.310.0" + sources."@aws-sdk/util-body-length-browser-3.310.0" + sources."@aws-sdk/util-body-length-node-3.310.0" + sources."@aws-sdk/util-buffer-from-3.310.0" + sources."@aws-sdk/util-config-provider-3.310.0" + sources."@aws-sdk/util-defaults-mode-browser-3.325.0" + sources."@aws-sdk/util-defaults-mode-node-3.325.0" + sources."@aws-sdk/util-endpoints-3.327.0" + sources."@aws-sdk/util-hex-encoding-3.310.0" + sources."@aws-sdk/util-locate-window-3.310.0" + sources."@aws-sdk/util-middleware-3.310.0" + sources."@aws-sdk/util-retry-3.327.0" + sources."@aws-sdk/util-uri-escape-3.310.0" + sources."@aws-sdk/util-user-agent-browser-3.310.0" + sources."@aws-sdk/util-user-agent-node-3.310.0" + sources."@aws-sdk/util-utf8-3.310.0" + sources."@aws-sdk/util-utf8-browser-3.259.0" + sources."@azure/abort-controller-1.1.0" + sources."@azure/core-auth-1.4.0" + sources."@azure/core-client-1.7.2" + (sources."@azure/core-http-3.0.1" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" ]; }) sources."@azure/core-http-compat-1.3.0" - sources."@azure/core-lro-2.5.1" + sources."@azure/core-lro-2.5.3" sources."@azure/core-paging-1.5.0" - (sources."@azure/core-rest-pipeline-1.10.2" // { + (sources."@azure/core-rest-pipeline-1.10.3" // { dependencies = [ - sources."@azure/core-tracing-1.0.1" sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" ]; }) - sources."@azure/core-tracing-1.0.0-preview.12" - sources."@azure/core-util-1.2.0" - (sources."@azure/identity-1.5.2" // { + sources."@azure/core-tracing-1.0.1" + sources."@azure/core-util-1.3.1" + (sources."@azure/identity-2.1.0" // { dependencies = [ sources."jwa-2.0.0" sources."jws-4.0.0" + sources."open-8.4.2" ]; }) - (sources."@azure/keyvault-keys-4.6.0" // { - dependencies = [ - sources."@azure/core-tracing-1.0.1" - ]; - }) + sources."@azure/keyvault-keys-4.7.0" sources."@azure/logger-1.0.4" - sources."@azure/ms-rest-azure-env-2.0.0" - (sources."@azure/ms-rest-js-2.6.4" // { + (sources."@azure/msal-browser-2.37.0" // { dependencies = [ - sources."form-data-2.5.1" - sources."tslib-1.14.1" + sources."@azure/msal-common-13.0.0" ]; }) - sources."@azure/ms-rest-nodeauth-3.1.1" - (sources."@azure/msal-browser-2.33.0" // { + sources."@azure/msal-common-7.6.0" + (sources."@azure/msal-node-1.17.2" // { dependencies = [ - sources."@azure/msal-common-10.0.0" + sources."@azure/msal-common-13.0.0" ]; }) - sources."@azure/msal-common-4.5.1" - (sources."@azure/msal-node-1.0.0-beta.6" // { - dependencies = [ - sources."jsonwebtoken-8.5.1" - sources."semver-5.7.1" - ]; - }) - (sources."@azure/storage-blob-12.13.0" // { + (sources."@azure/storage-blob-12.14.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" ]; }) - sources."@babel/parser-7.21.2" - sources."@babel/runtime-7.21.0" - sources."@codemirror/autocomplete-6.4.2" - sources."@codemirror/commands-6.2.1" - sources."@codemirror/lang-css-6.0.2" - sources."@codemirror/lang-javascript-6.1.4" + sources."@babel/parser-7.21.8" + sources."@babel/runtime-7.21.5" + sources."@codemirror/autocomplete-6.6.1" + sources."@codemirror/commands-6.2.4" + sources."@codemirror/lang-css-6.2.0" + sources."@codemirror/lang-javascript-6.1.7" sources."@codemirror/language-6.6.0" - sources."@codemirror/lint-6.2.0" + sources."@codemirror/lint-6.2.1" sources."@codemirror/state-6.2.0" - sources."@codemirror/view-6.9.1" + sources."@codemirror/view-6.11.0" sources."@colors/colors-1.5.0" sources."@cspotcode/source-map-support-0.8.1" sources."@curlconverter/yargs-0.0.2" @@ -11978,9 +13414,9 @@ in sources."@fontsource/open-sans-4.5.14" sources."@fortawesome/fontawesome-common-types-0.3.0" sources."@fortawesome/fontawesome-svg-core-1.3.0" - (sources."@fortawesome/free-regular-svg-icons-6.3.0" // { + (sources."@fortawesome/free-regular-svg-icons-6.4.0" // { dependencies = [ - sources."@fortawesome/fontawesome-common-types-6.3.0" + sources."@fortawesome/fontawesome-common-types-6.4.0" ]; }) (sources."@fortawesome/free-solid-svg-icons-5.15.4" // { @@ -11991,16 +13427,44 @@ in sources."@fortawesome/vue-fontawesome-2.0.10" sources."@gar/promisify-1.1.3" sources."@google-cloud/common-3.10.0" + sources."@google-cloud/paginator-3.0.7" sources."@google-cloud/precise-date-2.0.4" sources."@google-cloud/projectify-2.1.1" sources."@google-cloud/promisify-2.0.4" sources."@google-cloud/spanner-5.18.0" + (sources."@google-cloud/storage-6.10.0" // { + dependencies = [ + sources."@google-cloud/projectify-3.0.0" + sources."@google-cloud/promisify-3.0.1" + sources."@tootallnate/once-2.0.0" + sources."gaxios-5.1.0" + sources."gcp-metadata-5.2.0" + sources."google-auth-library-8.8.0" + sources."google-p12-pem-4.0.1" + sources."gtoken-6.1.2" + sources."http-proxy-agent-5.0.0" + sources."jwa-2.0.0" + sources."jws-4.0.0" + sources."lru-cache-6.0.0" + sources."mime-3.0.0" + sources."retry-request-5.0.2" + (sources."teeny-request-8.0.3" // { + dependencies = [ + sources."uuid-9.0.0" + ]; + }) + sources."yallist-4.0.0" + ]; + }) (sources."@grpc/grpc-js-1.6.12" // { dependencies = [ - sources."@grpc/proto-loader-0.7.5" - sources."long-5.2.1" - sources."protobufjs-7.2.2" - sources."yargs-16.2.0" + sources."@grpc/proto-loader-0.7.7" + sources."cliui-8.0.1" + sources."long-5.2.3" + sources."protobufjs-7.2.3" + sources."wrap-ansi-7.0.0" + sources."yargs-17.7.2" + sources."yargs-parser-21.1.1" ]; }) (sources."@grpc/proto-loader-0.6.13" // { @@ -12008,6 +13472,11 @@ in sources."yargs-16.2.0" ]; }) + (sources."@httptoolkit/websocket-stream-6.0.1" // { + dependencies = [ + sources."duplexify-3.7.1" + ]; + }) (sources."@icetee/ftp-0.3.15" // { dependencies = [ sources."isarray-0.0.1" @@ -12016,32 +13485,38 @@ in ]; }) sources."@ioredis/commands-1.2.0" - sources."@jridgewell/resolve-uri-3.1.0" - sources."@jridgewell/sourcemap-codec-1.4.14" + (sources."@isaacs/cliui-8.0.2" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.2.1" + sources."emoji-regex-9.2.2" + sources."string-width-5.1.2" + sources."strip-ansi-7.0.1" + sources."wrap-ansi-8.1.0" + ]; + }) + sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@js-joda/core-3.2.0" + sources."@js-joda/core-5.5.3" sources."@jsdevtools/ono-7.1.3" - sources."@jsplumb/browser-ui-5.13.4" - sources."@jsplumb/common-5.13.4" - sources."@jsplumb/connector-bezier-5.13.4" - sources."@jsplumb/core-5.13.4" - sources."@jsplumb/util-5.13.4" + sources."@jsplumb/browser-ui-5.13.7" + sources."@jsplumb/common-5.13.7" + sources."@jsplumb/connector-bezier-5.13.7" + sources."@jsplumb/core-5.13.7" + sources."@jsplumb/util-5.13.7" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@lezer/common-1.0.2" sources."@lezer/css-1.1.1" - sources."@lezer/highlight-1.1.3" - sources."@lezer/html-1.3.3" - sources."@lezer/javascript-1.4.1" - sources."@lezer/lr-1.3.3" + sources."@lezer/highlight-1.1.4" + sources."@lezer/html-1.3.4" + sources."@lezer/javascript-1.4.3" + sources."@lezer/lr-1.3.4" sources."@mapbox/node-pre-gyp-1.0.10" - (sources."@n8n_io/license-sdk-1.8.0" // { - dependencies = [ - sources."axios-1.1.3" - ]; - }) - sources."@n8n_io/riot-tmpl-2.0.0" + sources."@n8n_io/license-sdk-2.1.0" + sources."@n8n_io/riot-tmpl-3.0.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -12051,7 +13526,7 @@ in sources."mkdirp-1.0.4" ]; }) - sources."@oclif/command-1.8.22" + sources."@oclif/command-1.8.24" sources."@oclif/config-1.18.8" (sources."@oclif/core-1.26.2" // { dependencies = [ @@ -12075,7 +13550,7 @@ in sources."@oclif/linewrap-1.0.0" sources."@oclif/parser-3.8.10" sources."@oclif/screen-3.0.4" - sources."@opentelemetry/api-1.4.0" + sources."@opentelemetry/api-1.4.1" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -12087,7 +13562,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@redis/bloom-1.2.0" - (sources."@redis/client-1.5.6" // { + (sources."@redis/client-1.5.7" // { dependencies = [ sources."yallist-4.0.0" ]; @@ -12102,7 +13577,7 @@ in sources."ioredis-4.28.5" ]; }) - (sources."@sap/hana-client-2.15.22" // { + (sources."@sap/hana-client-2.16.26" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" @@ -12110,33 +13585,39 @@ in }) sources."@segment/loosely-validate-event-2.0.0" sources."@selderee/plugin-htmlparser2-0.10.0" - (sources."@sentry/core-7.40.0" // { + (sources."@sentry-internal/tracing-7.51.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/integrations-7.40.0" // { + (sources."@sentry/core-7.51.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.40.0" // { + (sources."@sentry/integrations-7.51.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.40.0" - (sources."@sentry/utils-7.40.0" // { + (sources."@sentry/node-7.51.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."@sentry/types-7.51.0" + (sources."@sentry/utils-7.51.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.37" - sources."@swc/wasm-1.3.37" + sources."@swc/core-1.3.56" + sources."@swc/helpers-0.5.1" + sources."@swc/wasm-1.3.56" sources."@techteamer/ocsp-1.0.0" - sources."@tediousjs/connection-string-0.3.0" + sources."@tediousjs/connection-string-0.4.2" sources."@tokenizer/token-0.3.0" sources."@tootallnate/once-1.1.2" sources."@tsconfig/node10-1.0.9" @@ -12150,16 +13631,15 @@ in sources."@types/duplexify-3.6.1" sources."@types/es-aggregate-error-1.0.2" sources."@types/express-4.17.17" - sources."@types/express-serve-static-core-4.17.33" - sources."@types/js-nacl-1.3.1" + sources."@types/express-serve-static-core-4.17.34" sources."@types/json-schema-7.0.11" - sources."@types/jsonwebtoken-9.0.1" - sources."@types/lodash-4.14.191" + sources."@types/jsonwebtoken-9.0.2" + sources."@types/lodash-4.14.194" sources."@types/long-4.0.2" - sources."@types/mime-3.0.1" + sources."@types/mime-1.3.2" sources."@types/multer-1.4.7" - sources."@types/node-18.14.6" - (sources."@types/node-fetch-2.6.2" // { + sources."@types/node-20.0.0" + (sources."@types/node-fetch-2.6.3" // { dependencies = [ sources."form-data-3.0.1" ]; @@ -12167,16 +13647,17 @@ in sources."@types/pumpify-1.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" + sources."@types/send-0.17.1" sources."@types/serve-static-1.15.1" sources."@types/stack-trace-0.0.29" - sources."@types/stoppable-1.1.1" sources."@types/tough-cookie-2.3.8" sources."@types/triple-beam-1.3.2" sources."@types/tunnel-0.0.3" sources."@types/uuid-9.0.1" - sources."@types/validator-13.7.13" + sources."@types/validator-13.7.15" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" + sources."@types/ws-8.5.4" sources."@vue/compiler-sfc-2.7.14" (sources."@vue/composition-api-1.7.1" // { dependencies = [ @@ -12184,19 +13665,13 @@ in ]; }) sources."@vue/devtools-api-6.5.0" - sources."@xmldom/xmldom-0.8.6" + sources."@xmldom/xmldom-0.8.7" sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."acorn-8.8.2" sources."acorn-walk-8.2.0" - (sources."adal-node-0.2.4" // { - dependencies = [ - sources."async-2.6.4" - sources."uuid-3.4.0" - ]; - }) sources."adler-32-1.2.0" sources."agent-base-6.0.2" sources."agentkeepalive-4.3.0" @@ -12213,6 +13688,7 @@ in sources."string_decoder-0.10.31" ]; }) + sources."ansi-0.3.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -12224,11 +13700,12 @@ in sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."arg-4.1.3" sources."argparse-1.0.10" + sources."array-buffer-byte-length-1.0.0" sources."array-flatten-1.1.1" sources."array-parallel-0.1.3" sources."array-series-0.1.5" @@ -12244,6 +13721,11 @@ in sources."assert-plus-1.0.0" sources."ast-types-0.13.4" sources."async-3.2.4" + (sources."async-retry-1.3.3" // { + dependencies = [ + sources."retry-0.13.1" + ]; + }) sources."async-validator-1.8.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" @@ -12254,15 +13736,19 @@ in }) sources."available-typed-arrays-1.0.5" sources."avsc-5.7.7" - (sources."aws-sdk-2.1328.0" // { + (sources."aws-crt-1.15.16" // { + dependencies = [ + sources."axios-0.24.0" + ]; + }) + (sources."aws-sdk-2.1372.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" sources."ieee754-1.1.13" + sources."isarray-1.0.0" sources."sax-1.2.1" sources."uuid-8.0.0" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" ]; }) sources."aws-sign2-0.7.0" @@ -12285,10 +13771,12 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - sources."better-sqlite3-8.1.0" + sources."better-eval-1.3.0" + sources."better-sqlite3-8.3.0" sources."big-integer-1.6.51" sources."big.js-6.2.1" sources."bignumber.js-9.1.1" + sources."binary-0.3.0" sources."binary-extensions-2.2.0" sources."binascii-0.0.2" sources."bindings-1.5.0" @@ -12296,10 +13784,10 @@ in (sources."bl-4.1.0" // { dependencies = [ sources."buffer-5.7.1" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) - sources."bluebird-2.11.0" + sources."bluebird-3.7.2" sources."bn.js-4.12.0" (sources."body-parser-1.20.2" // { dependencies = [ @@ -12308,21 +13796,25 @@ in sources."ms-2.0.0" ]; }) - sources."body-parser-xml-2.0.3" + sources."body-parser-xml-2.0.5" sources."boolbase-1.0.0" + sources."bowser-2.11.0" sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-request-0.3.3" - sources."bson-1.1.6" + sources."bson-5.2.0" sources."buffer-6.0.3" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.2" + sources."buffer-indexof-polyfill-1.0.2" sources."buffer-more-ints-1.0.0" + sources."buffer-shims-1.0.0" sources."buffer-writer-2.0.0" + sources."buffers-0.1.1" sources."bufferutil-4.0.7" (sources."bull-4.10.4" // { dependencies = [ - sources."cron-parser-4.8.0" + sources."cron-parser-4.8.1" ]; }) sources."busboy-1.6.0" @@ -12330,6 +13822,7 @@ in sources."bytes-3.1.2" (sources."cacache-15.3.0" // { dependencies = [ + sources."glob-7.2.3" sources."lru-cache-6.0.0" sources."minipass-3.3.6" sources."mkdirp-1.0.4" @@ -12343,6 +13836,7 @@ in sources."callsites-3.1.0" sources."camel-case-4.1.2" sources."camelcase-6.3.0" + sources."canvas-confetti-1.6.0" sources."capital-case-1.0.4" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -12351,6 +13845,7 @@ in sources."adler-32-1.3.1" ]; }) + sources."chainsaw-0.1.0" sources."chalk-4.1.2" sources."change-case-4.1.2" sources."chardet-0.7.0" @@ -12400,6 +13895,33 @@ in ]; }) sources."cluster-key-slot-1.1.2" + (sources."cmake-js-6.3.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."are-we-there-yet-1.0.6" + sources."camelcase-2.1.1" + sources."chownr-1.1.4" + sources."cliui-3.2.0" + sources."fs-extra-5.0.0" + sources."fs-minipass-1.2.7" + sources."gauge-1.2.7" + sources."is-fullwidth-code-point-1.0.0" + sources."jsonfile-4.0.0" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."npmlog-1.2.1" + sources."semver-5.7.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."tar-4.4.19" + sources."universalify-0.1.2" + sources."wrap-ansi-2.1.0" + sources."y18n-3.2.2" + sources."yallist-3.1.1" + sources."yargs-3.32.0" + ]; + }) + sources."code-point-at-1.1.0" sources."codemirror-lang-html-n8n-1.0.0" sources."codemirror-lang-n8n-expression-0.2.0" sources."codepage-1.15.0" @@ -12445,7 +13967,8 @@ in }) sources."cookie-signature-1.0.6" sources."copy-to-2.0.1" - sources."core-js-3.29.0" + sources."copy-to-clipboard-3.3.3" + sources."core-js-3.30.1" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."create-require-1.1.1" @@ -12469,32 +13992,27 @@ in }) sources."css-what-6.1.0" sources."cssfilter-0.0.10" - sources."csstype-3.1.1" + sources."csstype-3.1.2" sources."curlconverter-3.21.0" sources."currency-codes-2.1.0" sources."dashdash-1.14.1" sources."data-api-client-1.3.0" sources."data-uri-to-buffer-3.0.1" - sources."date-fns-2.29.3" - sources."date-utils-1.2.21" sources."dateformat-3.0.3" sources."de-indent-1.0.2" sources."debug-4.3.4" sources."debuglog-1.0.1" + sources."decamelize-1.2.0" sources."decode-uri-component-0.2.2" sources."decompress-response-6.0.0" - (sources."deep-equal-2.2.0" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) + sources."deep-equal-2.2.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-1.5.2" sources."default-user-agent-1.0.0" sources."define-lazy-prop-2.0.0" sources."define-properties-1.2.0" - sources."degenerator-3.0.2" + sources."degenerator-3.0.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."denque-1.5.1" @@ -12503,29 +14021,31 @@ in sources."detect-libc-2.0.1" sources."diff-4.0.2" sources."difflib-0.2.4" - sources."digest-header-1.0.0" + sources."digest-header-1.1.0" sources."dir-glob-3.0.1" sources."dom-iterator-1.0.0" (sources."dom-serializer-2.0.0" // { dependencies = [ - sources."entities-4.4.0" + sources."entities-4.5.0" ]; }) sources."domelementtype-2.3.0" sources."domhandler-5.0.3" - sources."domutils-3.0.1" + sources."domutils-3.1.0" sources."dot-case-3.0.4" sources."dotenv-8.6.0" sources."dreamopt-0.6.0" + sources."duplexer2-0.1.4" (sources."duplexify-4.1.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) + sources."eastasianwidth-0.2.0" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" - sources."ejs-3.1.8" + sources."ejs-3.1.9" sources."element-ui-2.15.13" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" @@ -12537,14 +14057,10 @@ in sources."entities-2.1.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" - sources."es-abstract-1.21.1" + sources."es-abstract-1.21.2" sources."es-aggregate-error-1.0.9" sources."es-array-method-boxes-properly-1.0.0" - (sources."es-get-iterator-1.1.3" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) + sources."es-get-iterator-1.1.3" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."es5-ext-0.8.2" @@ -12577,6 +14093,7 @@ in ]; }) sources."express-async-errors-3.1.1" + sources."express-handlebars-7.0.7" (sources."express-openapi-validator-4.13.8" // { dependencies = [ sources."media-typer-1.1.0" @@ -12597,6 +14114,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-text-encoding-1.0.6" + sources."fast-xml-parser-4.1.2" sources."fastq-1.15.0" sources."fecha-4.2.3" sources."fflate-0.7.4" @@ -12626,10 +14144,19 @@ in sources."fn.name-1.1.0" sources."follow-redirects-1.15.2" sources."for-each-0.3.3" + (sources."foreground-child-3.1.1" // { + dependencies = [ + sources."cross-spawn-7.0.3" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."forever-agent-0.6.1" sources."form-data-4.0.0" sources."formidable-1.2.6" - (sources."formstream-1.1.1" // { + (sources."formstream-1.2.0" // { dependencies = [ sources."mime-2.6.0" ]; @@ -12646,6 +14173,12 @@ in ]; }) sources."fs.realpath-1.0.0" + (sources."fstream-1.0.12" // { + dependencies = [ + sources."glob-7.2.3" + sources."rimraf-2.7.1" + ]; + }) (sources."ftp-0.3.10" // { dependencies = [ sources."isarray-0.0.1" @@ -12656,7 +14189,11 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."gauge-3.0.2" + (sources."gauge-3.0.2" // { + dependencies = [ + sources."signal-exit-3.0.7" + ]; + }) sources."gaxios-4.3.3" sources."gcp-metadata-4.3.1" sources."generate-function-2.3.1" @@ -12677,10 +14214,15 @@ in }) sources."getpass-0.1.7" sources."github-from-package-0.0.0" - sources."glob-7.2.3" + (sources."glob-10.2.2" // { + dependencies = [ + sources."minimatch-9.0.0" + ]; + }) sources."glob-parent-5.1.2" (sources."glob-stream-6.1.0" // { dependencies = [ + sources."glob-7.2.3" sources."glob-parent-3.1.0" sources."is-glob-3.1.0" ]; @@ -12691,6 +14233,7 @@ in dependencies = [ sources."cross-spawn-4.0.2" sources."debug-3.2.7" + sources."lru-cache-4.1.5" ]; }) (sources."google-auth-library-7.14.1" // { @@ -12703,9 +14246,9 @@ in }) sources."google-gax-2.30.5" sources."google-p12-pem-3.1.4" - sources."google-timezones-json-1.0.2" + sources."google-timezones-json-1.1.0" sources."gopd-1.0.1" - sources."graceful-fs-4.2.10" + sources."graceful-fs-4.2.11" sources."grpc-gcp-0.3.3" (sources."gtoken-5.3.2" // { dependencies = [ @@ -12728,21 +14271,22 @@ in sources."he-1.2.0" sources."header-case-2.0.4" sources."heap-0.2.7" - (sources."help-me-1.1.0" // { + (sources."help-me-3.0.0" // { dependencies = [ - sources."through2-2.0.5" + sources."glob-7.2.3" + sources."readable-stream-3.6.2" ]; }) sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" (sources."html-to-text-9.0.4" // { dependencies = [ - sources."deepmerge-4.3.0" + sources."deepmerge-4.3.1" ]; }) - (sources."htmlparser2-8.0.1" // { + (sources."htmlparser2-8.0.2" // { dependencies = [ - sources."entities-4.4.0" + sources."entities-4.5.0" ]; }) sources."http-cache-semantics-4.1.1" @@ -12779,7 +14323,8 @@ in sources."inquirer-7.3.3" sources."internal-slot-1.0.5" sources."interpret-1.4.0" - (sources."ioredis-5.3.1" // { + sources."invert-kv-1.0.0" + (sources."ioredis-5.3.2" // { dependencies = [ sources."denque-2.1.0" ]; @@ -12797,7 +14342,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.7" - sources."is-core-module-2.11.0" + sources."is-core-module-2.12.0" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-extendable-0.1.1" @@ -12805,6 +14350,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.10" sources."is-glob-4.0.3" + sources."is-iojs-1.1.0" sources."is-lambda-1.0.1" sources."is-map-2.0.2" sources."is-nan-1.3.2" @@ -12832,21 +14378,24 @@ in sources."is-weakset-2.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" - sources."isarray-1.0.0" - sources."isbot-3.6.6" + sources."isarray-2.0.5" + sources."isbot-3.6.10" sources."isexe-2.0.0" sources."iso-639-1-2.1.15" + sources."isomorphic-ws-4.0.1" sources."isstream-0.1.2" + sources."jackspeak-2.2.0" sources."jake-10.8.5" sources."jmespath-0.16.0" sources."join-component-1.1.0" - sources."jose-4.13.1" - sources."jquery-3.6.3" + sources."jose-4.14.4" + sources."jquery-3.6.4" sources."js-base64-3.7.5" sources."js-md4-0.3.2" sources."js-nacl-1.4.0" + sources."js-sdsl-4.3.0" sources."js-yaml-3.14.1" - sources."jsbi-3.2.5" + sources."jsbi-4.3.0" sources."jsbn-0.1.1" sources."jsesc-3.0.2" sources."json-bigint-1.0.0" @@ -12860,18 +14409,19 @@ in (sources."jsonpath-1.1.1" // { dependencies = [ sources."esprima-1.2.2" - sources."underscore-1.12.1" ]; }) sources."jsonschema-1.4.1" sources."jsonwebtoken-9.0.0" sources."jsprim-1.4.2" + sources."jssha-3.3.0" sources."jwa-1.4.1" sources."jwks-rsa-3.0.1" sources."jws-3.2.2" sources."kafkajs-1.16.0" sources."kuler-2.0.0" - (sources."ldapts-4.2.4" // { + sources."lcid-1.0.0" + (sources."ldapts-4.2.6" // { dependencies = [ sources."uuid-9.0.0" ]; @@ -12881,12 +14431,13 @@ in sources."levn-0.3.0" sources."libbase64-1.2.1" sources."libmime-5.2.1" - sources."libphonenumber-js-1.10.21" + sources."libphonenumber-js-1.10.30" sources."libpq-1.8.12" sources."libqp-2.0.1" sources."lie-3.1.1" sources."limiter-1.1.5" sources."linkify-it-3.0.3" + sources."listenercount-1.0.1" sources."localforage-1.10.0" (sources."localtunnel-2.0.2" // { dependencies = [ @@ -12911,17 +14462,12 @@ in sources."lodash.flatten-4.4.0" sources."lodash.flow-3.5.0" sources."lodash.get-4.4.2" - sources."lodash.includes-4.3.0" sources."lodash.intersection-4.4.0" sources."lodash.isarguments-3.1.0" sources."lodash.isarray-4.0.0" - sources."lodash.isboolean-3.0.3" sources."lodash.isempty-4.4.0" sources."lodash.isequal-4.5.0" - sources."lodash.isinteger-4.0.4" - sources."lodash.isnumber-3.0.3" sources."lodash.isobject-3.0.2" - sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" sources."lodash.iteratee-4.7.0" sources."lodash.last-3.0.0" @@ -12930,8 +14476,10 @@ in sources."lodash.merge-4.6.2" sources."lodash.mergewith-4.6.2" sources."lodash.omit-4.5.0" - sources."lodash.once-4.1.1" sources."lodash.orderby-4.6.0" + sources."lodash.pad-4.5.1" + sources."lodash.padend-4.6.1" + sources."lodash.padstart-4.6.1" sources."lodash.partialright-4.2.1" sources."lodash.pick-4.4.0" sources."lodash.pickby-4.6.0" @@ -12958,8 +14506,12 @@ in sources."long-4.0.0" sources."lossless-json-1.0.5" sources."lower-case-2.0.2" - sources."lru-cache-4.0.2" - sources."lru-memoizer-2.2.0" + sources."lru-cache-9.1.1" + (sources."lru-memoizer-2.2.0" // { + dependencies = [ + sources."lru-cache-4.0.2" + ]; + }) sources."lru_map-0.3.3" sources."luxon-3.3.0" (sources."mailparser-3.6.4" // { @@ -12995,6 +14547,13 @@ in sources."md5-2.3.0" sources."mdurl-1.0.1" sources."media-typer-0.3.0" + (sources."memory-stream-0.0.3" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.0.34" + sources."string_decoder-0.10.31" + ]; + }) sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" @@ -13012,7 +14571,7 @@ in ]; }) sources."minimist-1.2.8" - sources."minipass-4.2.4" + sources."minipass-5.0.0" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" @@ -13058,11 +14617,13 @@ in ]; }) sources."moment-2.29.4" - sources."moment-timezone-0.5.41" + sources."moment-timezone-0.5.43" sources."monaco-editor-0.33.0" - (sources."mongodb-3.7.3" // { + sources."mongodb-5.4.0" + (sources."mongodb-client-encryption-2.7.1" // { dependencies = [ - sources."bl-2.2.1" + sources."gaxios-5.1.0" + sources."gcp-metadata-5.2.0" ]; }) (sources."mongodb-connection-string-url-2.6.0" // { @@ -13072,25 +14633,25 @@ in sources."whatwg-url-11.0.0" ]; }) - (sources."mqtt-4.2.6" // { + (sources."mqtt-4.3.7" // { dependencies = [ sources."concat-stream-2.0.0" + sources."lru-cache-6.0.0" sources."pump-3.0.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."split2-3.2.2" - sources."utf-8-validate-5.0.10" sources."ws-7.5.9" + sources."yallist-4.0.0" ]; }) sources."mqtt-packet-6.10.0" sources."ms-2.1.2" - (sources."msal-1.4.17" // { + sources."msgpackr-1.9.1" + (sources."mssql-9.1.1" // { dependencies = [ - sources."tslib-1.14.1" + sources."commander-9.5.0" ]; }) - sources."msgpackr-1.8.4" - sources."mssql-7.3.5" sources."multer-1.4.5-lts.1" sources."mute-stream-0.0.8" (sources."mysql2-2.3.3" // { @@ -13101,31 +14662,23 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.157.0" // { + (sources."n8n-core-0.164.0" // { dependencies = [ sources."concat-stream-2.0.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) - (sources."n8n-design-system-0.56.0" // { + (sources."n8n-design-system-0.62.0" // { dependencies = [ sources."argparse-2.0.1" sources."markdown-it-12.3.2" sources."vue2-boring-avatars-0.3.8" ]; }) - sources."n8n-editor-ui-0.184.0" - (sources."n8n-nodes-base-0.216.0" // { + sources."n8n-editor-ui-0.191.1" + (sources."n8n-nodes-base-0.223.2" // { dependencies = [ - sources."@azure/core-tracing-1.0.1" - sources."@azure/identity-2.1.0" - sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.15.0" // { - dependencies = [ - sources."@azure/msal-common-10.0.0" - ]; - }) - sources."@js-joda/core-5.5.2" + sources."@tediousjs/connection-string-0.3.0" (sources."bl-5.1.0" // { dependencies = [ sources."buffer-6.0.3" @@ -13135,20 +14688,28 @@ in sources."buffer-5.7.1" sources."chokidar-3.5.2" sources."commander-9.5.0" - sources."jsbi-4.3.0" - sources."jwa-2.0.0" - sources."jws-4.0.0" - sources."mongodb-4.14.0" + sources."concat-stream-2.0.0" + sources."help-me-1.1.0" + sources."isarray-1.0.0" + sources."mongodb-4.16.0" + sources."mqtt-4.2.6" sources."mssql-8.1.4" - sources."node-abort-controller-3.1.1" - sources."open-8.4.2" - sources."readable-stream-3.6.1" + sources."pump-3.0.0" + sources."readable-stream-3.6.2" sources."redis-3.1.2" + sources."safe-buffer-5.1.2" + sources."split2-3.2.2" sources."sprintf-js-1.1.2" sources."tedious-14.7.0" + (sources."through2-2.0.5" // { + dependencies = [ + sources."readable-stream-2.3.8" + ]; + }) + sources."ws-7.5.9" ]; }) - (sources."n8n-workflow-0.139.0" // { + (sources."n8n-workflow-0.146.0" // { dependencies = [ sources."ast-types-0.15.2" ]; @@ -13160,7 +14721,7 @@ in }) sources."nan-2.17.0" sources."nanoclone-0.2.1" - sources."nanoid-3.3.4" + sources."nanoid-3.3.6" sources."napi-build-utils-1.0.2" sources."native-duplexpair-1.0.0" sources."natural-orderby-2.0.3" @@ -13169,8 +14730,8 @@ in sources."netmask-2.0.2" sources."nice-try-1.0.5" sources."no-case-3.0.4" - sources."node-abi-3.33.0" - sources."node-abort-controller-2.0.0" + sources."node-abi-3.40.0" + sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" sources."node-fetch-2.6.9" @@ -13179,8 +14740,10 @@ in dependencies = [ sources."are-we-there-yet-3.0.1" sources."gauge-4.0.4" + sources."glob-7.2.3" sources."npmlog-6.0.2" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" + sources."signal-exit-3.0.7" sources."which-2.0.2" ]; }) @@ -13202,7 +14765,9 @@ in sources."npmlog-5.0.1" sources."nth-check-2.1.1" sources."nub-0.0.0" - sources."nunjucks-3.2.3" + sources."number-allocator-1.0.14" + sources."number-is-nan-1.0.1" + sources."nunjucks-3.2.4" sources."oauth-1.0a-2.2.6" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -13212,7 +14777,7 @@ in sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object.assign-4.1.4" - sources."object.getownpropertydescriptors-2.1.5" + sources."object.getownpropertydescriptors-2.1.6" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -13222,15 +14787,17 @@ in sources."open-7.4.2" sources."openapi-types-10.0.0" sources."openurl-1.1.1" - sources."optional-require-1.1.8" sources."optionator-0.8.3" sources."oracledb-5.5.0" sources."ordered-read-streams-1.0.1" + sources."os-locale-1.4.0" sources."os-name-1.0.3" sources."os-tmpdir-1.0.2" sources."osx-release-1.1.0" + sources."otpauth-9.1.1" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" + sources."p-limit-3.1.0" sources."p-map-2.1.0" sources."p-queue-6.6.2" sources."p-timeout-3.2.0" @@ -13273,6 +14840,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.7" + sources."path-scurry-1.7.0" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."pause-0.0.1" @@ -13285,9 +14853,9 @@ in sources."peberminta-0.8.0" sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - sources."pg-8.9.0" + sources."pg-8.10.0" sources."pg-connection-string-2.5.0" - sources."pg-cursor-2.8.0" + sources."pg-cursor-2.9.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" (sources."pg-native-3.0.1" // { @@ -13299,19 +14867,19 @@ in sources."string_decoder-0.10.31" ]; }) - sources."pg-pool-3.5.2" + sources."pg-pool-3.6.0" (sources."pg-promise-10.15.4" // { dependencies = [ sources."pg-8.8.0" ]; }) sources."pg-protocol-1.6.0" - sources."pg-query-stream-4.3.0" + sources."pg-query-stream-4.4.0" sources."pg-types-2.2.0" sources."pgpass-1.0.5" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."pinia-2.0.32" + sources."pinia-2.0.35" sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" @@ -13319,12 +14887,12 @@ in sources."popsicle-transport-http-1.2.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" - sources."postcss-8.4.21" + sources."postcss-8.4.23" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" - (sources."posthog-node-2.5.4" // { + (sources."posthog-node-2.6.0" // { dependencies = [ sources."axios-0.27.2" ]; @@ -13335,7 +14903,7 @@ in ]; }) sources."prelude-ls-1.1.2" - sources."prettier-2.8.4" + sources."prettier-2.8.8" sources."pretty-bytes-5.6.0" sources."printj-1.1.2" sources."prismjs-1.29.0" @@ -13343,7 +14911,11 @@ in sources."process-nextick-args-2.0.1" sources."prom-client-13.2.0" sources."promise-1.3.0" - sources."promise-ftp-1.3.5" + (sources."promise-ftp-1.3.5" // { + dependencies = [ + sources."bluebird-2.11.0" + ]; + }) sources."promise-ftp-common-1.1.5" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" @@ -13387,12 +14959,13 @@ in sources."rc-1.2.8" (sources."readable-stream-2.3.8" // { dependencies = [ + sources."isarray-1.0.0" sources."safe-buffer-5.1.2" ]; }) (sources."readable-web-to-node-stream-3.0.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."readdirp-3.6.0" @@ -13403,13 +14976,13 @@ in }) sources."rechoir-0.6.2" sources."redeyed-2.1.1" - sources."redis-4.6.5" + sources."redis-4.6.6" sources."redis-commands-1.7.0" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" sources."regenerator-runtime-0.13.11" - sources."regexp.prototype.flags-1.4.3" + sources."regexp.prototype.flags-1.5.0" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" sources."remove-trailing-slash-0.1.1" @@ -13432,12 +15005,15 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."require-at-1.0.6" sources."require-directory-2.1.1" sources."requires-port-1.0.0" sources."resize-observer-polyfill-1.5.1" - sources."resolve-1.22.1" - sources."restore-cursor-3.1.0" + sources."resolve-1.22.3" + (sources."restore-cursor-3.1.0" // { + dependencies = [ + sources."signal-exit-3.0.7" + ]; + }) sources."retry-0.12.0" sources."retry-request-4.2.2" sources."reusify-1.0.4" @@ -13447,9 +15023,13 @@ in sources."debug-3.2.7" ]; }) - sources."rimraf-3.0.2" + (sources."rimraf-3.0.2" // { + dependencies = [ + sources."glob-7.2.3" + ]; + }) sources."rndm-1.2.0" - sources."rss-parser-3.12.0" + sources."rss-parser-3.13.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" (sources."rxjs-6.6.7" // { @@ -13457,21 +15037,22 @@ in sources."tslib-1.14.1" ]; }) + sources."safe-array-concat-1.0.0" sources."safe-buffer-5.2.1" sources."safe-regex-test-1.0.0" - sources."safe-stable-stringify-2.4.2" + sources."safe-stable-stringify-2.4.3" sources."safer-buffer-2.1.2" sources."samlify-2.8.10" - (sources."sanitize-html-2.9.0" // { + (sources."sanitize-html-2.10.0" // { dependencies = [ - sources."deepmerge-4.3.0" + sources."deepmerge-4.3.1" ]; }) sources."sax-1.2.4" sources."sb-promise-queue-2.1.0" sources."sb-scandir-3.1.0" sources."selderee-0.10.0" - (sources."semver-7.3.8" // { + (sources."semver-7.5.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -13493,32 +15074,40 @@ in sources."serve-static-1.15.0" sources."servie-4.3.3" sources."set-blocking-2.0.0" + sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-escape-0.2.0" - sources."shelljs-0.8.5" + (sources."shelljs-0.8.5" // { + dependencies = [ + sources."glob-7.2.3" + ]; + }) (sources."showdown-2.1.0" // { dependencies = [ sources."commander-9.5.0" ]; }) sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" + sources."signal-exit-4.0.1" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" - sources."simple-git-3.17.0" + sources."simple-git-3.18.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."snake-case-3.0.4" - (sources."snowflake-sdk-1.6.19" // { + sources."snappy-7.2.2" + (sources."snowflake-sdk-1.6.21" // { dependencies = [ sources."axios-0.27.2" sources."bignumber.js-2.4.0" sources."debug-3.2.7" + sources."fast-xml-parser-4.2.2" + sources."glob-7.2.3" sources."mkdirp-1.0.4" sources."tmp-0.2.1" sources."uuid-3.4.0" @@ -13532,18 +15121,19 @@ in sources."spex-3.2.0" sources."split-array-stream-2.0.0" sources."split-on-first-1.1.0" - sources."split2-4.1.0" + sources."split2-4.2.0" + sources."splitargs-0.0.7" sources."sprintf-js-1.0.3" sources."sql.js-1.8.0" - sources."sqlite3-5.1.4" + sources."sqlite3-5.1.6" sources."sqlstring-2.3.3" sources."sse-channel-4.0.0" sources."ssf-0.11.2" - sources."ssh2-1.11.0" + sources."ssh2-1.12.0" (sources."ssh2-sftp-client-7.2.3" // { dependencies = [ sources."concat-stream-2.0.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."sshpk-1.17.0" @@ -13562,7 +15152,7 @@ in sources."stoppable-1.1.0" (sources."stream-browserify-3.0.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."stream-events-1.0.5" @@ -13572,7 +15162,9 @@ in sources."strict-uri-encode-2.0.0" sources."string-similarity-4.0.4" sources."string-width-4.2.3" + sources."string-width-cjs-4.2.3" sources."string.prototype.startswith-1.0.0" + sources."string.prototype.trim-1.2.7" sources."string.prototype.trimend-1.0.6" sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { @@ -13581,17 +15173,19 @@ in ]; }) sources."strip-ansi-6.0.1" + sources."strip-ansi-cjs-6.0.1" sources."strip-json-comments-2.0.1" + sources."strnum-1.0.5" sources."strtok3-6.3.0" sources."stubs-3.0.0" - sources."style-mod-4.0.0" + sources."style-mod-4.0.3" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-4.17.0" - sources."swagger-ui-express-4.6.2" + sources."swagger-ui-dist-4.18.3" + sources."swagger-ui-express-4.6.3" sources."syslog-client-1.1.1" - (sources."tar-6.1.13" // { + (sources."tar-6.1.14" // { dependencies = [ sources."mkdirp-1.0.4" sources."yallist-4.0.0" @@ -13605,15 +15199,15 @@ in }) (sources."tar-stream-2.2.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."tarn-3.0.2" sources."tdigest-0.1.2" - (sources."tedious-11.8.0" // { + (sources."tedious-15.1.3" // { dependencies = [ sources."bl-5.1.0" - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" sources."sprintf-js-1.1.2" ]; }) @@ -13631,7 +15225,7 @@ in sources."through-2.3.8" (sources."through2-4.0.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."through2-filter-3.0.0" // { @@ -13652,6 +15246,7 @@ in }) sources."to-absolute-glob-2.0.2" sources."to-regex-range-5.0.1" + sources."toggle-selection-1.0.6" sources."toidentifier-1.0.1" sources."token-types-4.2.1" sources."toposort-2.0.2" @@ -13661,10 +15256,11 @@ in dependencies = [ sources."cliui-8.0.1" sources."wrap-ansi-7.0.0" - sources."yargs-17.7.1" + sources."yargs-17.7.2" sources."yargs-parser-21.1.1" ]; }) + sources."traverse-0.3.9" sources."triple-beam-1.3.0" sources."ts-expect-1.3.0" sources."ts-node-10.9.1" @@ -13679,34 +15275,42 @@ in sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" sources."typedi-0.10.0" - (sources."typeorm-0.3.12" // { + (sources."typeorm-0.3.15" // { dependencies = [ - sources."argparse-2.0.1" sources."cliui-8.0.1" sources."dotenv-16.0.3" sources."glob-8.1.0" - sources."js-yaml-4.1.0" sources."minimatch-5.1.6" - sources."mkdirp-2.1.5" + sources."mkdirp-2.1.6" sources."uuid-9.0.0" sources."wrap-ansi-7.0.0" - sources."yargs-17.7.1" + sources."yargs-17.7.2" sources."yargs-parser-21.1.1" ]; }) sources."typeorm-aurora-data-api-driver-2.4.4" - sources."typescript-4.9.5" + sources."typescript-5.0.4" sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" sources."unc-path-regex-0.1.2" - sources."underscore-1.13.6" + sources."underscore-1.12.1" + sources."undici-5.22.0" sources."unescape-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-stream-2.3.1" sources."universalify-2.0.0" sources."unpipe-1.0.0" + (sources."unzipper-0.8.14" // { + dependencies = [ + sources."bluebird-3.4.7" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."readable-stream-2.1.5" + sources."string_decoder-0.10.31" + ]; + }) sources."upper-case-2.0.2" sources."upper-case-first-2.0.2" sources."uri-js-4.4.1" @@ -13715,6 +15319,7 @@ in sources."punycode-1.3.2" ]; }) + sources."url-join-0.0.1" sources."url-parse-1.5.10" sources."url-value-parser-2.2.0" (sources."urllib-2.40.0" // { @@ -13727,7 +15332,7 @@ in sources."statuses-1.5.0" ]; }) - sources."utf-8-validate-6.0.3" + sources."utf-8-validate-5.0.10" (sources."utf7-1.0.2" // { dependencies = [ sources."semver-5.3.0" @@ -13736,8 +15341,8 @@ in sources."utf8-2.1.2" sources."util-0.12.5" sources."util-deprecate-1.0.2" - sources."util.promisify-1.1.1" - sources."utility-1.17.0" + sources."util.promisify-1.1.2" + sources."utility-1.18.0" sources."utils-merge-1.0.1" sources."uuencode-0.0.4" sources."uuid-8.3.2" @@ -13750,11 +15355,11 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.14" + sources."vm2-3.9.17" sources."vue-2.7.14" sources."vue-agile-2.0.0" sources."vue-color-2.8.1" - sources."vue-demi-0.13.11" + sources."vue-demi-0.14.0" sources."vue-fragment-1.5.1" sources."vue-i18n-8.28.2" sources."vue-infinite-loading-2.4.5" @@ -13780,14 +15385,15 @@ in sources."semver-5.7.1" ]; }) + sources."window-size-0.1.4" (sources."winston-3.8.2" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) (sources."winston-transport-4.5.0" // { dependencies = [ - sources."readable-stream-3.6.1" + sources."readable-stream-3.6.2" ]; }) sources."wmf-1.0.2" @@ -13795,15 +15401,16 @@ in sources."word-wrap-1.2.3" sources."wordwrap-1.0.0" sources."wrap-ansi-6.2.0" + sources."wrap-ansi-cjs-7.0.0" sources."wrappy-1.0.2" - sources."ws-8.12.1" + sources."ws-8.13.0" sources."xlsx-0.17.5" sources."xml-1.0.1" sources."xml-crypto-3.0.1" - sources."xml2js-0.4.23" + sources."xml2js-0.5.0" sources."xmlbuilder-11.0.1" + sources."xmllint-wasm-3.0.1" sources."xpath-0.0.32" - sources."xpath.js-1.1.0" sources."xregexp-2.0.0" (sources."xss-1.0.14" // { dependencies = [ @@ -13813,10 +15420,15 @@ in sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-2.1.2" - sources."yamljs-0.3.0" + (sources."yamljs-0.3.0" // { + dependencies = [ + sources."glob-7.2.3" + ]; + }) sources."yargs-17.1.1" sources."yargs-parser-20.2.9" sources."yn-3.1.1" + sources."yocto-queue-0.1.0" sources."yup-0.32.11" ]; buildInputs = globalBuildInputs; From a23730167676c5aac4a0ac710162220e104e1336 Mon Sep 17 00:00:00 2001 From: Norman Gray Date: Tue, 2 May 2023 11:42:16 +0100 Subject: [PATCH 189/203] lilypond: adjust fontconfig on macOS This addresses issue #209525. The code changes are from @yurrriq. --- pkgs/misc/lilypond/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/misc/lilypond/default.nix b/pkgs/misc/lilypond/default.nix index 759ecdc68e4d..ef861068fa49 100644 --- a/pkgs/misc/lilypond/default.nix +++ b/pkgs/misc/lilypond/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile , python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff +, freefont_ttf, makeFontsConf , makeWrapper, t1utils, boehmgc, rsync , texlive, tex ? texlive.combine { inherit (texlive) scheme-small lh metafont epsf fontinst; @@ -62,4 +63,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ marcweber yurrriq ]; platforms = platforms.all; }; + + FONTCONFIG_FILE = lib.optional stdenv.isDarwin (makeFontsConf { + fontDirectories = [ freefont_ttf ]; + }); } From 3189e8abaea21328c9a8731f5bb23eb9fe267e5b Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Fri, 5 May 2023 12:12:07 -0700 Subject: [PATCH 190/203] probe-run: 0.3.8 -> 0.3.9 --- pkgs/development/tools/rust/probe-run/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index 38ce9e932d4c..f69ebb750db5 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.8"; + version = "0.3.9"; src = fetchCrate { inherit pname version; - hash = "sha256-e5HXqqnRnz+6RHOZnZ4VTJhiYKeBSHEjdKBAPKLXf5Q="; + hash = "sha256-VNFLX+aPkanX573YpRok2JUWf74O7gtlgmuHkI30y2g="; }; - cargoHash = "sha256-8Hpjrjd+dCu9eaFxJ3SRHNBuRaNmvt42vkN2ls3hskA="; + cargoHash = "sha256-cjr7lNwzqcIfjXn1CVHKgeRZlsJ0QG+0x9h6q5e3D0o="; nativeBuildInputs = [ pkg-config From 597c74fe229850987718e2c2c4fd67370a8fdfb1 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 5 May 2023 21:40:29 +0200 Subject: [PATCH 191/203] gitea: 1.19.2 -> 1.19.3 (#229959) --- pkgs/applications/version-management/gitea/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 9d78f7793efa..fabf0907b369 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -19,12 +19,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.19.2"; + version = "1.19.3"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { - url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-L0wedLLQ8NBiw7JQ5AiFa+kQb+Vg0jnBtSGtgIknIDg="; + url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; + hash = "sha256-rSvBeSnJ356Yba7tZXg0S11ZRzYmF3xnOl4ZUJ8XQYw="; }; vendorHash = null; From f573cfb988837fb1eae35dbc1880fc16d285ce62 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 May 2023 22:00:02 +0200 Subject: [PATCH 192/203] python310Packages.hatasmota: 0.6.4 -> 0.6.5 Diff: https://github.com/emontnemery/hatasmota/compare/refs/tags/0.6.4...0.6.5 Changelog: https://github.com/emontnemery/hatasmota/releases/tag/0.6.5 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 8cb980f84067..1491587ade27 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.6.4"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fE5klk4ToayRyUmE2xtcMMsH4VKOKZHqvBCa9GG84rU="; + hash = "sha256-DqXGvn7vYC3SXOM/u+nMUshgBUe0O6Dcffaxh9vFohk="; }; propagatedBuildInputs = [ From 892e66d0aebd390cf095f2c2da067c83132f4661 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 May 2023 22:02:08 +0200 Subject: [PATCH 193/203] python310Packages.onvif-zeep-async: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/onvif-zeep-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix index d39bcf5a09b7..e0eef809ba98 100644 --- a/pkgs/development/python-modules/onvif-zeep-async/default.nix +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "onvif-zeep-async"; - version = "2.1.0"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HQ8SUr4LSelXjRYZRMJixfk/H38zEYg/Qaj23mdAhV8="; + hash = "sha256-y4o3zsLacbOVLZpa3mljdXuzVEGRzkc+Be6pt+UMLrA="; }; propagatedBuildInputs = [ From 43299e75afd8e555a5f11dc7776c23779b53c3ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 May 2023 22:04:04 +0200 Subject: [PATCH 194/203] home-assistant: 2023.5.1 -> 2023.5.2 https://github.com/home-assistant/core/releases/tag/2023.5.2 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 6 +++--- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index a0a388218639..c9cf4c40d59e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.5.1"; + version = "2023.5.2"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c31862f59d1a..402b75c4a093 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -321,7 +321,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.5.1"; + hassVersion = "2023.5.2"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -337,7 +337,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-SnNZE2FFL+PVnAoX661d5d4P1drbSPZQsL25mi4TuNI="; + hash = "sha256-vBDYNnwx+9fjiVkMelDoaDtYwBKEq5BibLEs8iwIIFo="; }; # Secondary source is git for tests @@ -345,7 +345,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-ddD9hBN+UU9Z3zfNsymD7O5Fi5v1Xuh2wMPmfhrsoO8="; + hash = "sha256-4YvGxBr8YmOz5kzPJ9ve7mlWxwe9BfkQgLxjst4IIJ8="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index cadc4ca02763..94d868e3dbb4 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230503.2"; + version = "20230503.3"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-Iz7GviL5qRjEE+I15NpquJ3seHFJPnoMasChIti4mYY="; + hash = "sha256-BOSXRpHgHUygrbd7LaGHFj5aM+Bfp5VkB791tJ5jCwU="; }; # there is nothing to strip in this package From 2ddbabec4ddcd99d662f4251ce6a234959cb6466 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 5 May 2023 22:33:09 +0200 Subject: [PATCH 195/203] nixos/xserver: fix xserver.conf reproducibility (sort ModulePath entries) --- nixos/modules/services/x11/xserver.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index fcc18c9a26fd..c0051a2ce38f 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -121,7 +121,7 @@ let fi done - for i in $(find ${toString cfg.modules} -type d); do + for i in $(find ${toString cfg.modules} -type d | sort); do if test $(echo $i/*.so* | wc -w) -ne 0; then echo " ModulePath \"$i\"" >> $out fi From c947bf5c0cd0b7629d8af74d2a7cb6d967b91cf0 Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 5 May 2023 22:43:46 +0200 Subject: [PATCH 196/203] nixos/release-notes: add systemd-repart --- nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 51d8136e203a..4a57ac25ef0d 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -48,6 +48,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [Deepin Desktop Environment](https://github.com/linuxdeepin/dde), an elegant, easy to use and reliable desktop environment. Available as [services.xserver.desktopManager.deepin](options.html#opt-services.xserver.desktopManager.deepin). +- [system-repart](https://www.freedesktop.org/software/systemd/man/systemd-repart.service.html), grow and add partitions to a partition table. Available as [systemd.repart](options.html#opt-systemd.repart) and [boot.initrd.systemd.repart](options.html#opt-boot.initrd.systemd.repart) + - [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion). - [readarr](https://github.com/Readarr/Readarr), Book Manager and Automation (Sonarr for Ebooks). Available as [services.readarr](options.html#opt-services.readarr.enable). From e43083ae663f21b0538c9d6ec76c97633f66c1b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 22:57:47 +0200 Subject: [PATCH 197/203] python311Packages.pyinstrument: 4.1.1 -> 4.4.0 Diff: https://github.com/joerick/pyinstrument/compare/v4.1.1...v4.4.0 --- pkgs/development/python-modules/pyinstrument/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix index 45425e1d1187..acff1fba1c98 100644 --- a/pkgs/development/python-modules/pyinstrument/default.nix +++ b/pkgs/development/python-modules/pyinstrument/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyinstrument"; - version = "4.1.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "joerick"; repo = pname; rev = "v${version}"; - hash = "sha256-4gM60UhzN+VnNMTHw6NSU7/LUPHaMgg105D+dO6SDfg="; + hash = "sha256-0GbJkYBgSOIZrHSKM93SW93jXD+ieYN6A01kWoFbyvQ="; }; # Module import recursion From 3873925dbf14a4fc3d97924e7cb783e8377fe2bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 23:00:20 +0200 Subject: [PATCH 198/203] python311Packages.strawberry-graphql: 0.176.0 -> 0.176.3 Changelog: https://github.com/strawberry-graphql/strawberry/blob/0.176.3/CHANGELOG.md --- .../python-modules/strawberry-graphql/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 6f4dfd7689f7..cb21c2993107 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -26,6 +26,7 @@ , pytest-django , pytest-emoji , pytest-flask +, pytest-mock , pytest-snapshot , pytestCheckHook , python-dateutil @@ -41,7 +42,7 @@ buildPythonPackage rec { pname = "strawberry-graphql"; - version = "0.176.0"; + version = "0.176.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -50,7 +51,7 @@ buildPythonPackage rec { owner = "strawberry-graphql"; repo = "strawberry"; rev = "refs/tags/${version}"; - hash = "sha256-e61wLFqc3HLCWUiVW3Gzbay1Oi8b7HsLT3+jPnbA4YY="; + hash = "sha256-O57gCJiLlR3k45V6cRNd9AHo9EGoWd7WRMmnV/8xFyQ="; }; patches = [ @@ -149,6 +150,7 @@ buildPythonPackage rec { mypy pytest-asyncio pytest-emoji + pytest-mock pytest-snapshot pytestCheckHook sanic-testing From 57a2b8e314db06eefafb9b119bb7d56b1485ee43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 May 2023 19:12:21 +0000 Subject: [PATCH 199/203] clusterctl: 1.4.1 -> 1.4.2 --- pkgs/applications/networking/cluster/clusterctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 7564a2c0c96b..ef27ddc67df7 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-ST/3zoZgeG0P8TwxHEKucZ7DHoD6e6Qx47jv6e+r4Rs="; + hash = "sha256-NvCQs6YzQ2zNLQiYgFK/q2c74g/+YkzQIQJWEINOYIE="; }; vendorHash = "sha256-ZJFpzBeC048RZ6YfjXQPyohCO1WagxXvBBacifkfkjE="; From c4ef5f07cc1f1c8906cfe477bc638e0ebd919c47 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 23:05:21 +0200 Subject: [PATCH 200/203] python311Packages.pylitterbot: remove postPatch section --- pkgs/development/python-modules/pylitterbot/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index 598d35888b7b..912b968538b8 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -43,12 +43,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/natekspencer/pylitterbot/issues/73 - substituteInPlace pyproject.toml \ - --replace 'deepdiff = "^5.8.1"' 'deepdiff = ">=5.8.1"' - ''; - pythonImportsCheck = [ "pylitterbot" ]; From 6fb76c52e049327654ee11f126daa03ade909714 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 23:14:04 +0200 Subject: [PATCH 201/203] python311Packages.velbus-aio: 2023.2.0 -> 2023.5.0 Diff: https://github.com/Cereal2nd/velbus-aio.git/compare/2023.2.0...2023.5.0 Changelog: https://github.com/Cereal2nd/velbus-aio/releases/tag/2023.5.0 --- pkgs/development/python-modules/velbus-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index 881c24d25b12..acce834fa7a1 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2023.2.0"; + version = "2023.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = pname; rev = version; - hash = "sha256-y8M9Zf/CMM7NH0Sr7E9sx7JnOFGlExEk7cFEGrHBi7g="; + hash = "sha256-8wRgH7t1s2X7mg3oN38KMvJQfWcn/ePw6rNIl2K9nNA="; fetchSubmodules = true; }; From ceab951fe16b05e736f56f7b9f41558d573703bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 5 May 2023 23:25:30 +0200 Subject: [PATCH 202/203] python311Packages.pyswitchbee: 1.7.21 -> 1.7.26 Diff: https://github.com/jafar-atili/pySwitchbee/compare/refs/tags/1.7.21...1.7.26 Changelog: https://github.com/jafar-atili/pySwitchbee/releases/tag/1.7.26 --- pkgs/development/python-modules/pyswitchbee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbee/default.nix b/pkgs/development/python-modules/pyswitchbee/default.nix index 978fc21ac92f..fb2a12992f77 100644 --- a/pkgs/development/python-modules/pyswitchbee/default.nix +++ b/pkgs/development/python-modules/pyswitchbee/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyswitchbee"; - version = "1.7.21"; + version = "1.7.26"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jafar-atili"; repo = "pySwitchbee"; rev = "refs/tags/${version}"; - hash = "sha256-3Ujs9GgdJm69vb8F00ZWaRgWXxkaPguX5DJ71bqOFec="; + hash = "sha256-g8g0QSih2AM/xPHdjuYGj6eB+kKqldjNHZ2Co60mUnk="; }; nativeBuildInputs = [ From cac19e02668e2c0e1ad2aa20db3041dbca00e739 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 6 May 2023 00:16:26 +0200 Subject: [PATCH 203/203] trivial-builders: move into the directory named alike (#223429) While searching for something different I wondered why there is a trivial-builders.nix file next to the trivial-builders directory where only tests live. Lets fix that. --- .../{trivial-builders.nix => trivial-builders/default.nix} | 0 pkgs/development/interpreters/lua-5/wrap-lua.nix | 2 +- pkgs/development/interpreters/octave/wrap-octave.nix | 2 +- pkgs/top-level/stage.nix | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/build-support/{trivial-builders.nix => trivial-builders/default.nix} (100%) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders/default.nix similarity index 100% rename from pkgs/build-support/trivial-builders.nix rename to pkgs/build-support/trivial-builders/default.nix diff --git a/pkgs/development/interpreters/lua-5/wrap-lua.nix b/pkgs/development/interpreters/lua-5/wrap-lua.nix index 43ececd1e794..b6e24a44ee65 100644 --- a/pkgs/development/interpreters/lua-5/wrap-lua.nix +++ b/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -4,7 +4,7 @@ , makeWrapper }: -# defined in trivial-builders.nix +# defined in trivial-builders # imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput makeSetupHook { name = "wrap-lua-hook"; diff --git a/pkgs/development/interpreters/octave/wrap-octave.nix b/pkgs/development/interpreters/octave/wrap-octave.nix index 2317a479f0e2..1959ba6c4925 100644 --- a/pkgs/development/interpreters/octave/wrap-octave.nix +++ b/pkgs/development/interpreters/octave/wrap-octave.nix @@ -4,7 +4,7 @@ , makeWrapper }: -# Defined in trivial-builders.nix +# Defined in trivial-builders # Imported as wrapOctave in octave/default.nix and passed to octave's buildEnv # as nativeBuildInput # Each of the substitutions is available in the wrap.sh script as @thingSubstituted@ diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index b796b26307e7..86535cad8f9d 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -101,7 +101,7 @@ let }; trivialBuilders = self: super: - import ../build-support/trivial-builders.nix { + import ../build-support/trivial-builders { inherit lib; inherit (self) runtimeShell stdenv stdenvNoCC haskell; inherit (self.pkgsBuildHost) shellcheck;