From deae0161005f1fe8b7e4b7eb0c4897cfe73dd8cb Mon Sep 17 00:00:00 2001 From: Serg Date: Tue, 6 Feb 2024 23:27:14 +0300 Subject: [PATCH 01/62] geeqie: 2.1 -> 2.2 --- pkgs/applications/graphics/geeqie/default.nix | 43 +++++++++++++------ 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 653dad23b638..bf1e69e9152a 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -2,36 +2,32 @@ , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida , libarchive, djvulibre, libheif, openjpeg, libjxl, libraw, lua5_3, poppler , gspell, libtiff, libwebp +, gphoto2, imagemagick, yad, exiftool, gnome, libnotify , wrapGAppsHook, fetchpatch, doxygen , nix-update-script }: stdenv.mkDerivation rec { pname = "geeqie"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; rev = "v${version}"; - hash = "sha256-qkM/7auZ9TMF2r8KLnitxmvlyPmIjh7q9Ugh+QKh8hw="; + hash = "sha256-13Ayr6r4JhqexaUvwzdc6XHT+j2l2D5YBws6gSAhU3Y="; }; patches = [ + # Remove changelog from menu (fetchpatch { - name = "exiv2-0.28.0-support-1.patch"; - url = "https://github.com/BestImageViewer/geeqie/commit/c45cca777aa3477eaf297db99f337e18d9683c61.patch"; - hash = "sha256-YiFzAj3G3Z2w7p+8zZlDBjWqUqnfSqvaxMkESfPFdzc="; + url = "https://salsa.debian.org/debian/geeqie/-/raw/debian/master/debian/patches/Remove-changelog-from-menu-item.patch"; + hash = "sha256-0awKKTLg/gUZhmwluVbHCOqssog9SneFOaUtG89q0go="; }) + # Fix missing execute permissions for geocode-parametres.awk plugin (fetchpatch { - name = "exiv2-0.28.0-support-2.patch"; - url = "https://github.com/BestImageViewer/geeqie/commit/b04f7cd0546976dc4f7ea440648ac0eedd8df3ce.patch"; - hash = "sha256-V0ZOHbAZOrhLcNN+Al1/kvxvbw0vc/R7r99CegjuBQg="; - }) - (fetchpatch { - name = "fix-compilation-with-lua.patch"; - url = "https://github.com/BestImageViewer/geeqie/commit/a132645ee87e612217ac955b227cad04f21a5722.patch"; - hash = "sha256-BozarBPoIKxZS3qpjuzHHAWZGIWZAwvJyqsNC8v+TMk="; + url = "https://github.com/BestImageViewer/geeqie/commit/4d3ddcf5b9c0668bfdaf1dfe24219ee57c2f0237.patch"; + hash = "sha256-Na2qiwCTbOv1yt251oaSZiLaOwJCkjWew+us4lQju0I="; }) ]; @@ -54,8 +50,29 @@ stdenv.mkDerivation rec { postInstall = '' # Allow geeqie to find exiv2 and exiftran, necessary to # losslessly rotate JPEG images. + # Requires exiftran (fbida package) and exiv2. sed -i $out/lib/geeqie/geeqie-rotate \ -e '1 a export PATH=${lib.makeBinPath [ exiv2 fbida ]}:$PATH' + # Zenity and yad are used in some scripts for reporting errors. + # Allow change quality of image. + # Requires imagemagick and yad. + sed -i $out/lib/geeqie/geeqie-resize-image \ + -e '1 a export PATH=${lib.makeBinPath [ imagemagick yad ]}:$PATH' + # Allow to crop image. + # Requires imagemagick, exiv2 and exiftool. + sed -i $out/lib/geeqie/geeqie-image-crop \ + -e '1 a export PATH=${lib.makeBinPath [ imagemagick exiv2 exiftool gnome.zenity ]}:$PATH' + # Requires gphoto2 and libnotify + sed -i $out/lib/geeqie/geeqie-tethered-photography \ + -e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity libnotify ]}:$PATH' + # Import images from camera. + # Requires gphoto2. + sed -i $out/lib/geeqie/geeqie-camera-import \ + -e '1 a export PATH=${lib.makeBinPath [ gphoto2 gnome.zenity ]}:$PATH' + # Export jpeg from raw file. + # Requires exiv2, exiftool and lcms2. + sed -i $out/lib/geeqie/geeqie-export-jpeg \ + -e '1 a export PATH=${lib.makeBinPath [ gnome.zenity exiv2 exiftool lcms2 ]}:$PATH' ''; enableParallelBuilding = true; From 84a7adecfaf541644e860f7898c89bdca2344747 Mon Sep 17 00:00:00 2001 From: Terts Diepraam Date: Tue, 26 Mar 2024 16:11:57 +0100 Subject: [PATCH 02/62] vscode-extensions.teabyii.ayu: init at 1.0.5 --- .../editors/vscode/extensions/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6f61a18d8358..7bf501555afe 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4071,6 +4071,21 @@ let }; }; + teabyii.ayu = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "ayu"; + publisher = "teabyii"; + version = "1.0.5"; + sha256 = "sha256-+IFqgWliKr+qjBLmQlzF44XNbN7Br5a119v9WAnZOu4="; + }; + meta = { + description = "A simple theme with bright colors and comes in three versions — dark, light and mirage for all day long comfortable work."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=teabyii.ayu"; + homepage = "https://github.com/ayu-theme/vscode-ayu"; + license = lib.licenses.mit; + }; + }; + techtheawesome.rust-yew = buildVscodeMarketplaceExtension { mktplcRef = { name = "rust-yew"; From 3dd227aacbc9418a96bef91a0932aa0573019896 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 27 Mar 2024 15:36:06 -0400 Subject: [PATCH 03/62] garnet: init at 1.0.1 --- pkgs/by-name/ga/garnet/deps.nix | 88 ++++++++++++++++++++++++++++++ pkgs/by-name/ga/garnet/package.nix | 40 ++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 pkgs/by-name/ga/garnet/deps.nix create mode 100644 pkgs/by-name/ga/garnet/package.nix diff --git a/pkgs/by-name/ga/garnet/deps.nix b/pkgs/by-name/ga/garnet/deps.nix new file mode 100644 index 000000000000..daad19f76445 --- /dev/null +++ b/pkgs/by-name/ga/garnet/deps.nix @@ -0,0 +1,88 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Azure.Core"; version = "1.25.0"; sha256 = "0wyrv74kqrr0scfz84sxniab88412fi91dw2h7sv315x2qkvindz"; }) + (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.14.1"; sha256 = "1k7jsin7p7zzqbfxvfz5xrzb46vqbbn569m3hd498mvf2f664yz4"; }) + (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.13.0"; sha256 = "06ngbyrqabnmbwac7p0yhayjvva7nj6cb3n9agmhd5mvrwhanbvf"; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.27"; sha256 = "11sfm0vb8grybwdfzl9y3y1v9jg94rn3fpsf0995xm1qgk57piiv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.16"; sha256 = "1nrk00w3jkb1r3m8zn7c05snan02b6s7n5s93aq2dl9kz0bm530c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.27"; sha256 = "078vz7l3sw25jxkhxf646hwc1csasna4n04rjq6vcv30c9kx3lp9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.16"; sha256 = "0g4zxka97q3bdc72yql296hx2laim5b4rfb8vxmknzdpzj0ydiks"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.27"; sha256 = "0cdvdbvvbky0y60732j2n2jjycgpm2ngx38hl6zq198xm1d4g43x"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.16"; sha256 = "0zy1zarikg4d1g06ax3zdjvfysw2393b9fgg7xnracqi17hr38ah"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.27"; sha256 = "11l2a80xxinf08m9i6jdy0nkjpdjs9llqb8gs7x0762cnyhds7la"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.16"; sha256 = "1wgmbbn81rbqlx44hg9zqrrcmiinss1qhgfsq37vzy2i8ycyn59w"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.27"; sha256 = "0r7qqwkqm9lraqwc25aadbg856v006h17yj8cxmp800iz7288k07"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.16"; sha256 = "1ggcy57k31bxqk6k1hsbmzxkyly9bzch7dw7fgl2yx4a439nkh54"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Git"; version = "1.1.1"; sha256 = "1bb5p4zlnfn88skkvymxfsn0jybqncl4356hwnic9jxdq2d4fz1w"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "7.0.0"; sha256 = "0n1grglxql9llmrsbbnlz5chx8mxrb5cpvjngm0hfyrkgzcwz90d"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "7.0.0"; sha256 = "1qifb1pv7s76lih8wnjk418wdk4qwn87q2n6dx54knfvxai410bl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "7.0.0"; sha256 = "1f5fhpvzwyrwxh3g1ry027s4skmklf6mbm2w0p13h0x6fbmxcb24"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "7.0.0"; sha256 = "1m8ri2m3vlv9vzk0068jkrx0vkk4sqmk1kxmn8pc3wys38d38qaf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.28.1"; sha256 = "0g5a5w34263psh90mp1403m9bh3pcfw6z29vlzdpllzbifk0licr"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.34.0"; sha256 = "0dgn51k142f73l6fk4bsqrpwqhcw6s8y98548kczbzy7qxcnyp82"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.34.0"; sha256 = "0c01dqya958z9ypf0155aqdkvkz9j4j5mgnygxzkisri2cs2w7gs"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.28.1"; sha256 = "15bq83wi4h8f1lqinijdqd7vg6n2v77hyza20mjqcp1h3hl2vj43"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.34.0"; sha256 = "0fm4nrihhqn4wrcj2q06rzfrfzgzilb7ch3izkv89c4q74x0yhkb"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols"; version = "6.28.1"; sha256 = "03zmp6bsxg4chm89pl5sh506jc19aljxbfsvbqazcci5wqyacnr8"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Protocols.OpenIdConnect"; version = "6.28.1"; sha256 = "0p1ib8559h2i290v7qyz8rq2aybdknplx1p36ylik695l7b3rqvm"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.28.1"; sha256 = "0ckpjjdy2rv1z7ivqrkc7z16rcqygxzs0la80g8df68p4xxfa0c5"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.34.0"; sha256 = "1vkjwryz4wdsaawfq3r80qrmfiyv2zp9y6fzkf2014sqw4nf1vwl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.27"; sha256 = "0p0apwm7xpwwvjl453livb8ngvc0izjp5yfpgv116vhig2mxszsa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.16"; sha256 = "0wxa2mm34l32324rywns3bphxrkxm265wxck93z030klwvxdalri"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.27"; sha256 = "1vglh2l7brp6qbdngiiwsjwsp3cyzbzjcjw7dwqhfk0whc7n96kg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.16"; sha256 = "1xiq43br5lk1xa4d4wzhdpn9lz3mixmyxggzbsf4i4q5692rv35f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.27"; sha256 = "14zd7mgl866bhqqrcb6q3xbwrllks1nmfzhnbm8rf7h5cqqrqwbn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.16"; sha256 = "0ln013191h2rkhm8xss4aqbb52ywp44rjfnn7pip99wdx66bkazs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.27"; sha256 = "1kf3sm7hkqz5a4y5rb49yna10041f1h3lcqx885xlbhyb4q67gi9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.16"; sha256 = "1b8w278n8hcxysjs56ghx4pdbfall66nnmk1kx5a0my7lp7yp6xf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.27"; sha256 = "15fwbjq2r406fq175j2lsh4f91iiipmvaq96nsba3q2fh0c433zm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.16"; sha256 = "19lnkab2p8nkfc4jag0whkv51v3qabwdyzjk6xgj61i6s8lnnz1f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.27"; sha256 = "1dxvssf7rx05bipj03g8jm36j2mmdm13sg8rdwn6aa6whbwpip0r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.16"; sha256 = "1qb3pk1kgvwjc2n4kqfx4bqjmaihjf8cd9cfkqkkwmnnw9jd7f83"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.27"; sha256 = "1j913pm78h35kvcm70276cnfvjn1r7r6jsc3jm1y0vb395qy6nfd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.16"; sha256 = "1w41xwdikkyplxr1kqfn1fwjvbglgsaripgdglhdx9qdxgr3nfi3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.27"; sha256 = "1mbjbj9c7sxw0hfq25ypv56hi9kik3vrrvr8ika3wcwv1ilpvczj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.16"; sha256 = "0xgd5nj5nx3w3m9cbh3b6r0c2w5svxjkslwqq35w445vjhq435fz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.27"; sha256 = "0dr1y76wgkqnkjxk5m8ps2g086sn4kp3a04v0ynarw5j0cipg994"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.16"; sha256 = "0mghc3ihk2j60yyrb57k200ddmhj5impl81lldpxxx9821pb0qha"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.Common"; version = "1.1.1"; sha256 = "0xkdqs7az2cprar7jzjlgjpd64l6f8ixcmwmpkdm03fyb4s5m0bg"; }) + (fetchNuGet { pname = "Microsoft.SourceLink.GitHub"; version = "1.1.1"; sha256 = "099y35f2npvva3jk1zp8hn0vb9pwm2l0ivjasdly6y2idv53s5yy"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.6.0"; sha256 = "07pff0y96hj0k0izgmqlxydnx8cpsvfymicwi4m3dix979sdly09"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.34.0"; sha256 = "150ybq4ba9sm3c37d758ngja6wz72f0840d8vfs6bhy6pw0svzwy"; }) + (fetchNuGet { pname = "System.Interactive.Async"; version = "6.0.1"; sha256 = "17zzdxx7ibfwnxspxxi197a0gfgcqdzgrcza8dlwj13yi9vf8b73"; }) + (fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; sha256 = "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41"; }) + (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) + (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) +] diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix new file mode 100644 index 000000000000..4684f924750b --- /dev/null +++ b/pkgs/by-name/ga/garnet/package.nix @@ -0,0 +1,40 @@ +{ + lib, + buildDotnetModule, + fetchFromGitHub, + garnet, + dotnetCorePackages, +}: +buildDotnetModule { + pname = "garnet"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "garnet"; + rev = "v${garnet.version}"; + hash = "sha256-elUmM9Yw1/gazIV194P+noIm7ajQpRTccEhD5gN9D2Q="; + }; + + projectFile = "main/GarnetServer/GarnetServer.csproj"; + nugetDeps = ./deps.nix; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + dotnetInstallFlags = ["-f" "net8.0"]; + + meta = with lib; { + mainProgram = "GarnetServer"; + description = "A remote cache-store from Microsoft Research"; + longDescription = '' + A remote cache-store that offers strong performance, scalability, + storage, recovery, cluster sharding, key migration, replication features, + and compatibility with existing Redis clients + ''; + homepage = "https://microsoft.github.io/garnet/"; + changelog = "https://github.com/microsoft/garnet/releases/tag/v${garnet.version}"; + license = licenses.mit; + maintainers = with maintainers; [getchoo]; + }; +} From 69c456355107b2e7e6939ff38a0efb5570e6c9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Thu, 4 Apr 2024 09:26:58 +0900 Subject: [PATCH 04/62] nixos/yubikey-agent: update doc ref to pinentry References: b437b19f5471 ("nixos/yubikey-agent: fix eval error") --- nixos/modules/services/security/yubikey-agent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/yubikey-agent.nix b/nixos/modules/services/security/yubikey-agent.nix index 3d5f84af2cf4..f7ee952e7f61 100644 --- a/nixos/modules/services/security/yubikey-agent.nix +++ b/nixos/modules/services/security/yubikey-agent.nix @@ -23,7 +23,7 @@ in SSH_AUTH_SOCK to point at yubikey-agent. Note that yubikey-agent will use whatever pinentry is - specified in programs.gnupg.agent.pinentryFlavor. + specified in programs.gnupg.agent.pinentryPackage. ''; }; From bc576f9c0ebd397225ac312ab7f16856589a6c76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Apr 2024 07:41:59 +0000 Subject: [PATCH 05/62] cemu: 2.0-73 -> 2.0-74 --- pkgs/applications/emulators/cemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 51454ea7ab16..2b3f5e28a8cf 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-73"; + version = "2.0-74"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-uiAga19DTFMq4/7ndOafkY/QvSJhWDSMMg8RV+KxN+E="; + hash = "sha256-taV2HEKRUQ7k5BpgA3nwVzX8qkTN02O9kqswjdCHod0="; }; patches = [ From b5cea4a3c5a6ea3050f8223b8c9c72d2be1f825e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Apr 2024 11:20:11 +0000 Subject: [PATCH 06/62] python311Packages.umap-learn: 0.5.5 -> 0.5.6 --- pkgs/development/python-modules/umap-learn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index abb17d43040f..195dde57bf2e 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "umap-learn"; - version = "0.5.5"; + version = "0.5.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "lmcinnes"; repo = "umap"; rev = "refs/tags/release-${version}"; - hash = "sha256-bXAQjq7xBYn34tIZF96Sr5jDUii3s4FGkNx65rGKXkY="; + hash = "sha256-fqYl8T53BgCqsquY6RJHqpDFsdZA0Ihja69E/kG3YGU="; }; propagatedBuildInputs = [ From c0fe794bff594f35b968a998091638bba641c5db Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 5 Apr 2024 16:18:13 +0200 Subject: [PATCH 07/62] ffmpeg_7: init at 7.0 --- pkgs/development/libraries/ffmpeg/default.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 12 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 5c15239541d8..65e12e6b3672 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -33,6 +33,11 @@ let version = "6.1.1"; hash = "sha256-Q0c95hbCVUHQWPoh5uC8uzMylmB4BnWg+VhXEgSouzo="; }; + + v7 = { + version = "7.0"; + hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM="; + }; in rec { @@ -48,6 +53,10 @@ rec { ffmpeg_6-headless = mkFFmpeg v6 "headless"; ffmpeg_6-full = mkFFmpeg v6 "full"; + ffmpeg_7 = mkFFmpeg v7 "small"; + ffmpeg_7-headless = mkFFmpeg v7 "headless"; + ffmpeg_7-full = mkFFmpeg v7 "full"; + # Please make sure this is updated to the latest version on the next major # update to ffmpeg # Packages which use ffmpeg as a library, should pin to the relevant major diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1fb55c5584c..59438e97fb48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20899,6 +20899,9 @@ with pkgs; ffmpeg_6 ffmpeg_6-headless ffmpeg_6-full + ffmpeg_7 + ffmpeg_7-headless + ffmpeg_7-full ffmpeg ffmpeg-headless ffmpeg-full; From 30cf86a53696828f048935b65dede5c6f9a4ad0b Mon Sep 17 00:00:00 2001 From: aikooo7 Date: Fri, 5 Apr 2024 19:10:33 +0000 Subject: [PATCH 08/62] vimPlugins.persisted-nvim: init at 2024-04-04 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b13c2a1efb89..f745453c2614 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8220,6 +8220,18 @@ final: prev: meta.homepage = "https://github.com/steelsojka/pears.nvim/"; }; + persisted-nvim = buildVimPlugin { + pname = "persisted.nvim"; + version = "2024-04-04"; + src = fetchFromGitHub { + owner = "olimorris"; + repo = "persisted.nvim"; + rev = "ca9900c31ee6e254a0ba7011ba49f48ebf4c8db2"; + sha256 = "0s9g1jmq1qzkxi1gcvmyf0nmwgqrh11r0swy9pl32916k37zvqzl"; + }; + meta.homepage = "https://github.com/olimorris/persisted.nvim/"; + }; + persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; version = "2023-10-15"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 6c68c0ea92b4..d4f0dfbbb5c9 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -690,6 +690,7 @@ https://github.com/roobert/palette.nvim/,HEAD, https://github.com/NLKNguyen/papercolor-theme/,, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, +https://github.com/olimorris/persisted.nvim/,HEAD, https://github.com/folke/persistence.nvim/,, https://github.com/andsild/peskcolor.vim/,, https://github.com/pest-parser/pest.vim/,HEAD, From f57298689f96433087c51891148e2f5b7908aef0 Mon Sep 17 00:00:00 2001 From: twitchy0 Date: Fri, 5 Apr 2024 21:18:52 -0400 Subject: [PATCH 09/62] ngrid: init at 0.1.0 --- pkgs/by-name/ng/ngrid/package.nix | 69 +++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 pkgs/by-name/ng/ngrid/package.nix diff --git a/pkgs/by-name/ng/ngrid/package.nix b/pkgs/by-name/ng/ngrid/package.nix new file mode 100644 index 000000000000..b609689663ec --- /dev/null +++ b/pkgs/by-name/ng/ngrid/package.nix @@ -0,0 +1,69 @@ +{ lib +, fetchFromGitHub +, python3 +, expect +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ngrid"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "twosigma"; + repo = "ngrid"; + rev = version; + hash = "sha256-69icp0m+bAHBsQFIDGd8NjfMsMYsB1sUfzuP/OBl5jc="; + }; + + nativeBuildInputs = [ + python3.pkgs.setuptools + python3.pkgs.wheel + ]; + + propagatedBuildInputs = [ + python3.pkgs.six + python3.pkgs.numpy + python3.pkgs.pytz + python3.pkgs.pandas + ]; + + pythonImportsCheck = [ "ngrid.main" ]; + + nativeCheckInputs = [ python3.pkgs.pytest expect ]; + checkPhase = '' + runHook preCheck + + pytest test/formatters.py + + echo -e "a,b,c\n1.98423,some string,5824.2" > test.csv + + expect < Date: Sat, 6 Apr 2024 15:21:27 +0000 Subject: [PATCH 10/62] microsoft-edge: 123.0.2420.53 -> 123.0.2420.81 --- .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 13eafe35d655..263169fff80a 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "123.0.2420.53"; + version = "124.0.2478.19"; revision = "1"; - hash = "sha256-6mE/zxVvGYrI7Emk5RBW+GC5W1FbVPFUeKMjev1yeFQ="; + hash = "sha256-+CanF7AadFQJj3t8OnZyoxPG2f2KO2e+EVBofKG3slg="; }; dev = import ./browser.nix { channel = "dev"; - version = "124.0.2464.2"; + version = "125.0.2492.1"; revision = "1"; - hash = "sha256-vNvSzoVSVewTbKrnE6f+0Hx/1N5gOvRcdRGsmunBJHA="; + hash = "sha256-S6DfXJfxR8FsHyRtCcvUialaVYP/1rPivjRVSm9XAtg="; }; stable = import ./browser.nix { channel = "stable"; - version = "123.0.2420.53"; + version = "123.0.2420.81"; revision = "1"; - hash = "sha256-7C6wZCIRodqWKimbnUl32TOhizsiE3U/be3tlpSNtt0="; + hash = "sha256-3c4DHs0p2YDW17nzCXB+O6PR9wTMb9h98EvN11imvsM="; }; } From 909948edb5753b97648850896116827fae73a3de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Apr 2024 23:30:06 +0000 Subject: [PATCH 11/62] upbound: 0.26.0 -> 0.28.0 --- pkgs/development/tools/upbound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/development/tools/upbound/default.nix index ef01000065f8..92031aa6dddf 100644 --- a/pkgs/development/tools/upbound/default.nix +++ b/pkgs/development/tools/upbound/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.26.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-xlPBz0FVG/bAUGH/RlguVG5rDcKMty7rX8Y+1VBbEpI="; + sha256 = "sha256-74kmEjJTcFYRgbuH8hFPS+sadVWk7FkFE+MrapQw/lw="; }; - vendorHash = "sha256-1NhcP/iEfEMtPSBP6wbTKi/fznoJ8HjaH88BPzVnf7w="; + vendorHash = "sha256-hNEM8U+3T4biEqGoN2ClKLSgKlfT/eoUkQQGiTrR2vM="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; From 3c70755cd37a01d22a74370455a2b90df446140f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Apr 2024 02:21:19 +0000 Subject: [PATCH 12/62] opentelemetry-collector: 0.96.0 -> 0.97.0 --- pkgs/tools/misc/opentelemetry-collector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index fb718c567c62..d8a42d82ed34 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.96.0"; + version = "0.97.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-/QGRxQRkVXuP3H6AWSqc1U7sA1n0jTNYLa+gQA25Q5M="; + hash = "sha256-0zTEaSylZEU7mCCrMf9aV8V0MMD4Au4y0zacWSLcujg="; }; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-n548376djwz4Qd9vlid0V9Dr9trLb09gKOP4J+9Znp4="; + vendorHash = "sha256-/8WxTtTTuwdPP/4Bix8d9nkR/w6MDKLyumv4KBx5VqU="; nativeBuildInputs = [ installShellFiles ]; From a9d1901115b47b532a249a37f33f3141cd952ee7 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Sun, 7 Apr 2024 23:14:54 +0200 Subject: [PATCH 13/62] gvisor: 20240311.0-unstable-2024-03-25 -> 20240401.0 --- .../gvisor/default.nix => by-name/gv/gvisor/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) rename pkgs/{applications/virtualization/gvisor/default.nix => by-name/gv/gvisor/package.nix} (87%) diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/by-name/gv/gvisor/package.nix similarity index 87% rename from pkgs/applications/virtualization/gvisor/default.nix rename to pkgs/by-name/gv/gvisor/package.nix index 0a1d737b2eed..ceb122a2c08d 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/by-name/gv/gvisor/package.nix @@ -10,7 +10,7 @@ buildGoModule { pname = "gvisor"; - version = "20240311.0-unstable-2024-03-25"; + version = "20240401.0"; # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go) # that can be used to build gvisor without bazel. @@ -19,8 +19,8 @@ buildGoModule { src = fetchFromGitHub { owner = "google"; repo = "gvisor"; - rev = "b1e227737fd6e3bb3b11a403a1a5013bc89b3b60"; - hash = "sha256-EfXzXkoEgtEerNMacRhbITCRig+t23WlIRya0BlJZcE="; + rev = "9d995324d058812a5476f8c06b20167012511e9c"; + hash = "sha256-idgUEbYAfnm/HphVs12Sj1FwG+jmL2BBr0PJnG9BC3A="; }; vendorHash = "sha256-jbMXeNXzvjfJcIfHjvf8I3ePjm6KFTXJ94ia4T2hUs4="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fea92ed7f74..f5a2ceb9981d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31747,8 +31747,6 @@ with pkgs; gv = callPackage ../applications/misc/gv { }; - gvisor = callPackage ../applications/virtualization/gvisor { }; - guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; gwc = callPackage ../applications/audio/gwc { }; From 1d887599bae19533b5af8f24bd77f3daaaa99cce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Apr 2024 01:33:28 +0000 Subject: [PATCH 14/62] i3status-rust: 0.33.0 -> 0.33.1 --- pkgs/applications/window-managers/i3/status-rust.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 74635d158829..b9ced38b5fe4 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DIEWmXqs4yNIJsBBhH7khOY6RJQ9qRoSTIHN/aeBuA4="; + hash = "sha256-9lzzjb6tDfgqjAT9mS/cWfC6ucNXoJ8JJwtZ0FZqlDA="; }; - cargoHash = "sha256-5946aMSndBkXCY0jjnhPc5x9wFOC1zjJNkFkMFFOuxo="; + cargoHash = "sha256-yeijJl94v+yKMVnU/Fjzapab/nExlvoznrx8Ydz/RvM="; nativeBuildInputs = [ pkg-config makeWrapper ]; From 2b54eba0f403adfc7278546c8ca7d1d93f6bf458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Mon, 8 Apr 2024 10:22:44 +0200 Subject: [PATCH 15/62] rustdesk-flutter: 1.2.3-unstable-2024-02-11 -> 1.2.3-2 --- pkgs/by-name/ru/rustdesk-flutter/Cargo.lock | 1818 +++++++++-------- pkgs/by-name/ru/rustdesk-flutter/package.nix | 68 +- .../ru/rustdesk-flutter/pubspec.lock.json | 279 ++- 3 files changed, 1087 insertions(+), 1078 deletions(-) diff --git a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock index ffc56162b809..71a84c474751 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock +++ b/pkgs/by-name/ru/rustdesk-flutter/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if 1.0.0", "cipher", @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom", "once_cell", @@ -41,9 +41,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -53,9 +53,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -118,9 +118,9 @@ dependencies = [ [[package]] name = "amf" version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#4650b5f1376f92c59a9cdbbbe05a744248325eec" +source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" dependencies = [ - "bindgen 0.59.2", + "bindgen 0.65.1", "cc", "gpu_common", "log", @@ -155,7 +155,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f" dependencies = [ "android_log-sys", - "env_logger 0.10.0", + "env_logger 0.10.2", "log", "once_cell", ] @@ -180,9 +180,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -194,9 +194,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -228,55 +228,17 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" - -[[package]] -name = "apple-bindgen" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f109ee76f68b4767848cb5dc93bfcc7c425deca849c4c81fa11cdce525e3d2" -dependencies = [ - "apple-sdk", - "bindgen 0.63.0", - "derive_more", - "regex", - "serde 1.0.195", - "thiserror", - "toml 0.6.0", -] - -[[package]] -name = "apple-sdk" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a04f192a700686ee70008ff4e4eb76fe7d11814ab93b7ee9d48c36b9a9f0bd2a" -dependencies = [ - "plist", - "serde 1.0.195", - "serde_json 1.0.111", -] - -[[package]] -name = "apple-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b3a1c3342678cd72676d0c1644fde496c1f65ea41f51465f54a89cad3bdf34" -dependencies = [ - "apple-bindgen", - "apple-sdk", - "objc", -] +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "arboard" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" +version = "3.3.1" +source = "git+https://github.com/fufesou/arboard?branch=feat/x11_set_conn_timeout#9e6f5357485afc4a4fd817f815c773beca57e1f3" dependencies = [ "clipboard-win", - "core-graphics 0.22.3", + "core-graphics 0.23.2", "image", "log", "objc", @@ -284,9 +246,9 @@ dependencies = [ "objc_id", "parking_lot", "thiserror", - "winapi 0.3.9", + "windows-sys 0.48.0", "wl-clipboard-rs", - "x11rb", + "x11rb 0.13.0", ] [[package]] @@ -301,13 +263,15 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.9.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 2.5.3", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", "futures-core", + "pin-project-lite", ] [[package]] @@ -325,15 +289,15 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.6.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +checksum = "10b3e585719c2358d2660232671ca8ca4ddb4be4ce8a1842d6c2dc8685303316" dependencies = [ - "async-lock", + "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite", + "fastrand 2.0.2", + "futures-lite 2.3.0", "slab", ] @@ -343,10 +307,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", - "autocfg 1.1.0", + "async-lock 2.8.0", + "autocfg 1.2.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -355,20 +319,39 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", - "autocfg 1.1.0", + "async-lock 2.8.0", + "autocfg 1.2.0", "cfg-if 1.0.0", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", - "polling", + "polling 2.8.0", "rustix 0.37.27", "slab", "socket2 0.4.10", "waker-fn", ] +[[package]] +name = "async-io" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock 3.3.0", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-io", + "futures-lite 2.3.0", + "parking", + "polling 3.5.0", + "rustix 0.38.32", + "slab", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "async-lock" version = "2.8.0" @@ -378,47 +361,58 @@ dependencies = [ "event-listener 2.5.3", ] +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + [[package]] name = "async-process" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-signal", "blocking", "cfg-if 1.0.0", - "event-listener 3.0.0", - "futures-lite", - "rustix 0.38.28", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.32", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "async-signal" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io", - "async-lock", + "async-io 2.3.2", + "async-lock 2.8.0", "atomic-waker", "cfg-if 1.0.0", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix 0.38.32", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -426,41 +420,40 @@ dependencies = [ [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "atk" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39991bc421ddf72f70159011b323ff49b0f783cc676a7287c59453da2e2531cf" +checksum = "b4af014b17dd80e8af9fa689b2d4a211ddba6eb583c1622f35d0cb543f6b17e4" dependencies = [ "atk-sys", - "bitflags 1.3.2", - "glib 0.16.9", + "glib 0.18.5", "libc", ] [[package]] name = "atk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148" +checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "system-deps 6.1.2", ] @@ -494,14 +487,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "backtrace" @@ -526,9 +519,9 @@ checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa" [[package]] name = "base64" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -551,7 +544,7 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "regex", "rustc-hash", @@ -559,28 +552,6 @@ dependencies = [ "which", ] -[[package]] -name = "bindgen" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2 1.0.76", - "quote 1.0.35", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", - "which", -] - [[package]] name = "bindgen" version = "0.65.1" @@ -595,33 +566,33 @@ dependencies = [ "log", "peeking_take_while", "prettyplease", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.57", "which", ] [[package]] name = "bindgen" -version = "0.69.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -638,9 +609,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +dependencies = [ + "serde 1.0.197", +] [[package]] name = "bitmask-enum" @@ -649,7 +623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9990737a6d5740ff51cdbbc0f0503015cb30c390f6623968281eb214a520cfc0" dependencies = [ "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -700,25 +674,25 @@ dependencies = [ [[package]] name = "blocking" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock", + "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", + "fastrand 2.0.2", "futures-io", - "futures-lite", + "futures-lite 2.3.0", "piper", "tracing", ] [[package]] name = "brotli" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -755,9 +729,9 @@ checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" @@ -767,11 +741,11 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ - "serde 1.0.195", + "serde 1.0.197", ] [[package]] @@ -815,13 +789,13 @@ dependencies = [ [[package]] name = "cairo-rs" -version = "0.16.7" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" +checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cairo-sys-rs", - "glib 0.16.9", + "glib 0.18.5", "libc", "once_cell", "thiserror", @@ -829,20 +803,20 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.16.3" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ - "glib-sys 0.16.3", + "glib-sys 0.18.1", "libc", "system-deps 6.1.2", ] [[package]] name = "cc" -version = "1.0.83" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", "libc", @@ -887,16 +861,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.17", + "num-traits 0.2.18", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -907,7 +881,7 @@ checksum = "2315f7119b7146d6a883de6acd63ddf96071b5f79d9d98d2adaa84d749f6abf1" dependencies = [ "debug-helper", "num-bigint", - "num-traits 0.2.17", + "num-traits 0.2.18", "once_cell", "regex", ] @@ -930,7 +904,7 @@ checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", - "libloading 0.8.1", + "libloading 0.8.3", ] [[package]] @@ -950,30 +924,30 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.14" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e92c5c1a78c62968ec57dbc2440366a2d6e5a23faf829970ff1585dc6b18e2" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.14" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4323769dc8a61e2c39ad7dc26f6f2800524691a44d74fe3d1071a5c24db6370" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.10.0", + "strsim 0.11.0", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clipboard" @@ -990,23 +964,21 @@ dependencies = [ "parking_lot", "percent-encoding", "rand 0.8.5", - "serde 1.0.195", + "serde 1.0.197", "serde_derive", "thiserror", "utf16string", "x11-clipboard", - "x11rb", + "x11rb 0.12.0", ] [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee" dependencies = [ "error-code", - "str-buf", - "winapi 0.3.9", ] [[package]] @@ -1043,6 +1015,22 @@ dependencies = [ "objc", ] +[[package]] +name = "cocoa" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation 0.9.4", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", + "objc", +] + [[package]] name = "cocoa-foundation" version = "0.1.2" @@ -1081,9 +1069,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -1094,7 +1082,7 @@ version = "0.4.0-2" source = "git+https://github.com/open-trade/confy#7855cd3c32b1a60b44e5076ee8f6b4131da10350" dependencies = [ "directories-next", - "serde 1.0.195", + "serde 1.0.197", "thiserror", "toml 0.5.11", ] @@ -1130,7 +1118,7 @@ version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "unicode-xid 0.2.4", ] @@ -1147,12 +1135,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" -[[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" @@ -1204,6 +1186,19 @@ dependencies = [ "objc2-encode", ] +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.5.0", + "libc", +] + [[package]] name = "core-graphics-types" version = "0.1.2" @@ -1243,7 +1238,7 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" dependencies = [ - "bindgen 0.69.1", + "bindgen 0.69.4", ] [[package]] @@ -1282,18 +1277,18 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ "crossbeam-utils", ] @@ -1358,28 +1353,11 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "dark-light" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62007a65515b3cd88c733dd3464431f05d2ad066999a824259d8edc3cf6f645" -dependencies = [ - "dconf_rs", - "detect-desktop-environment", - "dirs 4.0.0", - "objc", - "rust-ini", - "web-sys", - "winreg 0.10.1", - "zbus", - "zvariant", -] - [[package]] name = "dart-sys" -version = "4.0.2" +version = "4.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8b5680b5c2cc52f50acb2457d9b3a3b58adcca785db13a0e3655626f601de6" +checksum = "57967e4b200d767d091b961d6ab42cc7d0cc14fe9e052e75d0d3cf9eb732d895" dependencies = [ "cc", ] @@ -1536,12 +1514,6 @@ dependencies = [ "dbus", ] -[[package]] -name = "dconf_rs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7046468a81e6a002061c01e6a7c83139daf91b11c30e66795b13217c2d885c8b" - [[package]] name = "debug-helper" version = "0.3.13" @@ -1580,7 +1552,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "syn 1.0.109", ] @@ -1591,30 +1563,11 @@ version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "syn 1.0.109", ] -[[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 1.0.76", - "quote 1.0.35", - "rustc_version", - "syn 1.0.109", -] - -[[package]] -name = "detect-desktop-environment" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d8ad60dd5b13a4ee6bd8fa2d5d88965c597c67bce32b5fc49c94f55cb50810" - [[package]] name = "digest" version = "0.10.7" @@ -1646,15 +1599,6 @@ dependencies = [ "dirs-sys 0.3.7", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - [[package]] name = "dirs" version = "5.0.1" @@ -1720,7 +1664,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.1", + "libloading 0.8.3", ] [[package]] @@ -1753,7 +1697,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a09ac8bb8c16a282264c379dffba707b9c998afc7506009137f3c6136888078" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "syn 1.0.109", ] @@ -1783,7 +1727,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.195", + "serde 1.0.197", "strsim 0.10.0", ] @@ -1793,6 +1737,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + [[package]] name = "dtoa" version = "0.4.8" @@ -1806,7 +1756,7 @@ dependencies = [ "cc", "hbb_common", "lazy_static", - "serde 1.0.195", + "serde 1.0.197", "serde_derive", "thiserror", ] @@ -1822,22 +1772,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "embed-resource" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2" -dependencies = [ - "cc", - "rustc_version", - "toml 0.8.8", - "vswhom", - "winreg 0.51.0", -] +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "encoding_rs" @@ -1858,7 +1795,7 @@ dependencies = [ "objc", "pkg-config", "rdev", - "serde 1.0.195", + "serde 1.0.197", "serde_derive", "tfc", "unicode-segmentation", @@ -1889,30 +1826,30 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "enumflags2" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", - "serde 1.0.195", + "serde 1.0.197", ] [[package]] name = "enumflags2_derive" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -1930,9 +1867,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -1947,7 +1884,7 @@ version = "4.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74351c3392ea1ff6cd2628e0042d268ac2371cb613252ff383b6dfa50d22fa79" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", ] @@ -1969,13 +1906,9 @@ dependencies = [ [[package]] name = "error-code" -version = "2.3.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "evdev" @@ -1995,15 +1928,57 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite", +] + [[package]] name = "exr" version = "1.71.0" @@ -2031,15 +2006,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdeflate" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -2050,7 +2025,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "rustc_version", ] @@ -2181,9 +2156,9 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -2310,15 +2285,28 @@ dependencies = [ "waker-fn", ] +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.0.2", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -2353,57 +2341,56 @@ dependencies = [ [[package]] name = "gdk" -version = "0.16.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9cb33da481c6c040404a11f8212d193889e9b435db2c14fd86987f630d3ce1" +checksum = "f5ba081bdef3b75ebcdbfc953699ed2d7417d6bd853347a42a37d76406a33646" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk-sys", "gio", - "glib 0.16.9", + "glib 0.18.5", "libc", "pango", ] [[package]] name = "gdk-pixbuf" -version = "0.16.7" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" +checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", - "glib 0.16.9", + "glib 0.18.5", "libc", + "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "system-deps 6.1.2", ] [[package]] name = "gdk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" +checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gio-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "pango-sys", "pkg-config", @@ -2412,13 +2399,13 @@ dependencies = [ [[package]] name = "gdkwayland-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4511710212ed3020b61a8622a37aa6f0dd2a84516575da92e9b96928dcbe83ba" +checksum = "a90fbf5c033c65d93792192a49a8efb5bb1e640c419682a58bb96f5ae77f3d4a" dependencies = [ "gdk-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "pkg-config", "system-deps 6.1.2", @@ -2426,12 +2413,12 @@ dependencies = [ [[package]] name = "gdkx11-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa2bf8b5b8c414bc5d05e48b271896d0fd3ddb57464a3108438082da61de6af" +checksum = "fee8f00f4ee46cad2939b8990f5c70c94ff882c3028f3cc5abf950fa4ab53043" dependencies = [ "gdk-sys", - "glib-sys 0.16.3", + "glib-sys 0.18.1", "libc", "system-deps 6.1.2", "x11 2.21.0", @@ -2457,6 +2444,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + [[package]] name = "getrandom" version = "0.2.12" @@ -2480,23 +2477,22 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.16.7" +version = "0.18.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" dependencies = [ - "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", "futures-util", "gio-sys", - "glib 0.16.9", + "glib 0.18.5", "libc", "once_cell", "pin-project-lite", @@ -2506,12 +2502,12 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.16.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "system-deps 6.1.2", "winapi 0.3.9", @@ -2551,21 +2547,22 @@ dependencies = [ [[package]] name = "glib" -version = "0.16.9" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16aa2475c9debed5a32832cb5ff2af5a3f9e1ab9e69df58eaadc1ab2004d6eba" +checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", "futures-task", "futures-util", "gio-sys", - "glib-macros 0.16.8", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-macros 0.18.5", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", + "memchr", "once_cell", "smallvec", "thiserror", @@ -2579,27 +2576,26 @@ checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" dependencies = [ "anyhow", "heck 0.3.3", - "itertools", + "itertools 0.9.0", "proc-macro-crate 0.1.5", "proc-macro-error", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "glib-macros" -version = "0.16.8" +version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b" +checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" dependencies = [ - "anyhow", "heck 0.4.1", - "proc-macro-crate 1.3.1", + "proc-macro-crate 2.0.0", "proc-macro-error", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 1.0.109", + "syn 2.0.57", ] [[package]] @@ -2614,9 +2610,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.16.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", "system-deps 6.1.2", @@ -2641,11 +2637,11 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ - "glib-sys 0.16.3", + "glib-sys 0.18.1", "libc", "system-deps 6.1.2", ] @@ -2653,30 +2649,30 @@ dependencies = [ [[package]] name = "gpu_common" version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#4650b5f1376f92c59a9cdbbbe05a744248325eec" +source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" dependencies = [ - "bindgen 0.59.2", + "bindgen 0.65.1", "cc", "log", - "serde 1.0.195", + "serde 1.0.197", "serde_derive", - "serde_json 1.0.111", + "serde_json 1.0.115", ] [[package]] name = "gpucodec" version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#4650b5f1376f92c59a9cdbbbe05a744248325eec" +source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" dependencies = [ "amf", - "bindgen 0.59.2", + "bindgen 0.65.1", "cc", "gpu_common", "log", "nv", - "serde 1.0.195", + "serde 1.0.197", "serde_derive", - "serde_json 1.0.111", + "serde_json 1.0.115", "vpl", ] @@ -2815,40 +2811,38 @@ dependencies = [ [[package]] name = "gtk" -version = "0.16.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d3507d43908c866c805f74c9dd593c0ce7ba5c38e576e41846639cdcd4bee6" +checksum = "93c4f5e0e20b60e10631a5f06da7fe3dda744b05ad0ea71fee2f47adf865890c" dependencies = [ "atk", - "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", "gdk", "gdk-pixbuf", "gio", - "glib 0.16.9", + "glib 0.18.5", "gtk-sys", "gtk3-macros", "libc", - "once_cell", "pango", "pkg-config", ] [[package]] name = "gtk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3" +checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" dependencies = [ "atk-sys", "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", "gio-sys", - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "pango-sys", "system-deps 6.1.2", @@ -2856,23 +2850,22 @@ dependencies = [ [[package]] name = "gtk3-macros" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "096eb63c6fedf03bafe65e5924595785eaf1bcb7200dac0f2cbe9c9738f05ad8" +checksum = "c6063efb63db582968fb7df72e1ae68aa6360dcfb0a75143f34fc7d616bad75e" dependencies = [ - "anyhow", "proc-macro-crate 1.3.1", "proc-macro-error", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 1.0.109", + "syn 2.0.57", ] [[package]] name = "h2" -version = "0.3.22" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" dependencies = [ "bytes", "fnv", @@ -2880,7 +2873,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -2902,7 +2895,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.7", + "ahash 0.7.8", ] [[package]] @@ -2911,7 +2904,7 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.11", "allocator-api2", ] @@ -2927,7 +2920,7 @@ dependencies = [ "directories-next", "dirs-next", "dlopen", - "env_logger 0.10.0", + "env_logger 0.10.2", "filetime", "flexi_logger", "futures", @@ -2943,9 +2936,9 @@ dependencies = [ "quinn", "rand 0.8.5", "regex", - "serde 1.0.195", + "serde 1.0.197", "serde_derive", - "serde_json 1.0.111", + "serde_json 1.0.115", "socket2 0.3.19", "sodiumoxide", "sysinfo", @@ -2955,7 +2948,7 @@ dependencies = [ "toml 0.7.8", "uuid", "winapi 0.3.9", - "zstd 0.13.0", + "zstd 0.13.1", ] [[package]] @@ -2984,9 +2977,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" [[package]] name = "hex" @@ -3005,11 +2998,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3029,13 +3022,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", - "itoa 1.0.10", + "itoa 1.0.11", ] [[package]] @@ -3070,14 +3063,14 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" version = "0.2.0" -source = "git+https://github.com/21pages/hwcodec?branch=stable#42cfa3f9e5138d3dbdea83ea87d4c4bf798fef51" +source = "git+https://github.com/21pages/hwcodec?branch=stable#52e1da2aae86acec5f374bc065f5921945b55e7b" dependencies = [ "bindgen 0.59.2", "cc", "log", - "serde 1.0.195", + "serde 1.0.197", "serde_derive", - "serde_json 1.0.111", + "serde_json 1.0.115", ] [[package]] @@ -3095,9 +3088,9 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.10", + "itoa 1.0.11", "pin-project-lite", - "socket2 0.5.5", + "socket2 0.5.6", "tokio", "tower-service", "tracing", @@ -3133,16 +3126,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -3177,7 +3170,7 @@ dependencies = [ "gif", "jpeg-decoder", "num-rational 0.4.1", - "num-traits 0.2.17", + "num-traits 0.2.18", "png", "qoi", "tiff", @@ -3206,7 +3199,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", ] @@ -3216,15 +3209,15 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "hashbrown 0.12.3", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -3274,7 +3267,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.5", + "hermit-abi 0.3.6", "libc", "windows-sys 0.48.0", ] @@ -3287,13 +3280,13 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.5", - "rustix 0.38.28", - "windows-sys 0.48.0", + "hermit-abi 0.3.6", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -3311,6 +3304,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.3.4" @@ -3319,9 +3321,9 @@ checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -3375,9 +3377,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] @@ -3393,9 +3395,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -3403,10 +3405,9 @@ dependencies = [ [[package]] name = "keepawake" version = "0.4.3" -source = "git+https://github.com/rustdesk-org/keepawake-rs#ad94454a75cf1ff9e95e217dee9dd6a378bf625e" +source = "git+https://github.com/rustdesk-org/keepawake-rs#64d568586dd16551d02120e19668d2b0fec8e3c9" dependencies = [ "anyhow", - "apple-sys", "cfg-if 1.0.0", "core-foundation 0.9.4", "shadow-rs", @@ -3427,12 +3428,12 @@ dependencies = [ [[package]] name = "keyboard-types" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68" +checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" dependencies = [ - "bitflags 1.3.2", - "serde 1.0.195", + "bitflags 2.5.0", + "serde 1.0.197", "unicode-segmentation", ] @@ -3456,11 +3457,11 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libappindicator" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e1edfdc9b0853358306c6dfb4b77c79c779174256fe93d80c0b5ebca451a2f" +checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" dependencies = [ - "glib 0.16.9", + "glib 0.18.5", "gtk", "gtk-sys", "libappindicator-sys", @@ -3469,9 +3470,9 @@ dependencies = [ [[package]] name = "libappindicator-sys" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08fcb2bea89cee9613982501ec83eaa2d09256b24540ae463c52a28906163918" +checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" dependencies = [ "gtk-sys", "libloading 0.7.4", @@ -3480,9 +3481,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libdbus-sys" @@ -3517,12 +3518,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if 1.0.0", - "windows-sys 0.48.0", + "windows-targets 0.52.0", ] [[package]] @@ -3541,7 +3542,7 @@ dependencies = [ "libc", "libpulse-sys", "num-derive", - "num-traits 0.2.17", + "num-traits 0.2.18", "winapi 0.3.9", ] @@ -3574,20 +3575,19 @@ checksum = "bc19e110fbf42c17260d30f6d3dc545f58491c7830d38ecb9aaca96e26067a9b" dependencies = [ "libc", "num-derive", - "num-traits 0.2.17", + "num-traits 0.2.18", "pkg-config", "winapi 0.3.9", ] [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "libc", - "redox_syscall", ] [[package]] @@ -3632,9 +3632,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.14" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" +checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" dependencies = [ "cc", "libc", @@ -3644,12 +3644,9 @@ dependencies = [ [[package]] name = "line-wrap" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] +checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" [[package]] name = "linux-raw-sys" @@ -3659,9 +3656,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -3669,15 +3666,15 @@ version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "scopeguard", ] [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "mac_address" @@ -3711,7 +3708,7 @@ dependencies = [ [[package]] name = "magnum-opus" version = "0.4.0" -source = "git+https://github.com/rustdesk/magnum-opus#5cd2bf989c148662fa3a2d9d539a71d71fd1d256" +source = "git+https://github.com/rustdesk-org/magnum-opus#5cd2bf989c148662fa3a2d9d539a71d71fd1d256" dependencies = [ "bindgen 0.59.2", "pkg-config", @@ -3741,9 +3738,9 @@ checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" @@ -3751,7 +3748,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", ] [[package]] @@ -3760,16 +3757,16 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", ] [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", ] [[package]] @@ -3786,9 +3783,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -3796,9 +3793,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -3808,11 +3805,11 @@ dependencies = [ [[package]] name = "miow" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" +checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -3825,14 +3822,13 @@ dependencies = [ [[package]] name = "muda" -version = "0.5.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c820db003e601413e835a33b10cf51452b6415ef34ff1d862401826431c675" +checksum = "f428b4e9db3d17e2f809dfb1ff9ddfbbf16c71790d1656d10aee320877e1392f" dependencies = [ - "cocoa", + "cocoa 0.25.0", "crossbeam-channel", - "gdk", - "gdk-pixbuf", + "dpi", "gtk", "keyboard-types", "libxdo", @@ -3840,7 +3836,7 @@ dependencies = [ "once_cell", "png", "thiserror", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3877,7 +3873,7 @@ dependencies = [ "jni-sys", "ndk-sys", "num_enum", - "raw-window-handle", + "raw-window-handle 0.5.2", "thiserror", ] @@ -3936,9 +3932,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +checksum = "416060d346fbaf1f23f9512963e3e878f1a78e707cb699ba9215761754244307" dependencies = [ "bytes", "libc", @@ -3988,7 +3984,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cfg-if 1.0.0", "libc", ] @@ -4003,15 +3999,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -4036,9 +4023,9 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.18", ] [[package]] @@ -4047,28 +4034,33 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.18", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg 1.1.0", - "num-traits 0.2.17", + "num-traits 0.2.18", ] [[package]] @@ -4077,9 +4069,9 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.18", ] [[package]] @@ -4088,9 +4080,9 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.18", ] [[package]] @@ -4099,16 +4091,16 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.18", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", ] [[package]] @@ -4117,7 +4109,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.5", + "hermit-abi 0.3.6", "libc", ] @@ -4137,16 +4129,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] @@ -4154,9 +4146,9 @@ dependencies = [ [[package]] name = "nv" version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#4650b5f1376f92c59a9cdbbbe05a744248325eec" +source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" dependencies = [ - "bindgen 0.59.2", + "bindgen 0.65.1", "cc", "gpu_common", "log", @@ -4229,9 +4221,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -4246,7 +4238,7 @@ dependencies = [ "ndk", "ndk-context", "num-derive", - "num-traits 0.2.17", + "num-traits 0.2.18", "oboe-sys", ] @@ -4267,11 +4259,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.62" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "cfg-if 1.0.0", "foreign-types 0.3.2", "libc", @@ -4286,9 +4278,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -4299,9 +4291,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.98" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -4349,23 +4341,23 @@ dependencies = [ [[package]] name = "os_info" -version = "3.7.0" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", - "serde 1.0.195", - "winapi 0.3.9", + "serde 1.0.197", + "windows-sys 0.52.0", ] [[package]] name = "os_pipe" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4374,9 +4366,9 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" dependencies = [ - "serde 1.0.195", + "serde 1.0.197", "serde_derive", - "serde_json 1.0.111", + "serde_json 1.0.115", ] [[package]] @@ -4406,7 +4398,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c94f3b9b97df3c6d4e51a14916639b24e02c7d15d1dba686ce9b1118277cb811" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "syn 1.0.109", ] @@ -4417,19 +4409,18 @@ version = "1.0.0-alpha5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce9484729b3e52c0bacdc5191cb6a6a5f31ef4c09c5e4ab1209d3340ad9e997b" dependencies = [ - "bindgen 0.69.1", + "bindgen 0.69.4", "libc", ] [[package]] name = "pango" -version = "0.16.5" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" dependencies = [ - "bitflags 1.3.2", "gio", - "glib 0.16.9", + "glib 0.18.5", "libc", "once_cell", "pango-sys", @@ -4437,20 +4428,20 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ - "glib-sys 0.16.3", - "gobject-sys 0.16.3", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "system-deps 6.1.2", ] [[package]] name = "parity-tokio-ipc" -version = "0.7.3-2" -source = "git+https://github.com/open-trade/parity-tokio-ipc#a5b7861249107cbacc856cd43507cb95f40aef6e" +version = "0.7.3-3" +source = "git+https://github.com/rustdesk-org/parity-tokio-ipc#f2d1fcf8fb002335d9a62bec308559d40698694d" dependencies = [ "futures", "libc", @@ -4538,7 +4529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.6", ] [[package]] @@ -4581,29 +4572,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4618,35 +4609,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.0.2", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "plist" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9" dependencies = [ "base64", - "indexmap 2.1.0", + "indexmap 2.2.6", "line-wrap", "quick-xml 0.31.0", - "serde 1.0.195", - "time 0.3.31", + "serde 1.0.197", + "time 0.3.34", ] [[package]] name = "png" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -4661,7 +4652,7 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", "bitflags 1.3.2", "cfg-if 1.0.0", "concurrent-queue", @@ -4671,6 +4662,20 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "polling" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +dependencies = [ + "cfg-if 1.0.0", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.32", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -4695,8 +4700,8 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ - "proc-macro2 1.0.76", - "syn 2.0.48", + "proc-macro2 1.0.79", + "syn 2.0.57", ] [[package]] @@ -4727,6 +4732,15 @@ dependencies = [ "toml_edit 0.19.15", ] +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4734,7 +4748,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "syn 1.0.109", "version_check", @@ -4746,7 +4760,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "version_check", ] @@ -4762,9 +4776,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -4889,7 +4903,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.20.9", + "rustls 0.20.8", "thiserror", "tokio", "tracing", @@ -4906,7 +4920,7 @@ dependencies = [ "rand 0.8.5", "ring 0.16.20", "rustc-hash", - "rustls 0.20.9", + "rustls 0.20.8", "rustls-native-certs", "slab", "thiserror", @@ -4943,7 +4957,7 @@ version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", ] [[package]] @@ -5094,6 +5108,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + [[package]] name = "rayon" version = "1.8.0" @@ -5119,7 +5139,7 @@ name = "rdev" version = "0.5.0-2" source = "git+https://github.com/fufesou/rdev#b3434caee84c92412b45a2f655a15ac5dad33488" dependencies = [ - "cocoa", + "cocoa 0.24.1", "core-foundation 0.9.4", "core-foundation-sys 0.8.6 (registry+https://github.com/rust-lang/crates.io-index)", "core-graphics 0.22.3", @@ -5167,9 +5187,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -5178,9 +5198,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -5190,9 +5210,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -5201,9 +5221,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "repng" @@ -5243,8 +5263,8 @@ dependencies = [ "rustls 0.21.10", "rustls-native-certs", "rustls-pemfile", - "serde 1.0.195", - "serde_json 1.0.111", + "serde 1.0.197", + "serde_json 1.0.115", "serde_urlencoded", "sync_wrapper", "system-configuration", @@ -5278,16 +5298,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if 1.0.0", "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5312,23 +5333,23 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.2.0" +version = "7.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" dependencies = [ "libc", "rtoolbox", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] name = "rtoolbox" -version = "0.0.1" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" dependencies = [ "libc", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -5339,18 +5360,20 @@ checksum = "cd70209c27d5b08f5528bdc779ea3ffb418954e28987f9f9775c6eac41003f9c" dependencies = [ "num-complex", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.18", "realfft", ] [[package]] name = "runas" -version = "1.0.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed87390fefd18965ff20baae5aeb9913bcf82d2b59dc04c0f6d8f17f7be56ff2" +checksum = "b96d6b6c505282b007a9b009f2aa38b2fd0359b81a0430ceacc60f69ade4c6a0" dependencies = [ - "cc", + "libc", + "security-framework-sys", "which", + "windows-sys 0.48.0", ] [[package]] @@ -5400,21 +5423,21 @@ dependencies = [ "android_logger", "arboard", "async-process", + "async-trait", "base64", "bytes", "cc", "cfg-if 1.0.0", "chrono", "cidr-utils", - "clap 4.4.14", + "clap 4.5.0", "clipboard", - "cocoa", + "cocoa 0.24.1", "core-foundation 0.9.4", "core-graphics 0.22.3", "cpal", "crossbeam-queue", "ctrlc", - "dark-light", "dasp", "dbus", "dbus-crossroads", @@ -5435,7 +5458,7 @@ dependencies = [ "jni 0.21.1", "keepawake", "lazy_static", - "libloading 0.8.1", + "libloading 0.8.3", "libpulse-binding", "libpulse-simple-binding", "mac_address", @@ -5454,16 +5477,16 @@ dependencies = [ "repng", "reqwest", "ringbuf", - "rpassword 7.2.0", + "rpassword 7.3.1", "rubato", "runas", "rust-pulsectl", "samplerate", "sciter-rs", "scrap", - "serde 1.0.195", + "serde 1.0.197", "serde_derive", - "serde_json 1.0.111", + "serde_json 1.0.115", "serde_repr", "sha2", "shared_memory", @@ -5486,19 +5509,19 @@ dependencies = [ "winres", "wol-rs", "x11-clipboard", - "x11rb", + "x11rb 0.12.0", "zip", ] [[package]] name = "rustdesk-portable-packer" -version = "0.1.0" +version = "1.2.4" dependencies = [ "brotli", "dirs 5.0.1", - "embed-resource", "md5", "winapi 0.3.9", + "winres", ] [[package]] @@ -5509,7 +5532,7 @@ checksum = "43806561bc506d0c5d160643ad742e3161049ac01027b5e6d7524091fd401d86" dependencies = [ "num-complex", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.18", "primal-check", "strength_reduce", "transpose", @@ -5532,22 +5555,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.20.9" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "ring 0.16.20", "sct", @@ -5561,7 +5584,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.5", + "ring 0.17.8", "rustls-webpki", "sct", ] @@ -5580,9 +5603,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64", ] @@ -5593,7 +5616,7 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.5", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -5605,15 +5628,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -5690,8 +5707,8 @@ dependencies = [ "pkg-config", "quest", "repng", - "serde 1.0.195", - "serde_json 1.0.111", + "serde 1.0.197", + "serde_json 1.0.115", "target_build_utils", "tracing", "webm", @@ -5704,7 +5721,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.5", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -5733,9 +5750,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" @@ -5745,22 +5762,22 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" [[package]] name = "serde" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -5777,24 +5794,24 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ - "itoa 1.0.10", + "itoa 1.0.11", "ryu", - "serde 1.0.195", + "serde 1.0.197", ] [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -5803,7 +5820,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ - "serde 1.0.195", + "serde 1.0.197", ] [[package]] @@ -5813,9 +5830,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.10", + "itoa 1.0.11", "ryu", - "serde 1.0.195", + "serde 1.0.197", ] [[package]] @@ -5849,7 +5866,7 @@ dependencies = [ "const_format", "git2", "is_debug", - "time 0.3.31", + "time 0.3.34", "tzdb", ] @@ -5868,9 +5885,9 @@ dependencies = [ [[package]] name = "shlex" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "shutdown_hooks" @@ -5911,14 +5928,14 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.2.0", ] [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -5943,12 +5960,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5960,7 +5977,7 @@ dependencies = [ "ed25519", "libc", "libsodium-sys", - "serde 1.0.195", + "serde 1.0.197", ] [[package]] @@ -5984,12 +6001,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - [[package]] name = "strength_reduce" version = "0.2.4" @@ -6008,6 +6019,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + [[package]] name = "strum" version = "0.18.0" @@ -6027,7 +6044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "syn 1.0.109", ] @@ -6039,7 +6056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "rustversion", "syn 1.0.109", @@ -6068,18 +6085,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.48" +version = "2.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "unicode-ident", ] @@ -6158,7 +6175,7 @@ dependencies = [ "cfg-expr", "heck 0.4.1", "pkg-config", - "toml 0.8.8", + "toml 0.8.10", "version-compare 0.1.1", ] @@ -6174,25 +6191,18 @@ dependencies = [ [[package]] name = "tao" -version = "0.22.2" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#1e5b97258cf42a30f80f85a6aa0b1a4aece1977e" +version = "0.25.0" +source = "git+https://github.com/rustdesk-org/tao?branch=dev#1cad16b200485bbccc67dcee2d339eac6e1c16ad" dependencies = [ "bitflags 1.3.2", - "cairo-rs", "cc", - "cocoa", + "cocoa 0.25.0", "core-foundation 0.9.4", - "core-graphics 0.22.3", + "core-graphics 0.23.2", "crossbeam-channel", "dispatch", - "gdk", - "gdk-pixbuf", - "gdk-sys", "gdkwayland-sys", "gdkx11-sys", - "gio", - "glib 0.16.9", - "glib-sys 0.16.3", "gtk", "image", "instant", @@ -6207,14 +6217,14 @@ dependencies = [ "once_cell", "parking_lot", "png", - "raw-window-handle", + "raw-window-handle 0.6.0", "scopeguard", "tao-macros", "unicode-segmentation", "url", - "uuid", - "windows 0.48.0", + "windows 0.52.0", "windows-implement", + "windows-version", "x11-dl", "zbus", ] @@ -6222,9 +6232,9 @@ dependencies = [ [[package]] name = "tao-macros" version = "0.1.2" -source = "git+https://github.com/rustdesk-org/tao?branch=dev#1e5b97258cf42a30f80f85a6aa0b1a4aece1977e" +source = "git+https://github.com/rustdesk-org/tao?branch=dev#1cad16b200485bbccc67dcee2d339eac6e1c16ad" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "syn 1.0.109", ] @@ -6264,22 +6274,21 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.28", + "fastrand 2.0.2", + "rustix 0.38.32", "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -6316,22 +6325,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -6367,16 +6376,17 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", - "itoa 1.0.10", + "itoa 1.0.11", "libc", + "num-conv", "num_threads", "powerfmt", - "serde 1.0.195", + "serde 1.0.197", "time-core", "time-macros", ] @@ -6389,10 +6399,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -6413,11 +6424,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.1" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ - "autocfg 1.1.0", + "backtrace", "bytes", "libc", "mio", @@ -6425,20 +6436,20 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.10", + "socket2 0.5.6", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -6501,19 +6512,7 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.195", -] - -[[package]] -name = "toml" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" -dependencies = [ - "serde 1.0.195", - "serde_spanned", - "toml_datetime 0.5.1", - "toml_edit 0.18.1", + "serde 1.0.197", ] [[package]] @@ -6522,31 +6521,22 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ - "serde 1.0.195", + "serde 1.0.197", "serde_spanned", - "toml_datetime 0.6.5", + "toml_datetime", "toml_edit 0.19.15", ] [[package]] name = "toml" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ - "serde 1.0.195", + "serde 1.0.197", "serde_spanned", - "toml_datetime 0.6.5", - "toml_edit 0.21.0", -] - -[[package]] -name = "toml_datetime" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" -dependencies = [ - "serde 1.0.195", + "toml_datetime", + "toml_edit 0.22.6", ] [[package]] @@ -6555,20 +6545,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ - "serde 1.0.195", -] - -[[package]] -name = "toml_edit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" -dependencies = [ - "indexmap 1.9.3", - "nom8", - "serde 1.0.195", - "serde_spanned", - "toml_datetime 0.5.1", + "serde 1.0.197", ] [[package]] @@ -6577,31 +6554,42 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", - "serde 1.0.195", + "indexmap 2.2.6", + "serde 1.0.197", "serde_spanned", - "toml_datetime 0.6.5", - "winnow", + "toml_datetime", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.1.0", - "serde 1.0.195", + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +dependencies = [ + "indexmap 2.2.6", + "serde 1.0.197", "serde_spanned", - "toml_datetime 0.6.5", - "winnow", + "toml_datetime", + "winnow 0.6.1", ] [[package]] name = "totp-rs" -version = "5.4.0" +version = "5.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3504f96adf86d28e7eb16fa236a7951ec72c15ee100d1b5318e225944bc8cb" +checksum = "6c4ae9724c5888c0417d2396037ed3b60665925624766416e3e342b6ba5dbd3f" dependencies = [ "base32", "constant_time_eq 0.2.6", @@ -6636,9 +6624,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -6652,9 +6640,9 @@ dependencies = [ [[package]] name = "transpose" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6522d49d03727ffb138ae4cbc1283d3774f0d10aa7f9bf52e6784c45daf9b23" +checksum = "1ad61aed86bc3faea4300c7aee358b4c6d0c8d6ccc36524c96e4c92ccf26e77e" dependencies = [ "num-integer", "strength_reduce", @@ -6662,11 +6650,11 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.5.1" -source = "git+https://github.com/rustdesk-org/tray-icon#ef98e7b98abed2e3da614277eced12a85bfb717c" +version = "0.13.1" +source = "git+https://github.com/tauri-apps/tray-icon#3c75d9031a915c108cc1886121b9b84cb9c8c312" dependencies = [ - "cocoa", - "core-graphics 0.22.3", + "cocoa 0.25.0", + "core-graphics 0.23.2", "crossbeam-channel", "dirs-next", "libappindicator", @@ -6675,7 +6663,7 @@ dependencies = [ "once_cell", "png", "thiserror", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6729,7 +6717,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "tempfile", "winapi 0.3.9", ] @@ -6745,9 +6733,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -6757,9 +6745,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -6809,7 +6797,7 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde 1.0.195", + "serde 1.0.197", ] [[package]] @@ -6861,9 +6849,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", ] @@ -6909,34 +6897,14 @@ dependencies = [ [[package]] name = "vpl" version = "0.1.0" -source = "git+https://github.com/21pages/gpucodec#4650b5f1376f92c59a9cdbbbe05a744248325eec" +source = "git+https://github.com/21pages/gpucodec#6321fdeb6246ceee07b2b63060f8fe48a540f353" dependencies = [ - "bindgen 0.59.2", + "bindgen 0.65.1", "cc", "gpu_common", "log", ] -[[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "waker-fn" version = "1.1.1" @@ -6945,9 +6913,9 @@ checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -6988,10 +6956,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.89" +name = "wasite" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -6999,24 +6973,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7026,9 +7000,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote 1.0.35", "wasm-bindgen-macro-support", @@ -7036,22 +7010,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wayland-backend" @@ -7073,7 +7047,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "nix 0.26.4", "wayland-backend", "wayland-scanner", @@ -7085,7 +7059,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -7097,7 +7071,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -7110,7 +7084,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quick-xml 0.30.0", "quote 1.0.35", ] @@ -7128,9 +7102,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", @@ -7154,19 +7128,19 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.4" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" +checksum = "07ecc0cd7cac091bf682ec5efa18b1cff79d617b84181f38b3951dbe135f607f" dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "weezl" @@ -7183,16 +7157,17 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.28", + "rustix 0.38.32", ] [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e" dependencies = [ - "wasm-bindgen", + "redox_syscall", + "wasite", "web-sys", ] @@ -7250,9 +7225,9 @@ dependencies = [ [[package]] name = "winapi-wsapoll" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" dependencies = [ "winapi 0.3.9", ] @@ -7313,8 +7288,6 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-implement", - "windows-interface", "windows-targets 0.48.5", ] @@ -7324,10 +7297,22 @@ version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-core", + "windows-core 0.51.1", "windows-targets 0.48.5", ] +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-implement", + "windows-interface", + "windows-targets 0.52.0", +] + [[package]] name = "windows-core" version = "0.51.1" @@ -7338,25 +7323,34 @@ dependencies = [ ] [[package]] -name = "windows-implement" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "proc-macro2 1.0.76", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-implement" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" +dependencies = [ + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 1.0.109", + "syn 2.0.57", ] [[package]] name = "windows-interface" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 1.0.109", + "syn 2.0.57", ] [[package]] @@ -7457,6 +7451,15 @@ dependencies = [ "windows_x86_64_msvc 0.52.0", ] +[[package]] +name = "windows-version" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -7645,20 +7648,20 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.34" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] -name = "winreg" -version = "0.10.1" +name = "winnow" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" dependencies = [ - "winapi 0.3.9", + "memchr", ] [[package]] @@ -7681,16 +7684,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winreg" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - [[package]] name = "winres" version = "0.1.12" @@ -7759,7 +7752,7 @@ name = "x11-clipboard" version = "0.8.1" source = "git+https://github.com/clslaid/x11-clipboard?branch=feat/store-batch#5fc2e73bc01ada3681159b34cf3ea8f0d14cd904" dependencies = [ - "x11rb", + "x11rb 0.12.0", ] [[package]] @@ -7779,11 +7772,22 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" dependencies = [ - "gethostname", + "gethostname 0.3.0", "nix 0.26.4", "winapi 0.3.9", "winapi-wsapoll", - "x11rb-protocol", + "x11rb-protocol 0.12.0", +] + +[[package]] +name = "x11rb" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +dependencies = [ + "gethostname 0.4.3", + "rustix 0.38.32", + "x11rb-protocol 0.13.0", ] [[package]] @@ -7796,26 +7800,32 @@ dependencies = [ ] [[package]] -name = "xdg-home" -version = "1.0.0" +name = "x11rb-protocol" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ - "nix 0.26.4", + "libc", "winapi 0.3.9", ] [[package]] name = "zbus" -version = "3.14.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-process", "async-recursion", "async-task", @@ -7833,7 +7843,7 @@ dependencies = [ "once_cell", "ordered-stream", "rand 0.8.5", - "serde 1.0.195", + "serde 1.0.197", "serde_repr", "sha1", "static_assertions", @@ -7848,12 +7858,12 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "regex", "syn 1.0.109", @@ -7862,11 +7872,11 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ - "serde 1.0.195", + "serde 1.0.197", "static_assertions", "zvariant", ] @@ -7896,9 +7906,9 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -7907,9 +7917,9 @@ version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.57", ] [[package]] @@ -7928,7 +7938,7 @@ dependencies = [ "hmac", "pbkdf2", "sha1", - "time 0.3.31", + "time 0.3.34", "zstd 0.11.2+zstd.1.5.2", ] @@ -7943,11 +7953,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ - "zstd-safe 7.0.0", + "zstd-safe 7.1.0", ] [[package]] @@ -7962,18 +7972,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.0.0" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", "pkg-config", @@ -7990,26 +8000,26 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" dependencies = [ "byteorder", "enumflags2", "libc", - "serde 1.0.195", + "serde 1.0.197", "static_assertions", "zvariant_derive", ] [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "syn 1.0.109", "zvariant_utils", @@ -8021,7 +8031,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2 1.0.79", "quote 1.0.35", "syn 1.0.109", ] diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index 2c82eade26da..a78290e66004 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -23,7 +23,7 @@ flutterRustBridge = rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/16db977fd81e14af62ec5ac7760a7661a5c24be8/.github/workflows/bridge.yml#L10 + version = "1.80.1"; # https://github.com/rustdesk/rustdesk/blob/1.2.3-2/.github/workflows/bridge.yml#L10 src = fetchFromGitHub { owner = "fzyzcjy"; @@ -41,30 +41,29 @@ in flutter316.buildFlutterApplication rec { pname = "rustdesk"; - version = "1.2.3-unstable-2024-02-11"; + version = "1.2.3-2"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; - rev = "16db977fd81e14af62ec5ac7760a7661a5c24be8"; - hash = "sha256-k4gNuA/gZ58S0selOn9+K7+s5AQLkpz+DPI84Fuw414="; + rev = version; + hash = "sha256-aIGaj338eb8/l1NTgBwrLmx5VCpgGoYpx+p/ViCJgjQ="; }; strictDeps = true; # Configure the Flutter/Dart build sourceRoot = "${src.name}/flutter"; - # curl https://raw.githubusercontent.com/rustdesk/rustdesk/16db977fd81e14af62ec5ac7760a7661a5c24be8/flutter/pubspec.lock | yq + # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.2.3-2/flutter/pubspec.lock | yq pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow="; - desktop_drop = "sha256-rt9N6TNAq7YRPzHSDVukGCXMvIIIj48HZaEJikbh6Pk="; desktop_multi_window = "sha256-jhhqV4srWd3oJwlKMHPpGvvdzyoH/kJtTg6AB4e9Udk="; dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8="; + flutter_gpu_texture_renderer = "sha256-0znIHlZ0ashRTev2kAXU179eq/V1RJC9Hp4jAfiPh5Q="; flutter_improved_scrolling = "sha256-fKs1+JmhDVVfjyhr6Fl17pc6n++mCTjBo1PT3l/DUnc="; uni_links_desktop = "sha256-h3wlo31XnHELCCPlk7OSLglm9Xn/969yTllp5UkGY98="; window_manager = "sha256-CUTcSl+W7Wz/Og5k9ujOdAlhKWv/gIYe58wurf9CJH4="; window_size = "sha256-+lqY46ZURT0qcqPvHFXUnd83Uvfq79Xr+rw1AHqrpak="; - flutter_gpu_texture_renderer = "sha256-w1iMp4wUDkG1UZCHFjUUL11GIHyUDUxM+ZM8l423MLk="; }; # Configure the Rust build @@ -74,33 +73,34 @@ in flutter316.buildFlutterApplication rec { # removing the git variant of core-foundation-sys lockFile = ./Cargo.lock; outputHashes = { - "amf-0.1.0" = "sha256-j9w3bB1Nd8GuHyMHxjcTGBy3JJ26g/GiBg2OQgrdqLw="; - "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; - "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; - "confy-0.4.0-2" = "sha256-r5VeggXrIq5Cwxc2WSrxQDI5Gvbw979qIUQfMKHgBUI="; - "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; - "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; - "hwcodec-0.2.0" = "sha256-yw3cmC74u6oLfJD6ouqACUZynHRujT/KJMtLOtzg7f4="; - "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; - "keepawake-0.4.3" = "sha256-wDLjjhKWbCeaWbA896a5E5UMB0B/xI/84QRCUYNKX7I="; - "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; - "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; - "mouce-0.2.1" = "sha256-3PtNEmVMXgqKV4r3KiKTkk4oyCt4BKynniJREE+RyFk="; - "pam-0.7.0" = "sha256-qe2GH6sfGEUnqLiQucYLB5rD/GyAaVtm9pAxWRb1H3Q="; - "parity-tokio-ipc-0.7.3-2" = "sha256-WXDKcDBaJuq4K9gjzOKMozePOFiVX0EqYAFamAz/Yvw="; - "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw="; - "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; - "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; - "sciter-rs-0.5.57" = "sha256-NQPDlMQ0sGY8c9lBMlplT82sNjbgJy2m/+REnF3fz8M="; - "sysinfo-0.29.10" = "sha256-O2zJGQdtXNiIwatmyIB6bu5eVyv1JS/IHkv//BDCpcY="; - "tao-0.22.2" = "sha256-vZx7WM6vK9UarbFQ/FMnTNEEDS+tglhWcPXt/h7YMFA="; - "tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU="; - "tokio-socks-0.5.1-2" = "sha256-x3aFJKo0XLaCGkZLtG9GYA+A/cGGedVZ8gOztWiYVUY="; - "tray-icon-0.5.1" = "sha256-1VyUg8V4omgdRIYyXhfn8kUvhV5ef6D2cr2Djz2uQyc="; - "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; - "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; - "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; - "x11-clipboard-0.8.1" = "sha256-PtqmSD2MwkbLVWbfTSXZW3WEvEnUlo04qieUTjN2whE="; + "amf-0.1.0" = "sha256-4YVHndc6sCuuHhM2dc1zoOFMZt2J5nUg/UuKYsyiC+A="; + "android-wakelock-0.1.0" = "sha256-09EH/U1BBs3l4galQOrTKmPUYBgryUjfc/rqPZhdYc4="; + "arboard-3.3.1" = "sha256-siFkyWK8VmDIhefCaRjNwVtHxRmAp95JvaTp37M6nCA="; + "cacao-0.4.0-beta2" = "sha256-U5tCLeVxjmZCm7ti1u71+i116xmozPaR69pCsA4pxrM="; + "confy-0.4.0-2" = "sha256-r5VeggXrIq5Cwxc2WSrxQDI5Gvbw979qIUQfMKHgBUI="; + "core-foundation-0.9.3" = "sha256-iB4OVmWZhuWbs9RFWvNc+RNut6rip2/50o5ZM6c0c3g="; + "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; + "hwcodec-0.2.0" = "sha256-bbAOQui7UY7FFKnwsxFUJYBG/zi9rpmOtcai3faeoeU="; + "impersonate_system-0.1.0" = "sha256-pIV7s2qGoCIUrhaRovBDCJaGQ/pMdJacDXJmeBpkcyI="; + "keepawake-0.4.3" = "sha256-cqSpkq/PCz+5+ZUyPy5hF6rP3fBzuZDywyxMUQ50Rk4="; + "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; + "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; + "mouce-0.2.1" = "sha256-3PtNEmVMXgqKV4r3KiKTkk4oyCt4BKynniJREE+RyFk="; + "pam-0.7.0" = "sha256-qe2GH6sfGEUnqLiQucYLB5rD/GyAaVtm9pAxWRb1H3Q="; + "parity-tokio-ipc-0.7.3-3" = "sha256-oHygC811v1fXt4KWhIZU04cs4rD340I8/bczfbxpiok="; + "rdev-0.5.0-2" = "sha256-KrzNa4sKyuVw3EV/Ec9VBNRyJy7QFR2Gu4c2WkltwUw="; + "reqwest-0.11.23" = "sha256-kEUT+gs4ziknDiGdPMLnj5pmxC5SBpLopZ8jZ34GDWc="; + "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; + "sciter-rs-0.5.57" = "sha256-NQPDlMQ0sGY8c9lBMlplT82sNjbgJy2m/+REnF3fz8M="; + "sysinfo-0.29.10" = "sha256-O2zJGQdtXNiIwatmyIB6bu5eVyv1JS/IHkv//BDCpcY="; + "tao-0.25.0" = "sha256-kLmx1z9Ybn/hDt2OcszEjtZytQIE+NKTIn9zNr9oEQk="; + "tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU="; + "tokio-socks-0.5.1-2" = "sha256-x3aFJKo0XLaCGkZLtG9GYA+A/cGGedVZ8gOztWiYVUY="; + "tray-icon-0.13.1" = "sha256-mgWgd9rafDpRFO/6YpsNDE5ZbRqCE2Y1F8PiNznLMyk="; + "wallpaper-3.2.0" = "sha256-p9NRmusdA0wvF6onp1UTL0/4t7XnEAc19sqyGDnfg/Q="; + "webm-1.1.0" = "sha256-p4BMej7yvb8c/dJynRWZmwo2hxAAY96Qx6Qx2DbT8hE="; + "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; + "x11-clipboard-0.8.1" = "sha256-PtqmSD2MwkbLVWbfTSXZW3WEvEnUlo04qieUTjN2whE="; }; }; dontCargoBuild = true; diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json index a14998a79d0a..d8d6379584cc 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json +++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json @@ -34,21 +34,21 @@ "dependency": "transitive", "description": { "name": "animations", - "sha256": "ef57563eed3620bd5d75ad96189846aca1e033c0c45fc9a7d26e80ab02b88a70", + "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.8" + "version": "2.0.11" }, "archive": { "dependency": "transitive", "description": { "name": "archive", - "sha256": "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03", + "sha256": "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.6" + "version": "3.4.10" }, "args": { "dependency": "transitive", @@ -154,41 +154,41 @@ "dependency": "transitive", "description": { "name": "build_daemon", - "sha256": "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65", + "sha256": "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.0" + "version": "4.0.1" }, "build_resolvers": { "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b", + "sha256": "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.6" + "version": "2.4.8" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185", + "sha256": "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.11" + "version": "7.3.0" }, "built_collection": { "dependency": "transitive", @@ -204,41 +204,41 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "723b4021e903217dfc445ec4cf5b42e27975aece1fc4ebbc1ca6329c2d9fb54e", + "sha256": "a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.7.0" + "version": "8.9.0" }, "cached_network_image": { "dependency": "transitive", "description": { "name": "cached_network_image", - "sha256": "f98972704692ba679db144261172a8e20feb145636c617af0eb4022132a6797f", + "sha256": "28ea9690a8207179c319965c13cd8df184d5ee721ae2ce60f398ced1219cea1f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0" + "version": "3.3.1" }, "cached_network_image_platform_interface": { "dependency": "transitive", "description": { "name": "cached_network_image_platform_interface", - "sha256": "56aa42a7a01e3c9db8456d9f3f999931f1e05535b5a424271e9a38cabf066613", + "sha256": "9e90e78ae72caa874a323d78fa6301b3fb8fa7ea76a8f96dc5b5bf79f283bf2f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "4.0.0" }, "cached_network_image_web": { "dependency": "transitive", "description": { "name": "cached_network_image_web", - "sha256": "759b9a9f8f6ccbb66c185df805fac107f05730b1dab9c64626d1008cca532257", + "sha256": "42a835caa27c220d1294311ac409a43361088625a4f23c820b006dd9bffb3316", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "characters": { "dependency": "transitive", @@ -274,11 +274,11 @@ "dependency": "transitive", "description": { "name": "cli_util", - "sha256": "b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.0" + "version": "0.4.1" }, "clock": { "dependency": "transitive", @@ -294,21 +294,21 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.7.0" + "version": "4.10.0" }, "collection": { "dependency": "transitive", "description": { "name": "collection", - "sha256": "f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.17.2" + "version": "1.18.0" }, "contextmenu": { "dependency": "direct main", @@ -334,11 +334,11 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "445db18de832dba8d851e287aff8ccf169bed30d2e94243cb54c7d2f1ed2142c", + "sha256": "fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.3+6" + "version": "0.3.3+8" }, "crypto": { "dependency": "transitive", @@ -364,11 +364,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "abd7625e16f51f554ea244d090292945ec4d4be7bfbaf2ec8cccea568919d334", + "sha256": "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.3.4" }, "dash_chat_2": { "dependency": "direct main", @@ -385,11 +385,11 @@ "dependency": "transitive", "description": { "name": "dbus", - "sha256": "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.8" + "version": "0.7.10" }, "debounce_throttle": { "dependency": "direct main", @@ -426,11 +426,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "7035152271ff67b072a211152846e9f1259cf1be41e34cd3e0b5463d2d6b8419", + "sha256": "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.1.0" + "version": "9.1.2" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -547,11 +547,11 @@ "dependency": "transitive", "description": { "name": "file_selector_platform_interface", - "sha256": "0aa47a725c346825a2bd396343ce63ac00bda6eff2fbc43eabe99737dede8262", + "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.6.2" }, "file_selector_windows": { "dependency": "transitive", @@ -577,11 +577,11 @@ "dependency": "direct main", "description": { "name": "flex_color_picker", - "sha256": "f37476ab3e80dcaca94e428e159944d465dd16312fda9ff41e07e86f04bfa51c", + "sha256": "0871edc170153cfc3de316d30625f40a85daecfa76ce541641f3cc0ec7757cbf", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0" + "version": "3.3.1" }, "flex_seed_scheme": { "dependency": "transitive", @@ -771,11 +771,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "bfc7cc3c75fe1282e8ce2e056d8fd1533f1a6848b65c379b4a5e7a9b623d3371", + "sha256": "d39e7f95621fc84376bc0f7d504f05c3a41488c562f4a8ad410569127507402c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.8" + "version": "2.0.9" }, "flutter_web_plugins": { "dependency": "transitive", @@ -787,11 +787,11 @@ "dependency": "direct dev", "description": { "name": "freezed", - "sha256": "21bf2825311de65501d22e563e3d7605dff57fb5e6da982db785ae5372ff018a", + "sha256": "57247f692f35f068cae297549a46a9a097100685c6780fe67177503eea5ed4e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.5" + "version": "2.4.7" }, "freezed_annotation": { "dependency": "direct main", @@ -857,11 +857,11 @@ "dependency": "direct main", "description": { "name": "http", - "sha256": "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525", + "sha256": "a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.2.0" }, "http_multi_server": { "dependency": "transitive", @@ -887,21 +887,21 @@ "dependency": "direct dev", "description": { "name": "icons_launcher", - "sha256": "69de6373013966ea033f4cefbbbae258ccbfe790a6cfc69796cb33fda996298a", + "sha256": "9b514ffed6ed69b232fd2bf34c44878c8526be71fc74129a658f35c04c9d4a9d", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.1.7" }, "image": { "dependency": "direct main", "description": { "name": "image", - "sha256": "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271", + "sha256": "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.3" + "version": "4.1.7" }, "image_picker": { "dependency": "direct main", @@ -917,11 +917,11 @@ "dependency": "transitive", "description": { "name": "image_picker_android", - "sha256": "d6a6e78821086b0b737009b09363018309bbc6de3fd88cc5c26bc2bb44a4957f", + "sha256": "39f2bfe497e495450c81abcd44b62f56c2a36a37a175da7d137b4454977b51b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.8+2" + "version": "0.8.9+3" }, "image_picker_for_web": { "dependency": "transitive", @@ -937,11 +937,11 @@ "dependency": "transitive", "description": { "name": "image_picker_ios", - "sha256": "c5538cacefacac733c724be7484377923b476216ad1ead35a0d2eadcdc0fc497", + "sha256": "fadafce49e8569257a0cad56d24438a6fa1f0cbd7ee0af9b631f7492818a4ca3", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.8+2" + "version": "0.8.9+1" }, "image_picker_linux": { "dependency": "transitive", @@ -967,11 +967,11 @@ "dependency": "transitive", "description": { "name": "image_picker_platform_interface", - "sha256": "ed9b00e63977c93b0d2d2b343685bed9c324534ba5abafbb3dfbd6a780b1b514", + "sha256": "fa4e815e6fcada50e35718727d83ba1c92f1edf95c0b4436554cec301b56233b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.1" + "version": "2.9.3" }, "image_picker_windows": { "dependency": "transitive", @@ -1047,11 +1047,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.16" + "version": "0.12.16+1" }, "material_color_utilities": { "dependency": "transitive", @@ -1067,21 +1067,21 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3", + "sha256": "a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.9.1" + "version": "1.10.0" }, "mime": { "dependency": "transitive", "description": { "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "nested": { "dependency": "transitive", @@ -1167,31 +1167,31 @@ "dependency": "direct main", "description": { "name": "path_provider", - "sha256": "a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa", + "sha256": "b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "path_provider_android": { "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72", + "sha256": "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.2" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d", + "sha256": "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "path_provider_linux": { "dependency": "transitive", @@ -1207,11 +1207,11 @@ "dependency": "transitive", "description": { "name": "path_provider_platform_interface", - "sha256": "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "path_provider_windows": { "dependency": "transitive", @@ -1247,41 +1247,41 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.4.0" + "version": "6.0.2" }, "platform": { "dependency": "transitive", "description": { "name": "platform", - "sha256": "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59", + "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.3" + "version": "3.1.4" }, "plugin_platform_interface": { "dependency": "transitive", "description": { "name": "plugin_platform_interface", - "sha256": "da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.6" + "version": "2.1.8" }, "pointycastle": { "dependency": "transitive", "description": { "name": "pointycastle", - "sha256": "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c", + "sha256": "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.7.3" + "version": "3.7.4" }, "pool": { "dependency": "transitive", @@ -1297,11 +1297,11 @@ "dependency": "direct main", "description": { "name": "provider", - "sha256": "cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f", + "sha256": "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.5" + "version": "6.1.1" }, "pub_semver": { "dependency": "transitive", @@ -1337,11 +1337,11 @@ "dependency": "transitive", "description": { "name": "puppeteer", - "sha256": "59e723cc5b69537159a7c34efd645dc08a6a1ac4647d7d7823606802c0f93cdb", + "sha256": "eedeaae6ec5d2e54f9ae22ab4d6b3dda2e8791c356cc783046d06c287ffe11d8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.0" + "version": "3.6.0" }, "qr": { "dependency": "transitive", @@ -1473,11 +1473,11 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.5.0" }, "source_span": { "dependency": "transitive", @@ -1493,21 +1493,21 @@ "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a", + "sha256": "a9016f495c927cb90557c909ff26a6d92d9bd54fc42ba92e19d4e79d61e798c6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.0" + "version": "2.3.2" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a", + "sha256": "28d8c66baee4968519fb8bd6cdbedad982d6e53359091f0b74544a9f32ec72d5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.5.3" }, "stack_trace": { "dependency": "transitive", @@ -1553,11 +1553,11 @@ "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60", + "sha256": "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.0+1" }, "term_glyph": { "dependency": "transitive", @@ -1573,11 +1573,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b", + "sha256": "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.1" + "version": "0.7.0" }, "texture_rgba_renderer": { "dependency": "direct main", @@ -1642,13 +1642,12 @@ "uni_links_desktop": { "dependency": "direct main", "description": { - "path": ".", - "ref": "HEAD", - "resolved-ref": "e1d25263ae7c214ff52a66a9cf28aea8f408742e", - "url": "https://github.com/rustdesk-org/uni_links_desktop" + "name": "uni_links_desktop", + "sha256": "692de81efc32ef72df56d428902afb5216d5f9e43d71c7b315d360acd7a1e115", + "url": "https://pub.dev" }, - "source": "git", - "version": "0.1.6" + "source": "hosted", + "version": "0.1.7" }, "uni_links_platform_interface": { "dependency": "transitive", @@ -1684,41 +1683,41 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba", + "sha256": "c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.1" + "version": "6.2.4" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def", + "sha256": "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.0" + "version": "6.2.2" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "4ac97281cf60e2e8c5cc703b2b28528f9b50c8f7cebc71df6bdf0845f647268a", + "sha256": "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.0" + "version": "6.2.4" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd", + "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "url_launcher_macos": { "dependency": "transitive", @@ -1734,31 +1733,31 @@ "dependency": "transitive", "description": { "name": "url_launcher_platform_interface", - "sha256": "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50", + "sha256": "a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.3.1" }, "url_launcher_web": { "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2", + "sha256": "fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.2.3" }, "url_launcher_windows": { "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc", + "sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "uuid": { "dependency": "direct main", @@ -1774,31 +1773,31 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "0f0c746dd2d6254a0057218ff980fc7f5670fd0fcf5e4db38a490d31eed4ad43", + "sha256": "4ac59808bbfca6da38c99f415ff2d3a5d7ca0a6b4809c71d9cf30fba5daf9752", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.9+1" + "version": "1.1.10+1" }, "vector_graphics_codec": { "dependency": "transitive", "description": { "name": "vector_graphics_codec", - "sha256": "0edf6d630d1bfd5589114138ed8fada3234deacc37966bec033d3047c29248b7", + "sha256": "f3247e7ab0ec77dc759263e68394990edc608fb2b480b80db8aa86ed09279e33", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.9+1" + "version": "1.1.10+1" }, "vector_graphics_compiler": { "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "d24333727332d9bd20990f1483af4e09abdb9b1fc7c3db940b56ab5c42790c26", + "sha256": "18489bdd8850de3dd7ca8a34e0c446f719ec63e2bab2e7a8cc66a9028dd76c5a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.9+1" + "version": "1.1.10+1" }, "vector_math": { "dependency": "transitive", @@ -1814,51 +1813,51 @@ "dependency": "transitive", "description": { "name": "video_player", - "sha256": "74b86e63529cf5885130c639d74cd2f9232e7c8a66cbecbddd1dcb9dbd060d1e", + "sha256": "fbf28ce8bcfe709ad91b5789166c832cb7a684d14f571a81891858fefb5bb1c2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.2" + "version": "2.8.2" }, "video_player_android": { "dependency": "transitive", "description": { "name": "video_player_android", - "sha256": "3fe89ab07fdbce786e7eb25b58532d6eaf189ceddc091cb66cba712f8d9e8e55", + "sha256": "7f8f25d7ad56819a82b2948357f3c3af071f6a678db33833b26ec36bbc221316", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.10" + "version": "2.4.11" }, "video_player_avfoundation": { "dependency": "transitive", "description": { "name": "video_player_avfoundation", - "sha256": "6387c2de77763b45104256b3b00b660089be4f909ded8631457dc11bf635e38f", + "sha256": "309e3962795e761be010869bae65c0b0e45b5230c5cee1bec72197ca7db040ed", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "2.5.6" }, "video_player_platform_interface": { "dependency": "transitive", "description": { "name": "video_player_platform_interface", - "sha256": "be72301bf2c0150ab35a8c34d66e5a99de525f6de1e8d27c0672b836fe48f73a", + "sha256": "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.1" + "version": "6.2.2" }, "video_player_web": { "dependency": "transitive", "description": { "name": "video_player_web", - "sha256": "2dd24f7ba46bfb5d070e9c795001db95e0ca5f2a3d025e98f287c10c9f0fd62f", + "sha256": "34beb3a07d4331a24f7e7b2f75b8e2b103289038e07e65529699a671b6a6e2cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.3" }, "visibility_detector": { "dependency": "direct main", @@ -1874,11 +1873,11 @@ "dependency": "direct main", "description": { "name": "wakelock_plus", - "sha256": "f45a6c03aa3f8322e0a9d7f4a0482721c8789cb41d555407367650b8f9c26018", + "sha256": "f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.3" + "version": "1.1.4" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -1904,11 +1903,11 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10", + "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.4-beta" + "version": "0.5.1" }, "web_socket_channel": { "dependency": "transitive", @@ -1924,11 +1923,11 @@ "dependency": "direct main", "description": { "name": "win32", - "sha256": "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3", + "sha256": "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.9" + "version": "5.2.0" }, "win32_registry": { "dependency": "transitive", @@ -1966,21 +1965,21 @@ "dependency": "transitive", "description": { "name": "xdg_directories", - "sha256": "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.3" + "version": "1.0.4" }, "xml": { "dependency": "transitive", "description": { "name": "xml", - "sha256": "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.0" + "version": "6.5.0" }, "yaml": { "dependency": "transitive", @@ -2006,15 +2005,15 @@ "dependency": "direct main", "description": { "name": "zxing2", - "sha256": "1e141568c9646bc262fa75aacf739bc151ef6ad0226997c0016cc3da358a1bbc", + "sha256": "a042961441bd400f59595f9125ef5fca4c888daf0ea59c17f41e0e151f8a12b5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.1" } }, "sdks": { - "dart": ">=3.1.0 <4.0.0", - "flutter": ">=3.13.0" + "dart": ">=3.2.0 <4.0.0", + "flutter": ">=3.16.0" } } From e50cb99f36f130f5c07c2c04dbc8bae9d9aa402f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Apr 2024 09:23:36 +0000 Subject: [PATCH 16/62] sad: 0.4.27 -> 0.4.28 --- pkgs/tools/text/sad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/tools/text/sad/default.nix index 94838c9a4d0e..f12f1d9f03af 100644 --- a/pkgs/tools/text/sad/default.nix +++ b/pkgs/tools/text/sad/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "sad"; - version = "0.4.27"; + version = "0.4.28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "sad"; rev = "refs/tags/v${version}"; - hash = "sha256-hb09YwF59I8zQ6dIrGkCWJ98VeB5EYoNloTGg5v2BIs="; + hash = "sha256-9zsNYUYUQ3RmJQN7uf+YQjywr7rRAIx5zz6EYkbN8/o="; }; - cargoHash = "sha256-wFmC19uGEaS8Rn+bKdljAZY24/AL9VDV183xXBjt79M="; + cargoHash = "sha256-OSVG1sFSLKkVsgI0I2mYTszcPGlfOL1Md/aCpMf6Eow="; nativeBuildInputs = [ python3 ]; From 1706ba10e2f13ccac7edbc79caed745dce469ff2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Apr 2024 09:30:43 +0000 Subject: [PATCH 17/62] vale: 3.3.1 -> 3.4.0 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 861b3e6b899e..fa873ea4f6d3 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "3.3.1"; + version = "3.4.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-6hj8fm2eCGQeWY3+eaJlKeZglJUSMY4/Yz2ySGp6m58="; + hash = "sha256-b2IPoBu9gIPnq/G4vbomA6L6dPD7GK4dzjL0eUy6b3Q="; }; vendorHash = "sha256-HMzFLSmO6sBDNU89UoIvHcPPd3ubpti2ii4sFMKUDmI="; From 120ce1e1a7cdb8dc2af6bd768766b523c41332a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Apr 2024 13:37:23 +0000 Subject: [PATCH 18/62] mkgmap: 4918 -> 4919 --- pkgs/applications/misc/mkgmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 7f97818c7452..40530d16391f 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -16,12 +16,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4918"; + version = "4919"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-oQ/2KY6xA/kwAroHiPqcIJlcPsTTeStUu8WN/95ZUTw="; + sha256 = "sha256-WMFZEGTXVAaBlEKUqclmkw3pKnWSdbvulDvSi7TQn8k="; }; patches = [ From 348bbf9015562ad668226c12a382dbcb4f2bfcfb Mon Sep 17 00:00:00 2001 From: Paul S Date: Mon, 8 Apr 2024 13:48:48 +0100 Subject: [PATCH 19/62] fheroes2: set platforms.unix instead of platforms.linux fixes #302354 --- pkgs/games/fheroes2/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index d51cb21750fd..bc96eb5cfcc3 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, imagemagick , gettext, glibcLocalesUtf8, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, zlib +, libiconv , gitUpdater }: @@ -17,7 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ imagemagick ]; - buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; + buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; makeFlags = [ "FHEROES2_STRICT_COMPILATION=1" @@ -67,6 +69,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = [ maintainers.karolchmist ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From 0b1975787e35a8bc5ac32dd00f6878b2278b0e55 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Apr 2024 17:15:40 +0200 Subject: [PATCH 20/62] python312Packages.aio-pika: 9.4.0 -> 9.4.1 Changelog: https://github.com/mosquito/aio-pika/blob/9.4.1/CHANGELOG.md --- .../python-modules/aio-pika/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 65f15fa639d5..27fce9dea73e 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -2,27 +2,30 @@ , aiomisc-pytest , aiormq , buildPythonPackage +, docker , fetchFromGitHub , pamqp , poetry-core , pytestCheckHook , pythonOlder , shortuuid +, testcontainers +, wrapt , yarl }: buildPythonPackage rec { pname = "aio-pika"; - version = "9.4.0"; + version = "9.4.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "mosquito"; repo = "aio-pika"; rev = "refs/tags/${version}"; - hash = "sha256-EntV/CBvT4II4nxsVe3KjNA4EPV7Oc6h2G0fX0fHKTU="; + hash = "sha256-aRXYFW4fl3iXH3bwP30+TllRm4BkIUcGMX/lNfhiqjo="; }; nativeBuildInputs = [ @@ -36,9 +39,20 @@ buildPythonPackage rec { nativeCheckInputs = [ aiomisc-pytest + docker pamqp pytestCheckHook shortuuid + testcontainers + wrapt + ]; + + disabledTests = [ + # Tests attempt to connect to a RabbitMQ server + "test_connection_interleave" + "test_connection_happy_eyeballs_delay" + "test_robust_connection_interleave" + "test_robust_connection_happy_eyeballs_delay" ]; disabledTestPaths = [ From 1f51584b8ae73bc4e969d1470ff2335c71bae533 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Apr 2024 18:21:16 +0200 Subject: [PATCH 21/62] python312Packages.aio-pika: refactor --- pkgs/development/python-modules/aio-pika/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 27fce9dea73e..89c09540fb46 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { hash = "sha256-aRXYFW4fl3iXH3bwP30+TllRm4BkIUcGMX/lNfhiqjo="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiormq yarl ]; From 0a7fb613f2e8732ab0bb9ebb2fe83d69d7801e6b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 8 Apr 2024 18:21:39 +0200 Subject: [PATCH 22/62] python312Packages.aio-pika: format with nixfmt --- .../python-modules/aio-pika/default.nix | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index 89c09540fb46..10c311c220c9 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -1,17 +1,18 @@ -{ lib -, aiomisc-pytest -, aiormq -, buildPythonPackage -, docker -, fetchFromGitHub -, pamqp -, poetry-core -, pytestCheckHook -, pythonOlder -, shortuuid -, testcontainers -, wrapt -, yarl +{ + lib, + aiomisc-pytest, + aiormq, + buildPythonPackage, + docker, + fetchFromGitHub, + pamqp, + poetry-core, + pytestCheckHook, + pythonOlder, + shortuuid, + testcontainers, + wrapt, + yarl, }: buildPythonPackage rec { @@ -28,9 +29,7 @@ buildPythonPackage rec { hash = "sha256-aRXYFW4fl3iXH3bwP30+TllRm4BkIUcGMX/lNfhiqjo="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ aiormq @@ -67,9 +66,7 @@ buildPythonPackage rec { "tests/test_types.py" ]; - pythonImportsCheck = [ - "aio_pika" - ]; + pythonImportsCheck = [ "aio_pika" ]; meta = with lib; { description = "AMQP 0.9 client designed for asyncio and humans"; From 37d6aef521999114dd8e92dc147e39178b7257b8 Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 5 Apr 2024 20:45:59 +0200 Subject: [PATCH 23/62] ffmpeg_7: add patch to fix checks https://trac.ffmpeg.org/ticket/10947#comment:1 --- pkgs/development/libraries/ffmpeg/generic.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 6ed7dfc7b757..2be86d5cb85a 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -405,6 +405,14 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e06ce6d2b45edac4a2df04f304e18d4727417d24"; hash = "sha256-73mlX1rdJrguw7OXaSItfHtI7gflDrFj+7SepVvvUIg="; } + ]) + ++ (lib.optionals (lib.versionAtLeast version "7.0") [ + { + # Will likely be obsolete in >7.0 + name = "fate_avoid_dependency_on_samples"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/7b7b7819bd21cc92ac07f6696b0e7f26fa8f9834"; + hash = "sha256-TKI289XqtG86Sj9s7mVYvmkjAuRXeK+2cYYEDkg6u6I="; + } ])); configurePlatforms = []; From 33e44142024584a2043e233d5ac764e707159f43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Apr 2024 20:25:32 +0000 Subject: [PATCH 24/62] python312Packages.mkdocstrings-python: 1.9.0 -> 1.9.2 --- .../python-modules/mkdocstrings-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index de1ae5e6c72e..23595e12c695 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.9.0"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-RzyOhlfjLtiG5jelrRG8yS7AWQJuaJMVuNkGpNBGO64="; + hash = "sha256-UJSDnkdohFn+U7i5fYiRVMLZZ8Nyb0fdihBZl2z2RBc="; }; nativeBuildInputs = [ From a607927960178076a9ea3d13c549ae29ebf11863 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Apr 2024 20:34:49 +0000 Subject: [PATCH 25/62] pop-icon-theme: 3.3.0 -> 3.5.0 --- pkgs/data/icons/pop-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index 2a27122da5db..8d4467e3abad 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "pop-icon-theme"; - version = "3.3.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "pop-os"; repo = "icon-theme"; rev = "v${version}"; - sha256 = "sha256-7cDXEkqtPNQsyZvuYZhBSgAYshkDlP8o8umWGbNLtjw="; + sha256 = "sha256-V8xBZj6T4Ly/GHV0CVLZ1a4UZbmCkhYRe05qUfJk7Wg="; }; nativeBuildInputs = [ From 0f452a183768139b86da5bc5303f0a20b240152f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 00:14:20 +0200 Subject: [PATCH 26/62] cnspec: 10.11.0 -> 10.11.1 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v10.11.0...v10.11.1 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v10.11.1 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index a88ead4f6f16..147388e08831 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "10.11.0"; + version = "10.11.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-z8pWAazoafyrsz3EmfhtHDBhmHHjkGFEIL5BftW79fg="; + hash = "sha256-rLKECheCsJldeiUn1PtOLN5T4y+pu8TGC95q11KF4NU="; }; proxyVendor = true; - vendorHash = "sha256-6MVl8QuzxzcyFVP04ikO7B4Gk17e0TA4hxmL17OehCo="; + vendorHash = "sha256-INkE3jOTrJGOqXj/M/s142CFdhN1XzbW1h6SKmlbhJw="; subPackages = [ "apps/cnspec" ]; From e989382eb6a99771cfadb61e6a41679e246ac025 Mon Sep 17 00:00:00 2001 From: roblabla Date: Fri, 29 Mar 2024 16:27:07 +0100 Subject: [PATCH 27/62] ghidra: 11.0 -> 11.0.2 --- .../0001-Use-protobuf-gradle-plugin.patch | 37 +++++++++++++++---- pkgs/tools/security/ghidra/build.nix | 16 ++------ 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch index 7fb7d53e352f..7378878a648a 100644 --- a/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch +++ b/pkgs/tools/security/ghidra/0001-Use-protobuf-gradle-plugin.patch @@ -1,3 +1,16 @@ +From ffb6777d58f068db7e14372415154cd93f77766e Mon Sep 17 00:00:00 2001 +From: roblabla +Date: Wed, 31 Jan 2024 13:19:55 +0100 +Subject: [PATCH] Use com.google.protobuf:protobuf-gradle-plugin + +--- + Ghidra/Debug/Debugger-gadp/build.gradle | 7 +- + Ghidra/Debug/Debugger-isf/build.gradle | 8 +- + Ghidra/Debug/Debugger-rmi-trace/build.gradle | 14 +-- + build.gradle | 6 ++ + gradle/debugger/hasProtobuf.gradle | 94 -------------------- + 5 files changed, 26 insertions(+), 103 deletions(-) + diff --git a/Ghidra/Debug/Debugger-gadp/build.gradle b/Ghidra/Debug/Debugger-gadp/build.gradle index 9e1c57faf..3a3242eb5 100644 --- a/Ghidra/Debug/Debugger-gadp/build.gradle @@ -43,7 +56,7 @@ index d135294a0..785681ca2 100644 api project(':Framework-AsyncComm') api project(':Framework-Debugging') diff --git a/Ghidra/Debug/Debugger-rmi-trace/build.gradle b/Ghidra/Debug/Debugger-rmi-trace/build.gradle -index eec00786e..666cccafc 100644 +index 40fbc17ab..7517ffe6e 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/build.gradle +++ b/Ghidra/Debug/Debugger-rmi-trace/build.gradle @@ -18,12 +18,17 @@ apply from: "${rootProject.projectDir}/gradle/javaProject.gradle" @@ -63,17 +76,23 @@ index eec00786e..666cccafc 100644 + } +} dependencies { + api project(':Pty') api project(':Debugger') - } -@@ -36,7 +41,7 @@ task generateProtoPy { +@@ -44,12 +49,9 @@ task generateProtoPy { ext.outdir = file("build/generated/source/proto/main/py") outputs.dir(outdir) inputs.files(src) - dependsOn(configurations.protocArtifact) + dependsOn(protobuf.generateProtoTasks.all()) doLast { - def exe = configurations.protocArtifact.first() - if (!isCurrentWindows()) { +- def exe = configurations.protocArtifact.first() +- if (!isCurrentWindows()) { +- exe.setExecutable(true) +- } ++ def exe = protobuf.tools.protoc.path + exec { + commandLine exe, "--python_out=$outdir", "-I$srcdir" + args src diff --git a/build.gradle b/build.gradle index b0c717fb1..5f56506a5 100644 --- a/build.gradle @@ -92,10 +111,9 @@ index b0c717fb1..5f56506a5 100644 } else { diff --git a/gradle/debugger/hasProtobuf.gradle b/gradle/debugger/hasProtobuf.gradle -deleted file mode 100644 -index 23b4ce74b..000000000 +index 23b4ce74b..e69de29bb 100644 --- a/gradle/debugger/hasProtobuf.gradle -+++ /dev/null ++++ b/gradle/debugger/hasProtobuf.gradle @@ -1,94 +0,0 @@ -/* ### - * IP: GHIDRA @@ -191,3 +209,6 @@ index 23b4ce74b..000000000 - } -} -zipSourceSubproject.dependsOn generateProto +-- +2.42.0 + diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index da164c94b0b5..e51d8c6683ec 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -10,19 +10,18 @@ , icoutils , xcbuild , protobuf -, fetchurl }: let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "11.0"; + version = "11.0.2"; src = fetchFromGitHub { owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - hash = "sha256-LVtDqgceZUrMriNy6+yK/ruBrTI8yx6hzTaPa1BTGlc="; + hash = "sha256-Q5nolgqBG2LFVoEeEtzEPTt/cAHubPlRIFt3SYX9z1Y="; }; gradle = gradle_7; @@ -92,7 +91,7 @@ HERE ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-KT+XXowCNaNfOiPzYLwbPMaF84omKFobHkkNqZ6oyUA="; + outputHash = "sha256-nKfJiGoZlDEpbCmYVKNZXz2PYIosCd4nPFdy3MfprHc="; }; in stdenv.mkDerivation { @@ -106,13 +105,6 @@ in stdenv.mkDerivation { patches = [ ./0001-Use-protobuf-gradle-plugin.patch - # we use fetchurl since the fetchpatch normalization strips the whole diff - # https://github.com/NixOS/nixpkgs/issues/266556 - (fetchurl { - name = "0002-remove-executable-bit.patch"; - url = "https://github.com/NationalSecurityAgency/ghidra/commit/e2a945624b74e5d42dc85e9c1f992315dd154db1.diff"; - sha256 = "07mjfl7hvag2akk65g4cknp330qlk07dgbmh20dyg9qxzmk91fyq"; - }) ]; buildPhase = '' @@ -124,8 +116,6 @@ in stdenv.mkDerivation { sed -i "s#mavenLocal()#mavenLocal(); maven { url '${deps}/maven' }#g" build.gradle - rm -v Ghidra/Debug/Debugger-rmi-trace/build.gradle.orig - gradle --offline --no-daemon --info -Dorg.gradle.java.home=${openjdk17} buildGhidra ''; From caa3cfcac14a7e60fb740d0cbadb9dd506949515 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Apr 2024 22:54:19 +0000 Subject: [PATCH 28/62] rfc: 0.2.6 -> 1.0.0 --- pkgs/tools/misc/rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rfc/default.nix b/pkgs/tools/misc/rfc/default.nix index 60d77bfbaca2..d747cbf185e4 100644 --- a/pkgs/tools/misc/rfc/default.nix +++ b/pkgs/tools/misc/rfc/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "rfc"; - version = "0.2.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "bfontaine"; repo = "rfc"; rev = "v${version}"; - hash = "sha256-dfaeTdJiJuKp8/k6LBP+RC60gTRHfHR5hhLD4ZWJufE="; + hash = "sha256-zN+MQtHh69PkzbrfceHFpBYCPmTg9qrOf/ML2efq6Xk="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 23dec31e9850af3eb687e9dacb28ec9bb941dff7 Mon Sep 17 00:00:00 2001 From: name_snrl Date: Tue, 9 Apr 2024 07:02:04 +0500 Subject: [PATCH 29/62] where-is-my-sddm-theme: fix qt5 variant and add qtsvg to qt6 --- .../wh/where-is-my-sddm-theme/package.nix | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix index e15ab121a41f..382f2bf25436 100644 --- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix +++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix @@ -45,21 +45,31 @@ stdenvNoCC.mkDerivation rec { propagatedUserEnvPkgs = [ ] ++ lib.optional (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ] - ++ lib.optional (lib.elem "qt6" variants) [ qt6.qt5compat ]; + ++ lib.optional (lib.elem "qt6" variants) [ + qt6.qt5compat + qt6.qtsvg + ]; installPhase = '' mkdir -p $out/share/sddm/themes/ '' - + lib.optionalString (lib.elem "qt6" variants) '' - cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/ - '' - + lib.optionalString (lib.elem "qt5" variants) '' - cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/ - '' - + lib.optionalString (lib.isAttrs themeConfig) '' - ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user - ''; + + lib.optionalString (lib.elem "qt6" variants) ( + '' + cp -r where_is_my_sddm_theme/ $out/share/sddm/themes/ + '' + + lib.optionalString (lib.isAttrs themeConfig) '' + ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme/theme.conf.user + '' + ) + + lib.optionalString (lib.elem "qt5" variants) ( + '' + cp -r where_is_my_sddm_theme_qt5/ $out/share/sddm/themes/ + '' + + lib.optionalString (lib.isAttrs themeConfig) '' + ln -sf ${user-cfg} $out/share/sddm/themes/where_is_my_sddm_theme_qt5/theme.conf.user + '' + ); meta = with lib; { description = "The most minimalistic SDDM theme among all themes"; From 229f13cb9de0d7495c75eb17ca2c6dd4ec2ea225 Mon Sep 17 00:00:00 2001 From: Misaka13514 Date: Tue, 9 Apr 2024 10:39:25 +0800 Subject: [PATCH 30/62] nuclei: 3.2.3 -> 3.2.4 Diff: https://github.com/projectdiscovery/nuclei/compare/v3.2.3...v3.2.4 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v3.2.4 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 5e183e44ebab..1f95c78530b8 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-rcFgSblSXQUGu58cLbjGtvVfEa3AJUwkYEcrizqJTwM="; + hash = "sha256-xrIR2QVizORxR2OO09Qj5h8avv2xeIsQ+VfmlZotML8="; }; - vendorHash = "sha256-Ttv25D7GAFjbP25AcRfKPu4wT3SMroAAf3px48IWZLA="; + vendorHash = "sha256-s2h0ayBEuHUHcqYvyQTMNu9+NR5OVjzRshKzILDlrKs="; subPackages = [ "cmd/nuclei/" ]; From efad42eef228f19fe39f641c6270c7eb9f708fb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 04:05:56 +0000 Subject: [PATCH 31/62] minijinja: 1.0.16 -> 1.0.17 --- pkgs/by-name/mi/minijinja/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 4c08223458b8..6e4a404f4f87 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "1.0.16"; + version = "1.0.17"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-/mWXtAu+4B0VTZsID7FOQkSnuTxOLUUrl+vubqPClCw="; + hash = "sha256-NMDPOvSTBEw0469BKEAjL5T/OfVw807KESOpflNe3GI="; }; - cargoHash = "sha256-iMRcQL7/Q/9UmwPwaQslMruyUQ2QSU+5y7VNeAFMzk8="; + cargoHash = "sha256-50fJ7Pb4MLICv3JkeeqiXEcu5cYYU0653YYWEd8HlJU="; # The tests relies on the presence of network connection doCheck = false; From 35490336224566cf9ff0eb34d10e6a03f62c809c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 9 Apr 2024 04:20:00 +0000 Subject: [PATCH 32/62] vale: 3.4.0 -> 3.4.1 Diff: https://github.com/errata-ai/vale/compare/v3.4.0...v3.4.1 Changelog: https://github.com/errata-ai/vale/releases/tag/v3.4.1 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index fa873ea4f6d3..9fa3c12ccc88 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "3.4.0"; + version = "3.4.1"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-b2IPoBu9gIPnq/G4vbomA6L6dPD7GK4dzjL0eUy6b3Q="; + hash = "sha256-fD2KBKDfKTNYuzP/zKkAx9h/HMxOlAyiWtp9EsWxop8="; }; vendorHash = "sha256-HMzFLSmO6sBDNU89UoIvHcPPd3ubpti2ii4sFMKUDmI="; From 1c905fa8812a78fb4eea7317b3270bf155bd6677 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 9 Apr 2024 06:41:04 +0200 Subject: [PATCH 33/62] cling: cleanup --- pkgs/development/interpreters/cling/default.nix | 5 +---- .../cling/force-install-cling-targets.patch | 16 ---------------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 pkgs/development/interpreters/cling/force-install-cling-targets.patch diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index 08909063ce46..cb0d66c67719 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -1,6 +1,5 @@ { cmake , fetchFromGitHub -, fetchgit , git , lib , libffi @@ -53,7 +52,7 @@ let clingSrc = fetchFromGitHub { owner = "root-project"; repo = "cling"; - rev = "v1.0"; + rev = "v${version}"; sha256 = "sha256-Ye8EINzt+dyNvUIRydACXzb/xEPLm0YSkz08Xxw3xp4="; }; @@ -66,8 +65,6 @@ let patches = [ ./no-clang-cpp.patch - - # ./force-install-cling-targets.patch ]; nativeBuildInputs = [ python3 git cmake ]; diff --git a/pkgs/development/interpreters/cling/force-install-cling-targets.patch b/pkgs/development/interpreters/cling/force-install-cling-targets.patch deleted file mode 100644 index 627e2593298e..000000000000 --- a/pkgs/development/interpreters/cling/force-install-cling-targets.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tools/cling/cmake/modules/CMakeLists.txt b/tools/cling/cmake/modules/CMakeLists.txt ---- a/tools/cling/cmake/modules/CMakeLists.txt -+++ b/tools/cling/cmake/modules/CMakeLists.txt -@@ -54,10 +54,8 @@ set(CLING_CONFIG_EXPORTS_FILE) - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - get_property(cling_has_exports GLOBAL PROPERTY CLING_HAS_EXPORTS) -- if(cling_has_exports) -- install(EXPORT ClingTargets DESTINATION ${CLING_INSTALL_PACKAGE_DIR} -- COMPONENT cling-cmake-exports) -- endif() -+ install(EXPORT ClingTargets DESTINATION ${CLING_INSTALL_PACKAGE_DIR} -+ COMPONENT cling-cmake-exports) - - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/ClingConfig.cmake From 18c40a3873b361636e0d13957e5995dca06797bf Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 9 Apr 2024 06:41:44 +0200 Subject: [PATCH 34/62] cling: fix runtime error on aarch64-linux --- pkgs/development/interpreters/cling/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index cb0d66c67719..a53335fc4de6 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -122,7 +122,7 @@ let "-l" "${llvmPackages_13.libcxx}/lib/libc++.so" ] else [ "-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}" - "-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}/x86_64-unknown-linux-gnu" + "-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}/${stdenv.hostPlatform.config}" ]; # The flags passed to the wrapped cling should From 811a1b144a03ab80ee86fcece764fa47f055909d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 9 Apr 2024 06:41:52 +0200 Subject: [PATCH 35/62] cling: fix runtime error on darwin --- pkgs/development/interpreters/cling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/cling/default.nix b/pkgs/development/interpreters/cling/default.nix index a53335fc4de6..a5a3de81bd5a 100644 --- a/pkgs/development/interpreters/cling/default.nix +++ b/pkgs/development/interpreters/cling/default.nix @@ -27,7 +27,7 @@ # Build with libc++ (LLVM) rather than stdlibc++ (GCC). # This is experimental and not all features work. -, useLLVMLibcxx ? false +, useLLVMLibcxx ? clangStdenv.isDarwin }: let @@ -119,7 +119,7 @@ let cxxFlags = if useLLVMLibcxx then [ "-I" "${lib.getDev llvmPackages_13.libcxx}/include/c++/v1" "-L" "${llvmPackages_13.libcxx}/lib" - "-l" "${llvmPackages_13.libcxx}/lib/libc++.so" + "-l" "${llvmPackages_13.libcxx}/lib/libc++${stdenv.hostPlatform.extensions.sharedLibrary}" ] else [ "-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}" "-I" "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}/${stdenv.hostPlatform.config}" From 10e666787890e9a260f7a7078fbf0d7b87373e38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 05:00:55 +0000 Subject: [PATCH 36/62] python312Packages.reptor: 0.17 -> 0.18 --- pkgs/development/python-modules/reptor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 3f472ef12733..fd375f8836f1 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.17"; + version = "0.18"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-3GINDFKgvFv03xF+77K+sTKSm0+kLF5m70dQ/iksZeM="; + hash = "sha256-sojU2Asop0b/b/gfKXoRseuT1zHEO00JNrRWhMYh0Vo="; }; pythonRelaxDeps = true; From b94acc38a651a30d68be4296318e69d9208da15c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 05:43:16 +0000 Subject: [PATCH 37/62] python311Packages.llama-index-readers-file: 0.1.13 -> 0.1.15 --- .../python-modules/llama-index-readers-file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index 18a126dd3822..af23fd10e5c6 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.1.13"; + version = "0.1.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-gw8G7Hs0Q3/Du18mjSNcXHZAKWrbFI2Pkid9zrfwhG0="; + hash = "sha256-mAh9mDofLSaWGAUhfxPSSw8jy76OMtIyeuhrHuZo07I="; }; pythonRelaxDeps = [ From 0bd01ec0bf1916eff160c3467a3eb2069039ac3e Mon Sep 17 00:00:00 2001 From: name_snrl Date: Tue, 9 Apr 2024 11:09:59 +0500 Subject: [PATCH 38/62] where-is-my-sddm-theme: add `meta.platforms` --- pkgs/by-name/wh/where-is-my-sddm-theme/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix index 382f2bf25436..6026a107f70b 100644 --- a/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix +++ b/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix @@ -75,6 +75,7 @@ stdenvNoCC.mkDerivation rec { description = "The most minimalistic SDDM theme among all themes"; homepage = "https://github.com/stepanzubkov/where-is-my-sddm-theme"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ name-snrl ]; }; } From 1d7fe1f873ddfdfd5d4ca792de3e6097a37ef5de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 06:11:09 +0000 Subject: [PATCH 39/62] phrase-cli: 2.23.0 -> 2.23.1 --- pkgs/tools/misc/phrase-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index a9a842f8451d..6395412e412c 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.23.0"; + version = "2.23.1"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-ucuksG3T4cI/cuEsHe4+7RtY+n05p3RvW/tijZ49lVY="; + sha256 = "sha256-5VoRl7pA37QJkgQ6ClyTC6Ya4ZLuVs6aqiAwk1kBFMY="; }; - vendorHash = "sha256-ZWCwSiKoU/zXD9JJ/8qW2tiXWAMqkh0Md0MLz0V4P4E="; + vendorHash = "sha256-31QMyqJcyWYIq12EA/B0tip70yixFAi7EqIeeo11ZS8="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; From a9112b5d0896a44702f10316076f5fb8c167ca0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 06:14:17 +0000 Subject: [PATCH 40/62] stirling-pdf: 0.22.7 -> 0.22.8 --- pkgs/by-name/st/stirling-pdf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stirling-pdf/package.nix b/pkgs/by-name/st/stirling-pdf/package.nix index 9b6ac34559c7..0b2e17aee851 100644 --- a/pkgs/by-name/st/stirling-pdf/package.nix +++ b/pkgs/by-name/st/stirling-pdf/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stirling-pdf"; - version = "0.22.7"; + version = "0.22.8"; src = fetchFromGitHub { owner = "Stirling-Tools"; repo = "Stirling-PDF"; rev = "v${finalAttrs.version}"; - hash = "sha256-BB9O5nf47IrBbrnjU1sWw6xKT4XR1c+fWrno4liH5Xs="; + hash = "sha256-wFxIMubZ6327iBRyHxeo/hsPyq572gk6K8waJ3KyMEw="; }; patches = [ From 90ebf30a87a4bd36f1d6249550411dfb1cdb04e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Apr 2024 06:26:13 +0000 Subject: [PATCH 41/62] ugrep: 5.1.1 -> 5.1.3 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index fcea411e1a73..33173396f267 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "5.1.1"; + version = "5.1.3"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZMBu8hewPuwpm64Oe6JselynEv04JTR/OTbpbmkfe3Y="; + hash = "sha256-ap0akp787pr1gRGFTGQ6ZPwkABgloqQ05XnmM7filGs="; }; buildInputs = [ From 5a3e9e23e10ba27f4f00c15796ecff0027771c03 Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Tue, 9 Apr 2024 08:39:54 +0200 Subject: [PATCH 42/62] ttfb: 1.10.0 -> 1.11.0 --- pkgs/development/tools/ttfb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ttfb/default.nix b/pkgs/development/tools/ttfb/default.nix index e8a86c21bc5d..145144528fef 100644 --- a/pkgs/development/tools/ttfb/default.nix +++ b/pkgs/development/tools/ttfb/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "ttfb"; - version = "1.10.0"; + version = "1.11.0"; src = fetchCrate { inherit pname version; - hash = "sha256-94gBofb7H7+qU50+cp+rq14Vtbk2vuXFQksNITvICm4="; + hash = "sha256-38mhwYfWoMZzdbkgv65hBpX23wCpAWwiahuzO5xRpmA="; }; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoHash = "sha256-CUisxtUQXkStqSZikIoAN0GwpUjvQqon7KqI0beHL5U="; + cargoHash = "sha256-Gqv4XvG3aYMRdMP1mzUlsCPN+NMLHq2nf283KBQCems=="; # The bin feature activates all dependencies of the binary. Otherwise, # only the library is build. From 0ea497560254baa7c6b32feb7d72a143971ffde9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 09:43:13 +0200 Subject: [PATCH 43/62] python312Packages.llama-index-readers-file: refactor --- .../python-modules/llama-index-readers-file/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index af23fd10e5c6..9bd1e0a78630 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -29,12 +29,11 @@ buildPythonPackage rec { "pypdf" ]; - pythonRemoveDeps = [ - "bs4" - ]; - build-system = [ poetry-core + ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; From ef53fd45c6ee7089f3c50d6922f5f0933025ff23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 09:43:42 +0200 Subject: [PATCH 44/62] python312Packages.llama-index-readers-file: foramt with nixfmt --- .../llama-index-readers-file/default.nix | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index 9bd1e0a78630..a15ce6edf0f7 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -1,14 +1,15 @@ -{ lib -, beautifulsoup4 -, buildPythonPackage -, fetchPypi -, llama-index-core -, poetry-core -, pymupdf -, pypdf -, pythonOlder -, pythonRelaxDepsHook -, striprtf +{ + lib, + beautifulsoup4, + buildPythonPackage, + fetchPypi, + llama-index-core, + poetry-core, + pymupdf, + pypdf, + pythonOlder, + pythonRelaxDepsHook, + striprtf, }: buildPythonPackage rec { @@ -29,13 +30,9 @@ buildPythonPackage rec { "pypdf" ]; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ beautifulsoup4 @@ -48,9 +45,7 @@ buildPythonPackage rec { # Tests are only available in the mono repo doCheck = false; - pythonImportsCheck = [ - "llama_index.readers.file" - ]; + pythonImportsCheck = [ "llama_index.readers.file" ]; meta = with lib; { description = "LlamaIndex Readers Integration for files"; From 6807b11d9dc7c03d9cc20e0c8269939622737d5c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 09:47:18 +0200 Subject: [PATCH 45/62] python312Packages.reptor: refactor --- pkgs/development/python-modules/reptor/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index fd375f8836f1..f7c7b1975d51 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -47,10 +47,13 @@ buildPythonPackage rec { pythonRelaxDeps = true; build-system = [ - pythonRelaxDepsHook setuptools ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + dependencies = [ asgiref certifi From 1a387379ac18af10b5a64c362485daae583f600b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 09:47:36 +0200 Subject: [PATCH 46/62] python312Packages.reptor: format with nixfmt --- .../python-modules/reptor/default.nix | 82 ++++++++----------- 1 file changed, 36 insertions(+), 46 deletions(-) diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index f7c7b1975d51..3c52cc3f49aa 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -1,33 +1,34 @@ -{ lib -, asgiref -, buildPythonPackage -, certifi -, charset-normalizer -, cvss -, deepl -, django -, fetchFromGitHub -, gql -, idna -, markdown-it-py -, mdurl -, pygments -, pytest -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pyyaml -, reptor -, requests -, rich -, setuptools -, sqlparse -, termcolor -, tomli -, tomli-w -, tomlkit -, urllib3 -, xmltodict +{ + lib, + asgiref, + buildPythonPackage, + certifi, + charset-normalizer, + cvss, + deepl, + django, + fetchFromGitHub, + gql, + idna, + markdown-it-py, + mdurl, + pygments, + pytest, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pyyaml, + reptor, + requests, + rich, + setuptools, + sqlparse, + termcolor, + tomli, + tomli-w, + tomlkit, + urllib3, + xmltodict, }: buildPythonPackage rec { @@ -46,13 +47,9 @@ buildPythonPackage rec { pythonRelaxDeps = true; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ asgiref @@ -77,12 +74,8 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - ghostwriter = [ - gql - ] ++ gql.optional-dependencies.aiohttp; - translate = [ - deepl - ]; + ghostwriter = [ gql ] ++ gql.optional-dependencies.aiohttp; + translate = [ deepl ]; }; nativeCheckInputs = [ @@ -94,9 +87,7 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; - pythonImportsCheck = [ - "reptor" - ]; + pythonImportsCheck = [ "reptor" ]; disabledTestPaths = [ # Tests want to use pip install dependencies @@ -107,7 +98,6 @@ buildPythonPackage rec { # Tests need network access "TestDummy" "TestIntegration" - ]; meta = with lib; { From 634308e6f59fb71b1f8a2c8b04f0fd3415f35bcb Mon Sep 17 00:00:00 2001 From: toastal Date: Tue, 9 Apr 2024 14:47:57 +0700 Subject: [PATCH 47/62] =?UTF-8?q?zfs=5Funstable:=202.2.3-unstable-2024-03-?= =?UTF-8?q?30=20=E2=86=92=202.2.3-unstable-2024-04-09?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/linux/zfs/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 786df2273522..c8db9c5c5df9 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -22,13 +22,13 @@ callPackage ./generic.nix args { # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.2.3-unstable-2024-03-30"; - rev = "deb7a84231aff8d772bb4ce9fa486d1886f1a2b6"; + version = "2.2.3-unstable-2024-04-09"; + rev = "28520cad2500b60ce8653e431990e33f77ff08f7"; isUnstable = true; tests = [ nixosTests.zfs.unstable ]; - hash = "sha256-d9ZoUFuHPmJmIBbJKENVTCTJ5U3As+3NYHk9ghWxCCA="; + hash = "sha256-lGoiTmCWOxqACSYY0WA0gN6CN/1FyYhSVHmtYC1Izhg="; } From 604057ddf790c602bfa6bb4db9412d10c0002d0e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 09:50:44 +0200 Subject: [PATCH 48/62] python312Packages.mkdocstrings-python: refactor --- .../python-modules/mkdocstrings-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 23595e12c695..b562b62e2fbf 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { hash = "sha256-UJSDnkdohFn+U7i5fYiRVMLZZ8Nyb0fdihBZl2z2RBc="; }; - nativeBuildInputs = [ + build-system = [ pdm-backend ]; - propagatedBuildInputs = [ + dependencies = [ griffe mkdocstrings ]; From a1fd75525752bd179b9ba56de5d7b1f2e4275420 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 09:51:06 +0200 Subject: [PATCH 49/62] python312Packages.mkdocstrings-python: format with nixfmt --- .../mkdocstrings-python/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index b562b62e2fbf..7a57a73338ad 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, griffe -, mkdocs-material -, mkdocstrings -, pdm-backend -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + griffe, + mkdocs-material, + mkdocstrings, + pdm-backend, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -23,9 +24,7 @@ buildPythonPackage rec { hash = "sha256-UJSDnkdohFn+U7i5fYiRVMLZZ8Nyb0fdihBZl2z2RBc="; }; - build-system = [ - pdm-backend - ]; + build-system = [ pdm-backend ]; dependencies = [ griffe @@ -37,9 +36,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "mkdocstrings_handlers" - ]; + pythonImportsCheck = [ "mkdocstrings_handlers" ]; meta = with lib; { description = "Python handler for mkdocstrings"; From a6942fb843b76a3c468fd2d388a00250ac22b237 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 09:56:18 +0200 Subject: [PATCH 50/62] sad: format with nixfmt --- pkgs/tools/text/sad/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/tools/text/sad/default.nix index f12f1d9f03af..d0c6e430e726 100644 --- a/pkgs/tools/text/sad/default.nix +++ b/pkgs/tools/text/sad/default.nix @@ -1,7 +1,8 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, python3 +{ + lib, + fetchFromGitHub, + rustPlatform, + python3, }: rustPlatform.buildRustPackage rec { From d5e551b1c90044faede4261c0c1fd1aa932c7ab6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 09:58:22 +0200 Subject: [PATCH 51/62] python312Packages.aiolifx-themes: 0.4.14 -> 0.4.16 Diff: https://github.com/Djelibeybi/aiolifx-themes/compare/refs/tags/v0.4.14...v0.4.16 Changelog: https://github.com/Djelibeybi/aiolifx-themes/releases/tag/v0.4.16 --- pkgs/development/python-modules/aiolifx-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 33f3c963f5ea..51ae6eb2509f 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.14"; + version = "0.4.16"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-KlQKRcgxaWqRKIusnZGoBDEfKYF1Gn9EkrhJAftdUTc="; + hash = "sha256-rtZRl1doTBg8CdX0p9fLzo6m2dx8YKCQOOZyvIPSr9A="; }; prePatch = '' From 609fb16482329f1ba2f92c803806e5b91a3f535f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 10:06:11 +0200 Subject: [PATCH 52/62] python312Packages.clarifai: 10.2.1 -> 10.3.0 Diff: https://github.com/Clarifai/clarifai-python/compare/refs/tags/10.2.1...10.3.0 Changelog: https://github.com/Clarifai/clarifai-python/releases/tag/10.3.0 --- pkgs/development/python-modules/clarifai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 54faa5fd47c8..661c7a74bf3a 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "10.2.1"; + version = "10.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-jI85xMApeEd0Hl6h4Am5qxWoSSTWHsmb7FxUjJPmBQM="; + hash = "sha256-8EPs6kGB+Px9Fs2Z+YwDcmEYI5+z/kOIKLraJFMykF0="; }; pythonRelaxDeps = [ From 7efb1fe2f3e58e92b4be8dea3191b06fe8389fa9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 10:08:40 +0200 Subject: [PATCH 53/62] python312Packages.clarifai: refac tor --- pkgs/development/python-modules/clarifai/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 661c7a74bf3a..c1771665e505 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -45,10 +45,13 @@ buildPythonPackage rec { ]; build-system = [ - pythonRelaxDepsHook setuptools ]; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + dependencies = [ clarifai-grpc inquirerpy From 1ad7046bcfef841998e26aaf05f7eb2c8ce36bc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 10:08:57 +0200 Subject: [PATCH 54/62] python312Packages.clarifai: format with nixfmt --- .../python-modules/clarifai/default.nix | 73 ++++++++----------- 1 file changed, 30 insertions(+), 43 deletions(-) diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index c1771665e505..ee6a1eb6bc64 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -1,25 +1,26 @@ -{ lib -, buildPythonPackage -, clarifai-grpc -, fetchFromGitHub -, inquirerpy -, llama-index-core -, numpy -, opencv4 -, pandas -, pillow -, pycocotools -, pypdf -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, pyyaml -, rich -, schema -, setuptools -, tabulate -, tqdm -, tritonclient +{ + lib, + buildPythonPackage, + clarifai-grpc, + fetchFromGitHub, + inquirerpy, + llama-index-core, + numpy, + opencv4, + pandas, + pillow, + pycocotools, + pypdf, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + pyyaml, + rich, + schema, + setuptools, + tabulate, + tqdm, + tritonclient, }: buildPythonPackage rec { @@ -36,21 +37,13 @@ buildPythonPackage rec { hash = "sha256-8EPs6kGB+Px9Fs2Z+YwDcmEYI5+z/kOIKLraJFMykF0="; }; - pythonRelaxDeps = [ - "clarifai-grpc" - ]; + pythonRelaxDeps = [ "clarifai-grpc" ]; - pythonRemoveDeps = [ - "opencv-python" - ]; + pythonRemoveDeps = [ "opencv-python" ]; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; dependencies = [ clarifai-grpc @@ -70,14 +63,10 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - all = [ - pycocotools - ]; + all = [ pycocotools ]; }; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export HOME=$(mktemp -d) @@ -102,9 +91,7 @@ buildPythonPackage rec { "clarifai/models/model_serving/repo_build/static_files/base_test.py" ]; - pythonImportsCheck = [ - "clarifai" - ]; + pythonImportsCheck = [ "clarifai" ]; meta = with lib; { description = "Clarifai Python Utilities"; From 715f29e24753ff3b06ac64f9fc11ae1bd6906d99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 10:10:42 +0200 Subject: [PATCH 55/62] python312Packages.tencentcloud-sdk-python: 3.0.1124 -> 3.0.1125 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1124...3.0.1125 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1125/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index b570fa8541fe..5efe78255f18 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1124"; + version = "3.0.1125"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-ubQI4+5WYj3zWikDaRMunyObxW6dqDxOQ4nTv/8/sv4="; + hash = "sha256-4oof7FDgwTORGnaI+C5pTd1Fj5EgyBFfsVJPhRhu96o="; }; build-system = [ setuptools ]; From bbea6b19bde615ac3f9225371cec446733cb13a2 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:01:15 +0200 Subject: [PATCH 56/62] azure-cli: add setuptools to runtime dependencies https://github.com/NixOS/nixpkgs/pull/276695/commits/aacf05daec3141ce2bb34fd7c021a86401ac8c51 cleaned up python path and removed setuptools from the runtime dependencies, which seems to be required now by the `self-check` command which runs in `installCheckPhase`. There was a version bump on master since the last CI run on this PR, that's why it wasn't catched. Previously this was part of the closure as we didn't construct the PYTHONPATH explicitly but wrapped the CLI with the PYTHONPATH from the build environment. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 0b9fc0523bf1..d55258485de5 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -219,6 +219,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage rec { requests scp semver + setuptools six sshtunnel tabulate From 14f6ef0369d6d8e8491a7f3e306068613f91c8a1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 2 Apr 2024 16:17:05 +0200 Subject: [PATCH 57/62] libhugetlbfs: 2.23 -> 2.24 --- .../libraries/libhugetlbfs/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/development/libraries/libhugetlbfs/default.nix index 0f7859be9dbb..9151751b2379 100644 --- a/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/pkgs/development/libraries/libhugetlbfs/default.nix @@ -1,23 +1,18 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { pname = "libhugetlbfs"; - version = "2.23"; + version = "2.24"; src = fetchurl { url = "https://github.com/libhugetlbfs/libhugetlbfs/releases/download/${version}/libhugetlbfs-${version}.tar.gz"; - sha256 = "0ya4q001g111d3pqlzrf3yaifadl0ccirx5dndz1pih7x3qp41mp"; + hash = "sha256-1QHfqRyOrREGlno9OCnyunOMP6wKZcs1jtKrOHDdxe8="; }; - patches = [ - (fetchurl { - url = "https://build.opensuse.org/public/source/openSUSE:Factory/libhugetlbfs/glibc-2.34-fix.patch?rev=50"; - sha256 = "sha256-eRQa6M0ZdHMtwA5nnzDTWYv/x4AnRZhj+MpDiwyCvVM="; - }) - ]; - outputs = [ "bin" "dev" "man" "doc" "lib" "out" ]; + nativeBuildInputs = [ autoreconfHook ]; + postConfigure = '' patchShebangs ld.hugetlbfs ''; From 4bab48ccc3b3bb2cd1afc9295a27ef7e1195aca3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 2 Apr 2024 16:17:26 +0200 Subject: [PATCH 58/62] libhugetlbfs: add homepage and changelog --- pkgs/development/libraries/libhugetlbfs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/development/libraries/libhugetlbfs/default.nix index 9151751b2379..bcc676b1b040 100644 --- a/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/pkgs/development/libraries/libhugetlbfs/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-docs" ]; meta = with lib; { + homepage = "https://github.com/libhugetlbfs/libhugetlbfs"; + changelog = "https://github.com/libhugetlbfs/libhugetlbfs/blob/${version}/NEWS"; description = "library and utilities for Linux hugepages"; maintainers = with maintainers; [ qyliss ]; license = licenses.lgpl21Plus; From 517c2269055091d0665b8a733d161d40982c09b4 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 9 Apr 2024 12:58:08 +0200 Subject: [PATCH 59/62] redict: init at 7.3.0 (#300049) Redict Announcement: https://redict.io/posts/2024-03-22-redict-is-an-independent-fork/ Release Notes: https://redict.io/posts/2024-04-03-redict-7.3.0-released/ --- pkgs/by-name/re/redict/package.nix | 94 ++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 pkgs/by-name/re/redict/package.nix diff --git a/pkgs/by-name/re/redict/package.nix b/pkgs/by-name/re/redict/package.nix new file mode 100644 index 000000000000..39133faa9b1b --- /dev/null +++ b/pkgs/by-name/re/redict/package.nix @@ -0,0 +1,94 @@ +{ lib, stdenv, fetchFromGitea, fetchurl, fetchpatch, lua, jemalloc, pkg-config, nixosTests +, tcl, which, ps, getconf +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd +# dependency ordering is broken at the moment when building with openssl +, tlsSupport ? !stdenv.hostPlatform.isStatic, openssl + +# Using system jemalloc fixes cross-compilation and various setups. +# However the experimental 'active defragmentation' feature of redict requires +# their custom patched version of jemalloc. +, useSystemJemalloc ? true +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "redict"; + version = "7.3.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "redict"; + repo = "redict"; + rev = finalAttrs.version; + hash = "sha256-vtDb+VqDAtrce6dpDRnPO6N9Z6dFfy8fUUqNeiZ+r5c="; + }; + + patches = lib.optionals useSystemJemalloc [ + # use system jemalloc + (fetchurl { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch"; + hash = "sha256-VPRfoSnctkkkzLrXEWQX3Lh5HmZaCXoJafyOG007KzM="; + }) + ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ lua ] + ++ lib.optional useSystemJemalloc jemalloc + ++ lib.optional withSystemd systemd + ++ lib.optionals tlsSupport [ openssl ]; + + preBuild = lib.optionalString stdenv.isDarwin '' + substituteInPlace src/Makefile --replace "-flto" "" + ''; + + # More cross-compiling fixes. + makeFlags = [ "PREFIX=${placeholder "out"}" ] + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" ] + ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ] + ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ]; + + enableParallelBuilding = true; + + hardeningEnable = lib.optionals (!stdenv.isDarwin) [ "pie" ]; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]); + + # darwin currently lacks a pure `pgrep` which is extensively used here + doCheck = !stdenv.isDarwin; + nativeCheckInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; + checkPhase = '' + runHook preCheck + + # disable test "Connect multiple replicas at the same time": even + # upstream find this test too timing-sensitive + substituteInPlace tests/integration/replication.tcl \ + --replace 'foreach mdl {no yes}' 'foreach mdl {}' + + substituteInPlace tests/support/server.tcl \ + --replace 'exec /usr/bin/env' 'exec env' + + sed -i '/^proc wait_load_handlers_disconnected/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \ + tests/support/util.tcl + + ./runtest \ + --no-latency \ + --timeout 2000 \ + --clients $NIX_BUILD_CORES \ + --tags -leaks \ + --skipunit integration/failover # flaky and slow + + runHook postCheck + ''; + + passthru.tests.redict = nixosTests.redict; + + meta = with lib; { + homepage = "https://redict.io"; + description = "A distributed key/value store"; + license = licenses.lgpl3Only; + platforms = platforms.all; + changelog = "https://codeberg.org/redict/redict/releases/tag/${finalAttrs.version}"; + maintainers = with maintainers; [ yuka gmemstr ]; + mainProgram = "redict-cli"; + }; +}) From 620f5a440b33f8f3155a61f68cb1f17e06d9c30c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 4 Apr 2024 10:09:57 +0200 Subject: [PATCH 60/62] box2d: 2.3.1 -> 2.4.1 --- pkgs/development/libraries/box2d/default.nix | 65 +++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 53 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 84e2dbc05644..c2611a8b8dff 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,37 +1,72 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libGLU, libGL, freeglut, libX11, xorgproto -, libXi, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libGLU +, libGL +, freeglut +, libX11 +, libXcursor +, libXinerama +, libXrandr +, xorgproto +, libXi +, pkg-config +, Carbon +, Cocoa +, Kernel +, OpenGL +, settingsFile ? "include/box2d/b2_settings.h" +}: -stdenv.mkDerivation rec { +let + inherit (lib) cmakeBool optionals; + +in +stdenv.mkDerivation (finalAttrs: { pname = "box2d"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "erincatto"; repo = "box2d"; - rev = "v${version}"; - sha256 = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs="; + rev = "v${finalAttrs.version}"; + hash = "sha256-cL8L+WSTcswj+Bwy8kSOwuEqLyWEM6xa/j/94aBiSck="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libGLU libGL freeglut libX11 xorgproto libXi ]; + + buildInputs = [ + libGLU + libGL + freeglut + libX11 + libXcursor + libXinerama + libXrandr + xorgproto + libXi + ] ++ optionals stdenv.isDarwin [ + Carbon Cocoa Kernel OpenGL + ]; cmakeFlags = [ - "-DBOX2D_INSTALL=ON" - "-DBOX2D_BUILD_SHARED=ON" - "-DBOX2D_BUILD_EXAMPLES=OFF" + (cmakeBool "BOX2D_BUILD_UNIT_TESTS" finalAttrs.doCheck) ]; prePatch = '' - cd Box2D - substituteInPlace Box2D/Common/b2Settings.h \ - --replace 'b2_maxPolygonVertices 8' 'b2_maxPolygonVertices 15' + substituteInPlace ${settingsFile} \ + --replace-fail 'b2_maxPolygonVertices 8' 'b2_maxPolygonVertices 15' ''; + # tests are broken on 2.4.1 and 2.3.x doesn't have tests: https://github.com/erincatto/box2d/issues/677 + doCheck = lib.versionAtLeast finalAttrs.version "2.4.2"; + meta = with lib; { description = "2D physics engine"; homepage = "https://box2d.org/"; - maintainers = [ maintainers.raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; license = licenses.zlib; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6fdde2f5bd88..710ded329967 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20382,7 +20382,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; - box2d = callPackage ../development/libraries/box2d { }; + box2d = callPackage ../development/libraries/box2d { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel OpenGL; + }; boxfort = callPackage ../development/libraries/boxfort { }; From 9ec0f980b87606e799e8a3c322247ac7a1cdb420 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 4 Apr 2024 10:10:48 +0200 Subject: [PATCH 61/62] libsForQt5.qmlbox2d: 2018-04-06 -> 2022-08-025 --- .../libraries/qmlbox2d/default.nix | 46 +++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/qmlbox2d/default.nix b/pkgs/development/libraries/qmlbox2d/default.nix index e1e69b9f10b4..0c50c9e3649b 100644 --- a/pkgs/development/libraries/qmlbox2d/default.nix +++ b/pkgs/development/libraries/qmlbox2d/default.nix @@ -1,31 +1,51 @@ -{lib, stdenv, qtdeclarative, fetchFromGitHub, qmake }: +{ lib, stdenv, qtbase, qtdeclarative, fetchFromGitHub, cmake, pkg-config, box2d }: + +let + inherit (lib) cmakeBool; + + # 2.3.1 is the only supported version + box2d' = (box2d.override { settingsFile = "Box2D/Common/b2Settings.h"; }).overrideAttrs (old: rec { + version = "2.3.1"; + src = fetchFromGitHub { + owner = "erincatto"; + repo = "box2d"; + rev = "v${version}"; + hash = "sha256-Z2J17YMzQNZqABIa5eyJDT7BWfXveymzs+DWsrklPIs="; + }; + sourceRoot = "source/Box2D"; + cmakeFlags = old.cmakeFlags or [ ] ++ [ + (cmakeBool "BOX2D_INSTALL" true) + (cmakeBool "BOX2D_BUILD_SHARED" true) + (cmakeBool "BOX2D_BUILD_EXAMPLES" false) + ]; + }); + +in stdenv.mkDerivation { pname = "qml-box2d"; - version = "unstable-2018-04-06"; + version = "unstable-2022-08-25"; + src = fetchFromGitHub { owner = "qml-box2d"; repo = "qml-box2d"; - sha256 = "0gb8limy6ck23z3k0k2j7c4c4s95p40f6lbzk4szq7fjnnw22kb7"; - rev = "b7212d5640701f93f0cd88fbd3a32c619030ae62"; + rev = "0bb88a6f871eef72b3b9ded9329c15f1da1f4fd7"; + hash = "sha256-sfSVetpHIAIujpgjvRScAkJRlQQYjQ/yQrkWvp7Yu0s="; }; dontWrapQtApps = true; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtdeclarative ]; + nativeBuildInputs = [ cmake pkg-config ]; - patchPhase = '' - substituteInPlace box2d.pro \ - --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/" - qmakeFlags="$qmakeFlags PREFIXSHORTCUT=$out" - ''; + buildInputs = [ box2d' qtbase qtdeclarative ]; - installFlags = [ "INSTALL_ROOT=$(out)" ]; + cmakeFlags = [ + (cmakeBool "USE_SYSTEM_BOX2D" true) + ]; meta = with lib; { description = "A QML plugin for Box2D engine"; homepage = "https://github.com/qml-box2d/qml-box2d"; - maintainers = [ maintainers.guibou ]; + maintainers = with maintainers; [ guibou ]; platforms = platforms.linux; license = licenses.zlib; }; From 5312af4f900617e16ae836ec0013f6762ba0db04 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 4 Apr 2024 10:11:09 +0200 Subject: [PATCH 62/62] qt6Packages.qmlbox2d: init at unstable-2022-08-25 --- pkgs/top-level/qt6-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index e136faf2fb29..eb04beaef279 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -65,6 +65,7 @@ makeScopeWithSplicing' { }; qcoro = callPackage ../development/libraries/qcoro { }; qgpgme = callPackage ../development/libraries/gpgme { }; + qmlbox2d = callPackage ../development/libraries/qmlbox2d { }; packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; qt6ct = callPackage ../tools/misc/qt6ct { };