diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-06 00:02:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-06 00:02:28 +0000 |
commit | bcf3e3f1c8c8ae503ac356125ba0712bce375ef5 (patch) | |
tree | f80fe55de243e8152e4c285d035281a3e66923ad /pkgs/applications | |
parent | 161bf632341df1343b4de0cbec483b78e11d2bda (diff) | |
parent | 72eff9fe5d49ba7ee36984b2c8b21e1481f06a83 (diff) | |
download | nixpkgs-bcf3e3f1c8c8ae503ac356125ba0712bce375ef5.tar nixpkgs-bcf3e3f1c8c8ae503ac356125ba0712bce375ef5.tar.gz nixpkgs-bcf3e3f1c8c8ae503ac356125ba0712bce375ef5.tar.bz2 nixpkgs-bcf3e3f1c8c8ae503ac356125ba0712bce375ef5.tar.lz nixpkgs-bcf3e3f1c8c8ae503ac356125ba0712bce375ef5.tar.xz nixpkgs-bcf3e3f1c8c8ae503ac356125ba0712bce375ef5.tar.zst nixpkgs-bcf3e3f1c8c8ae503ac356125ba0712bce375ef5.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications')
36 files changed, 1639 insertions, 709 deletions
diff --git a/pkgs/applications/audio/bambootracker/default.nix b/pkgs/applications/audio/bambootracker/default.nix index e805dd1f90c..6c1bd006c7a 100644 --- a/pkgs/applications/audio/bambootracker/default.nix +++ b/pkgs/applications/audio/bambootracker/default.nix @@ -17,14 +17,14 @@ assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null; stdenv.mkDerivation (finalAttrs: { pname = "bambootracker"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-rn6PNxVsLEXz8q3nvMMhKV1/Woq2CxROf0qsQJykyUs="; + hash = "sha256-rMYs2jixzoMGem9lxAjDMbFOMrnK8BLFjZIagdZk/Ok="; }; postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") '' diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index daa528e88d4..1802c7cf896 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-22JQ8GqMRNfBT2ynyGhJBeGgnyAVYVBa5tUGZsleDP0="; + sha256 = "sha256-fs8GAE/beiFLUNBI+r8h08a2TYSY9fYQYGvxBOtClgg="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/btcpayserver/deps.nix b/pkgs/applications/blockchains/btcpayserver/deps.nix index 54ef0abbe57..392a7e15e45 100644 --- a/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,7 +8,7 @@ (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.29"; sha256 = "1kd07n0l0h6cmfxb5mdkawjsbmjynz2dknnj8c22wvk1jchif956"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.31"; sha256 = "1yxg2651m649ha99rzjv7pnphx42bxzf5sc86czj6ng4rpp8rnkb"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.28"; sha256 = "05jkdds1g0xfvf8spakwbyndz8an2kadwybg6dwz6q5rlk0aj7m8"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) @@ -16,7 +16,7 @@ (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.26"; sha256 = "1kfl88psjbsh88l98kc6dyxqjghnzyffi070v2ifkdjcdgdbawfs"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.17"; sha256 = "1n6zbb7rfwp7lbmrzdnw338nwyb8m552fdnar2jp4fd5ffibyrd6"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.20"; sha256 = "1rq8cd7hg8mmvci7fxx0hj1jw7afz6li7y73s3c07xjgiy68jgfl"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.21"; sha256 = "0dgca4d21f08ik4h9hv8cqgkmyqq0mqai6m9wids0dx0zzl7cbyx"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) @@ -38,7 +38,7 @@ (fetchNuGet { pname = "HtmlSanitizer"; version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) - (fetchNuGet { pname = "LNURL"; version = "0.0.29"; sha256 = "00d9n2lgn3paqm12c563rv8slxrbbxq6m58m098l30wsm96llj0r"; }) + (fetchNuGet { pname = "LNURL"; version = "0.0.30"; sha256 = "1sph5vkl0794aky21inp8b9dz2v2clxxx6whfg2g71c0cxrxa3r5"; }) (fetchNuGet { pname = "MailKit"; version = "3.3.0"; sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; }) (fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; }) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 81e4667c1fb..246b43b779e 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -4,13 +4,19 @@ lib.makeScope pkgs.newScope (self: let gconf = pkgs.gnome2.GConf; inherit (self) callPackage; + stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; inheritedArgs = { inherit gconf; + inherit stdenv; inherit (pkgs.darwin) sigtool; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Accelerate AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz QuartzCore UniformTypeIdentifiers WebKit; + gnutls = + if pkgs.stdenv.isDarwin + then pkgs.gnutls.override { inherit stdenv; inherit (pkgs.darwin.apple_sdk_11_0.frameworks) Security; } + else pkgs.gnutls; }; in { sources = import ./sources.nix { diff --git a/pkgs/applications/editors/pixelorama/default.nix b/pkgs/applications/editors/pixelorama/default.nix index dfa7a733e6a..0ca79907f8e 100644 --- a/pkgs/applications/editors/pixelorama/default.nix +++ b/pkgs/applications/editors/pixelorama/default.nix @@ -26,13 +26,13 @@ let else throw "unsupported platform"; in stdenv.mkDerivation (finalAttrs: { pname = "pixelorama"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "Orama-Interactive"; repo = "Pixelorama"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-+gPkuVzQ86MzHQ0AjnPDdyk2p7eIxtggq+KJ43KVbk8="; + sha256 = "sha256-jSgSKxW7cxSoSwBytoaQtLwbkYm2udjmaZTHbN1jJwQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6713cd46e5e..f440f8772b5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPluginFrom2Nix { pname = "ChatGPT.nvim"; - version = "2023-08-16"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "fba5423b3ddf0b67ada2bbb4d5f66d9cf76c996a"; - sha256 = "14vd07w73b6s8wnpzh8lpf75j752z2pmmslq5mjxzx23cdcp8fik"; + rev = "8191b4a1faea28483aa3a495d01ade3eb86409fe"; + sha256 = "0w283187mk1nm8vg5yfnipnq5j53ycyl3qv8vsl75b9mnrldhm1v"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-08-23"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "c7c6353db3208608786503cbade1e9f8d3531f15"; - sha256 = "1nji29s3gjdrfdj21x1vpsfs7ai7q1a8k76mk90nppf2dx15ixpw"; + rev = "762773532c385231904a39bfafd8562ff31156d7"; + sha256 = "139qqm343fx2k27d0s9nci0x4643gggmsiq44sjnx32cq5y689xl"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -377,12 +377,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-08-25"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "7e81ce1019626977f7dbab44fb2abb5517993359"; - sha256 = "11pz313swwv065nkvk2z7hgakijjg696dq7g1a056abk33hs9rh9"; + rev = "6f0728c625bf5861b44b8bd1048fba5f095f2327"; + sha256 = "0k0x726hvgfr4m912ly3q4f7bjxqiapy6hcl2wylrvc9ahaig7px"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -595,12 +595,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2023-08-24"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "63a860e7ed3ae41ee92481ea65a48fb35431ae21"; - sha256 = "0mns3cymfisnd603mwxc30psbsm9m41gwqaai1r3w9iijy5axfkz"; + rev = "26d95031e2c624c5317dbdce386eb89f9356d4c0"; + sha256 = "00g9z4blfal6dx4m488yasvja1pmmwfs7k2dazm1lahlygi3rl7k"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -979,12 +979,12 @@ final: prev: base46 = buildVimPluginFrom2Nix { pname = "base46"; - version = "2023-08-28"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "87a3054bd5cf4f50d42038f3060e5d41bb2d5d8d"; - sha256 = "0iisisfn805mydq2nlx82lwlwj1f4sjc92py1m48ag50vmf62ip5"; + rev = "919af1c40278d91c3f38cba08cb0f49f7e6a12e6"; + sha256 = "15pkgglic6wdgw7pfqaphg9h911p0zra99nx4cxylssfp62f0bpv"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1783,12 +1783,12 @@ final: prev: cmp-rg = buildVimPluginFrom2Nix { pname = "cmp-rg"; - version = "2022-09-05"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "cmp-rg"; - rev = "1cad8eb315643d0df13c37401c03d7986f891011"; - sha256 = "02ij7isp6hzcfkd5zw9inymmpgcmhiz0asjra45w8jkzqlxd322j"; + rev = "677a7874ee8f1afc648c2e7d63a97bc21a7663c5"; + sha256 = "0cahyz5i6iyjqb4cklrkimw5pjajfnlazpmky617ysl3m1b6pwk3"; }; meta.homepage = "https://github.com/lukas-reineke/cmp-rg/"; }; @@ -2011,12 +2011,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2023-07-26"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "9332d2ab1154dedc9dbcd3e1c873886abaf061a6"; - sha256 = "1aq1bz2pl6wfhxawkdwkrcvc18dgs0x3p5fwivfmnhaqislkx4lf"; + rev = "05fcd1acb2e3b70bba6e73b9e470bf765a98170b"; + sha256 = "1c635ckwpj8r6i6bm01s896inbxaqys64gjkr6jbgwc604h4bsvi"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2311,12 +2311,12 @@ final: prev: copilot-cmp = buildVimPluginFrom2Nix { pname = "copilot-cmp"; - version = "2023-08-10"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot-cmp"; - rev = "d631b3afbf26bb17d6cf2b3cd8f3d79e7d5eeca1"; - sha256 = "192s9fi9p4d21c361f0yp44axbkpyf78knrdw7vql0wakb09qi9r"; + rev = "11eb015fbf9f07ad1c72dbdc9d830ebac610b5cd"; + sha256 = "16i9ign32sp1smi34rpg0dqs7a35p691801w6in8zv0ayk6r8bjr"; }; meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; @@ -2539,12 +2539,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-08-24"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "9134d7befd50ff920ede5b0f7d6c3dbb9f7c0ecb"; - sha256 = "09mys6n9hwlbwy48nxndjrr6y0bg67nai36fpjxydqq2i3ijq897"; + rev = "2caf39ffe2b51bdcf28528473b51042760e888f3"; + sha256 = "1d12jaqij8j08q8x50hcbjk26yz3pnrgg5acb0x6qixrhgxm5qfh"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; @@ -3081,12 +3081,12 @@ final: prev: editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-08-29"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "14856573a09f1ddb570bfd8734e34e8018e8aa97"; - sha256 = "0pvxvm56m8q6vl5509r0c045c3hhqnwfm82c6z99x2iwnrw0s39w"; + rev = "aefcf3d735122f349b172302d164d5eb61cd7e5f"; + sha256 = "1aj3bx2gf348mka27bw7k85kgm8j9gpiih5p79zrsry515vy0smx"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -3106,12 +3106,12 @@ final: prev: efmls-configs-nvim = buildVimPluginFrom2Nix { pname = "efmls-configs-nvim"; - version = "2023-08-29"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "e244c307f520dc70627523759386d387c73803b8"; - sha256 = "1w0ralyyz2m11hp7ij44cchibbx0z8p81z4fjvizvcpcjs5xriir"; + rev = "3c299d8c243469476857986fb2404ce3ba7bf0dc"; + sha256 = "05rfhc312y1f9ck6ab83bmmchxszl39cj1q6154zla21nkx8jsp9"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; @@ -3203,12 +3203,12 @@ final: prev: executor-nvim = buildVimPluginFrom2Nix { pname = "executor.nvim"; - version = "2023-08-19"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "google"; repo = "executor.nvim"; - rev = "60348d7644a5729d0bb0de7ee0a3641ae0c1b545"; - sha256 = "188gn67syidq8anajm5dgm1dqzjqmak954vvwp0n2gihr741pwk4"; + rev = "ce7c48e6b60925f9514a8a7ad7bc8c4d8498a85d"; + sha256 = "07vmglghgl3qbmqmrh895i87rc4bzxckky8na5inw704ibz3766c"; }; meta.homepage = "https://github.com/google/executor.nvim/"; }; @@ -3612,12 +3612,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-08-23"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "b7bda51ba7d0c07aaa30e8428a6531e939f6c3a3"; - sha256 = "073mgny8xfv1ndhqh241092g6xv1mw4r16ybjjkifv89kdzz53rj"; + rev = "2632033492cadfbda3a8678d3c3e65d9397e521d"; + sha256 = "1kn4g74vaz23i9g5m4p39cfifsayvmhfxajvbgfk5x30q3mqfpfw"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3720,12 +3720,12 @@ final: prev: git-conflict-nvim = buildVimPluginFrom2Nix { pname = "git-conflict.nvim"; - version = "2023-08-29"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "d084646ef4c40e24eb9cac3eed1f1c8bd140431c"; - sha256 = "0sf5flwraiby8dknfphyq1k8xyzz2h18illr7m7snx28dhll2cja"; + rev = "f20f197df50a0779ba55e933ef0995698ad32039"; + sha256 = "1wmj5hc1g8b8qbfwrckwjz98lrx74fj5skvmp6y2llv2dridk89d"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; @@ -3780,12 +3780,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-08-26"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "d8590288417fef2430f85bc8b312fae8b1cf2c40"; - sha256 = "1ly0hij1ccbvmcx4axdq0bi9iay5ms1597ng84vmx6bnsd0hlfx3"; + rev = "44adf808ace6cb65a3353bd61fa585a2d8fe0db3"; + sha256 = "0wp1rdvf1s2z1z39n6wrh3nm2v5bpazh1qw91qv5sg3yyzv5fdg0"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4020,23 +4020,23 @@ final: prev: hardtime-nvim = buildVimPluginFrom2Nix { pname = "hardtime.nvim"; - version = "2023-08-30"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "ab488faf43d477f544e6880cd9c1ba51f0fd7995"; - sha256 = "1li49j0dpah5bjxqa8abjxhmlgl5xr6b7gv9md5430zsf9gvikyb"; + rev = "cd8212efb4db858251d2d7d15ca1ee76d5f17823"; + sha256 = "1dahkblxv18b3wbin1cyc5jhx65mcwxdw9jylfg5na5qin5nipr3"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; hare-vim = buildVimPluginFrom2Nix { pname = "hare.vim"; - version = "2023-08-21"; + version = "2023-08-31"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "fed1a198b4abdfd7c0f68ab7c6b369460e08fd8d"; - sha256 = "1md59105irdzlzwiqfl53hlvqj1a4zn21wqvxcbfc937wvk1xsw7"; + rev = "ce32a0c6a622770bd1454069aef9abe95efcbd16"; + sha256 = "1rlarv26amx99dhvgqphrjbwl92vci1v56r565fryqrhbgrwr3a0"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; @@ -4318,12 +4318,12 @@ final: prev: image-nvim = buildVimPluginFrom2Nix { pname = "image.nvim"; - version = "2023-08-28"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "6fcf4a9aa2bae1e8319e5c87b0d180c27af3026e"; - sha256 = "1a8k8pvd9l9zrw8pmfykbn2zva13hf1a8zqyd6pb4b56wyf2vbr7"; + rev = "1abfecb67aeb103b0d597f1e8098995f2a72934d"; + sha256 = "06vpa75nnxpjgxxxllif1h9dgzfvkg2080fgcxsrw09myi8xkcbz"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -5230,12 +5230,12 @@ final: prev: lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga.nvim"; - version = "2023-08-29"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "34fd54bd4fff12ce748c9f3644ebb5052fdbe17d"; - sha256 = "0cpghg6kzzq7ygj518n2izavckhkhmxzfdhr4q6i434hd7g6ih0a"; + rev = "5073eda4082f8b46d0c1573a067cdd56fcd8d066"; + sha256 = "1w879rf1qv9v7p27dgmf720nab493vf9m70wvi57pl0hqd7zxw4d"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -5278,12 +5278,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-08-18"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "c4d6298347f7707e9757351b2ee03d0c00da5c20"; - sha256 = "0i6llbq26wpnx1za2mh37ja01zqjv8nv3npk6spadvv57yb0m38f"; + rev = "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b"; + sha256 = "0r0k265m5nf0rl8hma13yjw8fyd08629h1awa94lk0s6dvk7mkh0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5507,12 +5507,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-08-29"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "a1b96721dea1e9c7aeeb4bd402b9debebf38ed23"; - sha256 = "0m52p2k4ghc9mcqv9cpnw2p657vdw1svn69hjfh0dgb6s1nd6vll"; + rev = "3a3e19d7b7850e711485b8adde73ba44789f2cf6"; + sha256 = "1zlbjdigfpp5p97156bpg5n8y90gwh17qw8gy3mws9xss73zxy1g"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5879,12 +5879,12 @@ final: prev: neo-tree-nvim = buildVimPluginFrom2Nix { pname = "neo-tree.nvim"; - version = "2023-08-27"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "2c992760f154285dff9f798647954b363cf35963"; - sha256 = "03gads1fim5lv90sgxvv16gn3hm32qq9hlm31qjs2hs2qiminsj0"; + rev = "71d5559f7fa8e28a51570134e300b62f141a2f34"; + sha256 = "0qgyi4zp4mdn8a7rqpb62rxkx016w18vyyvy0zgbk71xlh985da5"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -5903,12 +5903,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-08-29"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "1075bd7f23d244f14d691c261b14c38209abf02d"; - sha256 = "114m39r7zy62z3ri6lr0gcj9c1p6mq131234c0im24z0wkb93czy"; + rev = "92c981fea858ce1f7440b45af9e649be8fe75c5f"; + sha256 = "1d62yw6qxas3fk91v883yzcl8j3i84qh1jakw0abzqzlb8jhj56r"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5963,12 +5963,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-08-30"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "dc7e5d005287ee410b0a791897fd98131f9105c3"; - sha256 = "0iqq1a9fdrn904a94ggbhyjb0n1mkndxvmkqm0d7yla5h2wm46rp"; + rev = "08d23c7ae1e7c3c66802990d5aa16269bdd996a7"; + sha256 = "1paazirc1alhmk85y0p2hsry62g6a0ly2r4pn5fp9vnix2gdjmb9"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6035,12 +6035,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-08-14"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "f296a22864bbac0d94ad00fa18cc8231dbeaa1e3"; - sha256 = "1xd4h2vrm7b87y2islyz3iigzd6xy9ramq5ayxbd89xaywjj3lid"; + rev = "064f8f65dd32f4fe728e76acfa3e4e153b121147"; + sha256 = "0whwlny5q02yi011wl4clhvq6347w7sn4j2cj7ck7wp8mqrbwpwz"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6540,12 +6540,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2023-03-26"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "fab04b2dd4b64f4b1763b9250a8824d0b5194b8f"; - sha256 = "01zbahh1q332lcksd7dmkw109i7x5xan9w9z3n13bwwpn01knf6h"; + rev = "15fbfc38a83980b93e169b32a1bf64757f1e2bf4"; + sha256 = "077mr9gz4bsk0fz7vmzc9b68kysdax5vrlwfh7rhdam8qqlpncm7"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -6624,12 +6624,12 @@ final: prev: nvchad = buildVimPluginFrom2Nix { pname = "nvchad"; - version = "2023-08-27"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "3f1e6d71d4c6c98380d5383d5e1bf1f6eaa3399f"; - sha256 = "18g985bq6r5n36m0043xrdclqrm6dg6p9pz94lrabmqvl2kgda3f"; + rev = "a9bc954d0203ae9bded11f1e7167bf9020f181aa"; + sha256 = "0dq46jigkpa886svpjlp7267nbk6v5cyfyh26yml3kvsh7sdzdi9"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6864,12 +6864,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-08-24"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "4377a05b9476587b7b485d6a9d9745768c4e4b37"; - sha256 = "0mvlh0wdycdk07384i68gyxsafy437pbyryaqf3zbnw95r0z1va9"; + rev = "31e1ece773e10448dcb616d5144290946a6264b7"; + sha256 = "1sm6pbsh6hkvd6qvbls5hlbbvmk9n60dp228zk18s8kml24x3bcb"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -7103,12 +7103,12 @@ final: prev: nvim-lilypond-suite = buildVimPluginFrom2Nix { pname = "nvim-lilypond-suite"; - version = "2023-08-29"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "martineausimon"; repo = "nvim-lilypond-suite"; - rev = "ef1f81f25ac319d87de22fe45100441ad6b24abc"; - sha256 = "1anrqzwjm53mlr5zikawzxsarylc5n6vpa9nna13r88ni349ilda"; + rev = "ba3acec99c479492b1f843937cc423557cb8c5ad"; + sha256 = "0n88n1b0yki7v3dpbbch3rrrhcj8ga3k3j1gzjv93c9igzsyx97d"; }; meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; }; @@ -7235,12 +7235,12 @@ final: prev: nvim-navbuddy = buildVimPluginFrom2Nix { pname = "nvim-navbuddy"; - version = "2023-08-26"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "SmiteshP"; repo = "nvim-navbuddy"; - rev = "46670b27a21ae26d25d3ee2b71f31729162f9de7"; - sha256 = "1adh5dybdgh24mc6in3rabydm1ap0k0dsjrjy626007j57m6agwc"; + rev = "b56a704323d07aac296a20bbf8274cf24e73ab32"; + sha256 = "0ncd6wr7csi13j9ysisbgbygzxhnrgwzlaxhfz6s51h71qycfcd4"; }; meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/"; }; @@ -7391,12 +7391,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2023-08-20"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "ee3b830787538f259b84867c8971c4284abc4a8d"; - sha256 = "1la88yl3k8nbjskqxhy494d0a4mdhnvxglxsqc225jsyx6h6pj42"; + rev = "83a6ee5feac7cd08269159380c51e1de416800a5"; + sha256 = "17xswhp4whvraz7nl2sqpjwy4i0aiy1mb5ns1v8gay5p9ksa3xpi"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -7499,12 +7499,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-08-30"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "7f6ff292e3f53e7b12554ee92264c23762dc7906"; - sha256 = "0y0z43cnwh5ssrvqrxqmzvhq0nymczxbivjzc3n0dcpk60609j14"; + rev = "691d73287a94e8ed82a383df82aabfe77ab4bcaa"; + sha256 = "0633r617g3a1c405yyhma5n9qzb6hnh5j2ryxwkzbl78ld1fs8ip"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7630,12 +7630,12 @@ final: prev: nvim-ufo = buildVimPluginFrom2Nix { pname = "nvim-ufo"; - version = "2023-08-26"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "8b01594c29bd01e7b49b647a663c819ed909714f"; - sha256 = "1vw1nprs4kgz9y3r294ws3axbsgnfbjnvin7ja6xsg4fsaxqy8fw"; + rev = "890b94870f052773d77175d07a51f2e083210632"; + sha256 = "0c823ya1501qi6kbp889sw5jrgx2249x8q27drmpjv29lr5lkb06"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -7823,12 +7823,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-08-21"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "c81dff789f7623c431d1f43cf334237e52bbfd61"; - sha256 = "193yw6bk7psa979cpp1ram0ipw49kj0xsr25mk5m78xh8pivgg1g"; + rev = "fa861b992471d55f653751f1fea8769ca536a554"; + sha256 = "0llkyk2q127lp932mwnqx90zbn23l7s7v3fa8p6sdx25bvjcbjfz"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -7956,12 +7956,12 @@ final: prev: oxocarbon-nvim = buildVimPluginFrom2Nix { pname = "oxocarbon.nvim"; - version = "2023-06-06"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "12a7507f1cd5ac6edb890d12268e4444a35956f2"; - sha256 = "0l6akk6yx06yfz83y041qnxghgrhbgmvlvsfqqahknxsc2bakh1r"; + rev = "162a92e2bcca588a01c2f9fd857bdb4dabd8d72c"; + sha256 = "06q6ykda4pbkqblkqvk7l1gjw9hwn06l13v1sann39dzgwi1yrw7"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; @@ -8497,12 +8497,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-08-23"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "2cfd6ddb0acece95d9658560ae9740b98ef70dbb"; - sha256 = "1pcfxl5350qwrlrr5j784pzy4w5b1v9w1yjjcpk0fghv2wi99isk"; + rev = "2ec9bc0fb5f3c8c6a0f776f0159dd2a3b1663554"; + sha256 = "038cczxj9ba3axb3aw5r2dsp5anzacnwnnp61i1pk7kk8l3wg2ck"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -8821,12 +8821,12 @@ final: prev: sg-nvim = buildVimPluginFrom2Nix { pname = "sg.nvim"; - version = "2023-08-29"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "bd4efc10ab92b83443df06dda7b8ac95d462c2c0"; - sha256 = "0x2xlv49j7g7xhrhkj20qz63xw28mg6zm4wkd26j1j7gb0kgjm97"; + rev = "ef9deec58ac515f2a743f6e251eb8e464a654e41"; + sha256 = "10as3cc2bdl3w6cxhz8ijq94q54g9lhrcl70m2xild47i08h18nh"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -9423,6 +9423,18 @@ final: prev: meta.homepage = "https://github.com/gcmt/taboo.vim/"; }; + tabout-nvim = buildVimPluginFrom2Nix { + pname = "tabout.nvim"; + version = "2023-03-29"; + src = fetchFromGitHub { + owner = "abecodes"; + repo = "tabout.nvim"; + rev = "0d275c8d25f32457e67b5c66d6ae43f26a61bce5"; + sha256 = "11zly7bfdz110a7ififylzgizin06ia0i3jipzp12n2n2paarp1f"; + }; + meta.homepage = "https://github.com/abecodes/tabout.nvim/"; + }; + tabpagebuffer-vim = buildVimPluginFrom2Nix { pname = "tabpagebuffer.vim"; version = "2014-09-30"; @@ -9811,12 +9823,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-08-29"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "32e6792f865221dfaf2a3751fd3cfeac96557433"; - sha256 = "1rbm8sb8cvmvgbcqkiy9j507hh47xvbd5s91j6kiqwng04c5mf63"; + rev = "2c1ed33a6f6f2db3b69f5421f6b405eda1b07748"; + sha256 = "1adam01isj51qbihxxkz20l00x1lfvdsbvzs6wamzpycjh4i9bj4"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10268,12 +10280,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-08-29"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "a8cc552bad9f6bf5de1d5c62c4aa2d4c270a7541"; - sha256 = "1l4zdj36dsi5vhx7m21wb5kjdn5yljjw526hgc86ws5l1xq1vngb"; + rev = "e7b891914b10df0c5075a617e55be93d3f4b7537"; + sha256 = "1637y40gpfc63ba4rhn1mri29v1g7393k1hmni96f8wr25agh0q8"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -12080,12 +12092,12 @@ final: prev: vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2023-08-17"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "5f525476f3ade40e60aa295a8a2a01c0935b0d61"; - sha256 = "15mh6j4727fcy8rq6yzhdngg39wqqjlx6w042xk76hyzdnamcc10"; + rev = "744a0fcd9e723ec66b7e3302f20dcd8c7227f010"; + sha256 = "11f1s9946hpwz2762ckr271gf3i8nq8g3k94lqdmv6fi1cacmwkc"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -13187,12 +13199,12 @@ final: prev: vim-monokai-tasty = buildVimPluginFrom2Nix { pname = "vim-monokai-tasty"; - version = "2023-02-15"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "8c1052347dd204a83ef72f7af36bdf2fa6861e0b"; - sha256 = "12wri9qj8klvksn9n7g2jvnnsa41vn4ij44wsyc3g44630p2d7x9"; + rev = "c6c25baf03e9a4ce039f20b72a0d9af1b03776e2"; + sha256 = "11i22k4sm5ckq612bs9a5jjcd3zsjv7hgy60ba5fg1jl82b7xm2j"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; @@ -15409,12 +15421,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-08-19"; + version = "2023-08-31"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "534fd725f2475a9083b032e402c7e73b8a3fc6bb"; - sha256 = "0i1fnvj10m01jxp5kxjya8xsmk8xgnm9jn5bm5zrq4l7m1i85gk4"; + rev = "ad17583ce399b6830b4c2888ef2a12d52c5eb607"; + sha256 = "1x1y118y8czz5r5qn3pr8lh1jx79pr0bsr3lghh58zvgzawg2swk"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -15782,12 +15794,12 @@ final: prev: zenbones-nvim = buildVimPluginFrom2Nix { pname = "zenbones.nvim"; - version = "2023-07-02"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "ba1c6ad48626526f65a2eb0149abbc2747cb961b"; - sha256 = "04k0l2nqjnw1qgzl0xnsi9r48rp91z6201dpwpnviv3bhlzsvdbf"; + rev = "491b8a79e0547e181c7c6fb054d778fd595f068c"; + sha256 = "1p8fakdby43sk3l54dszib5sf6h58mcmvdd3zvwjxn16diqjd6jd"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -15890,12 +15902,12 @@ final: prev: dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2023-08-23"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "248e649f2fbd262292ee4196cadb5b7f38168f37"; - sha256 = "0lmch8zyxcq22v4988sb1wasvfj9fgq869wlpzi2kg60fw9d8zpd"; + rev = "b2cc39273abbb6b38a3d173d2a5d8c2d1c79fc19"; + sha256 = "1fcggi03mh0rq1akr9a76mfycm6i34yihhkqmxzgbf63q4v90qrd"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -15938,12 +15950,12 @@ final: prev: nightfly = buildVimPluginFrom2Nix { pname = "nightfly"; - version = "2023-08-20"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "06eaaaa8717538a7ce96b13c137da8c9eaa84ec8"; - sha256 = "08g7dwa1qlg7gj10y2sggq4558fl3cywvq4zhqnzygxlnb66rjpd"; + rev = "2737ba5b8d22ad6803bb0f51099f90c61bab566c"; + sha256 = "07g6s0p9mqs3s65a027zvpwpfmx191ajg0h8v9qilgzw755barx7"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index e93147e5351..88a54aadb9d 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -60,12 +60,12 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=4798bc6"; + version = "0.0.0+rev=bdcd56c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "4798bc61410fcb3ae725bab24f96f5c4684cea71"; - hash = "sha256-VHzmBJc9Y3T0jRnOLDJEDVsC/ufGTryWzz/uxgHX2ck="; + rev = "bdcd56c5a3896f7bbb7684e223c43d9f24380351"; + hash = "sha256-zkhCk19kd/KiqYTamFxui7KDE9d+P9pLjc1KVTvYPhI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -291,12 +291,12 @@ }; csv = buildGrammar { language = "csv"; - version = "0.0.0+rev=f1d35df"; + version = "0.0.0+rev=6c19574"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "f1d35df780976721d3cd38f0b16538dd31f87a23"; - hash = "sha256-t4uzc1VwJzS4qj0D1wolUvUNuc5OzC4L4RnLpYh+TXo="; + rev = "6c1957405bd6f7751b050f61367f1094fab91444"; + hash = "sha256-ISG+FgauEfuH5+uCxQWA1h9/HTaWR3eJcn+k2c51dYs="; }; location = "csv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; @@ -403,12 +403,12 @@ }; doxygen = buildGrammar { language = "doxygen"; - version = "0.0.0+rev=7ac6203"; + version = "0.0.0+rev=a750758"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-doxygen"; - rev = "7ac6203cc018ff440b45b6d5aeba596f02eec4d5"; - hash = "sha256-QgmbdB9byVxLpsKB+FaQyyqUO8YuTfnYSTP9hDj5OOU="; + rev = "a750758da90955c86fcc22fcbb6fa44a7d009865"; + hash = "sha256-/4yBu5S9bQhxGO9JcNZukn+xpfzfaQQRLqVuDHgMYd0="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-doxygen"; }; @@ -570,12 +570,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=6828cf3"; + version = "0.0.0+rev=f73d473"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "6828cf3629addb1706bdbbd33491e95f12b7042c"; - hash = "sha256-/DoXmcNmHvgWvYt4IkHJoDp46xgoHMp+cw1jYEcQCHI="; + rev = "f73d473e3530862dee7cbb38520f28824e7804f6"; + hash = "sha256-K9CnLhDKiWTxVM5OBZ80psV2oFDnlTgd+DDoP39ufds="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -1085,6 +1085,17 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; + kconfig = buildGrammar { + language = "kconfig"; + version = "0.0.0+rev=aaba009"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-kconfig"; + rev = "aaba009ba9d7881f0f81742da588ae70b572316d"; + hash = "sha256-yjw1fr4utQHIrP/CA4df2adhpm+xrkvobZ5ZF5tjjEI="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-kconfig"; + }; kdl = buildGrammar { language = "kdl"; version = "0.0.0+rev=e180e05"; @@ -1341,6 +1352,17 @@ }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; + nqc = buildGrammar { + language = "nqc"; + version = "0.0.0+rev=14e6da1"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-nqc"; + rev = "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"; + hash = "sha256-Gf6410cWLENCgI1uIBVBl4RnRuVCHkWkn6sxusmI6j4="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-nqc"; + }; objc = buildGrammar { language = "objc"; version = "0.0.0+rev=62e61b6"; @@ -1566,12 +1588,12 @@ }; psv = buildGrammar { language = "psv"; - version = "0.0.0+rev=f1d35df"; + version = "0.0.0+rev=6c19574"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "f1d35df780976721d3cd38f0b16538dd31f87a23"; - hash = "sha256-t4uzc1VwJzS4qj0D1wolUvUNuc5OzC4L4RnLpYh+TXo="; + rev = "6c1957405bd6f7751b050f61367f1094fab91444"; + hash = "sha256-ISG+FgauEfuH5+uCxQWA1h9/HTaWR3eJcn+k2c51dYs="; }; location = "psv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; @@ -1677,12 +1699,12 @@ }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=7dc4fb6"; + version = "0.0.0+rev=e4ba1a9"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "7dc4fb60390218b09bc351062eeede7dcdbb4d9f"; - hash = "sha256-80BJ12gstc2+SuPqwziOClOzeH9BJflQ39JSqUmutkQ="; + rev = "e4ba1a9674a3b4dd7905d04f194ae6f8331be342"; + hash = "sha256-4+TRol2i6ibuXqBr6O8jI/4MZq8hnf09eVBtPqaKp8s="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1809,12 +1831,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=d50b6ca"; + version = "0.0.0+rev=70afdd5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "d50b6ca5cc3d925e3d1f497199cb8d8383ddae8a"; - hash = "sha256-fzruLddcKTqC47CKCZhznDoyGIA1fPdqxqmzgmd9RkM="; + rev = "70afdd5632d57dd63a960972ab25945e353a52f6"; + hash = "sha256-bi0Lqo/Zs2Uaz1efuKAARpEDg5Hm59oUe7eSXgL1Wow="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1832,12 +1854,12 @@ }; scheme = buildGrammar { language = "scheme"; - version = "0.0.0+rev=af3af6c"; + version = "0.0.0+rev=85b6188"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "af3af6c9356b936f8a515a1e449c32e804c2b1a8"; - hash = "sha256-s9AoMNYnKvzr969aujgwUaVn4WoRaZ5snfFEF73KUGA="; + rev = "85b6188fb77c03dfb01d13e58e2844450506860c"; + hash = "sha256-v+iQpeAeySKPgMu5IQ8vNnUSc2duX1vYvO3qqK1/Pmc="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; @@ -2121,12 +2143,12 @@ }; tsv = buildGrammar { language = "tsv"; - version = "0.0.0+rev=f1d35df"; + version = "0.0.0+rev=6c19574"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "f1d35df780976721d3cd38f0b16538dd31f87a23"; - hash = "sha256-t4uzc1VwJzS4qj0D1wolUvUNuc5OzC4L4RnLpYh+TXo="; + rev = "6c1957405bd6f7751b050f61367f1094fab91444"; + hash = "sha256-ISG+FgauEfuH5+uCxQWA1h9/HTaWR3eJcn+k2c51dYs="; }; location = "tsv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; @@ -2312,12 +2334,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=915f263"; + version = "0.0.0+rev=ca6d5be"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "915f263722a6a74e5a30be82310d3843ed203058"; - hash = "sha256-wUYw3RS0brNbdFcb3ojs6gkrxBuOdRquTEmHTwAzc8w="; + rev = "ca6d5bea6c7cf5d16ca65f9ee223d2d3457ab2ec"; + hash = "sha256-RKDIfU82b58DEDXLte4TTuzTtN44MClyBJQwSuQ8YFo="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f14853648c8..7ef054e057f 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -966,7 +966,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-BXmf/eUxfsqq49K31k1+KjMHTV7KBTh0Sse/hCcFjqw="; + cargoHash = "sha256-1mb99WtELS64kfA2exUlVLzOj82xkFhWx0JHayosZL0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4c50a22689b..7a17da0a69e 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -790,6 +790,7 @@ https://github.com/kdheepak/tabline.nvim/,, https://github.com/vim-scripts/tabmerge/,, https://github.com/codota/tabnine-vim/,, https://github.com/gcmt/taboo.vim/,, +https://github.com/abecodes/tabout.nvim/,HEAD, https://github.com/Shougo/tabpagebuffer.vim/,, https://github.com/godlygeek/tabular/,, https://github.com/AndrewRadev/tagalong.vim/,, diff --git a/pkgs/applications/emulators/yuzu/update.sh b/pkgs/applications/emulators/yuzu/update.sh index 0fcb5241735..ad34bfee3d6 100755 --- a/pkgs/applications/emulators/yuzu/update.sh +++ b/pkgs/applications/emulators/yuzu/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p nix nix-prefetch-git gnutar curl jq +#! nix-shell -i bash -p nix nix-prefetch-git gnutar curl jq unzip set -euo pipefail diff --git a/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/pkgs/applications/file-managers/portfolio-filemanager/default.nix index ef28d8cea34..3ee1f0c03eb 100644 --- a/pkgs/applications/file-managers/portfolio-filemanager/default.nix +++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix @@ -7,18 +7,18 @@ , glib , gobject-introspection , gtk3 -, libhandy -, librsvg +, gtk4 +, libadwaita , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , nix-update-script }: python3.pkgs.buildPythonApplication rec { pname = "portfolio"; - version = "0.9.15"; + version = "1.0.0"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tchx84"; repo = "Portfolio"; rev = "v${version}"; - hash = "sha256-/OwHeeUjpjm35O7mySoAfKt7Rsp1EK2WE+tfiV3oiQg="; + hash = "sha256-ahVrOyyF/7X19ZJcHQ4YbC+4b96CPEnns7TUAFCvKao="; }; postPatch = '' @@ -37,20 +37,17 @@ python3.pkgs.buildPythonApplication rec { appstream-glib desktop-file-utils gettext - glib gobject-introspection - gtk3 + gtk3 # For gtk-update-icon-cache meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ - glib - gtk3 - libhandy - librsvg + gtk4 + libadwaita ]; propagatedBuildInputs = with python3.pkgs; [ @@ -65,6 +62,12 @@ python3.pkgs.buildPythonApplication rec { ln -s dev.tchx84.Portfolio "$out/bin/portfolio" ''; + # Prevent double wrapping + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index 84d33fa741a..87315bae2ca 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.5.5"; + version = "2.7.5"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-qpLxOGphR9iHvtb8AZZaMict/g8wLkL7Dhr4mt3LZdk="; + hash = "sha256-vJDpwf/N3rk5Bd9hBNpoNtlIAgn+Y77MF231ZOhLNeI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix index 430a0da171a..dadaae3a901 100644 --- a/pkgs/applications/misc/kratos/default.nix +++ b/pkgs/applications/misc/kratos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kratos"; - version = "0.10.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ory"; repo = "kratos"; rev = "v${version}"; - hash = "sha256-Ld2N7w9jQLkzCww1Sex5nEBZf6e9XIUnbfPOjcFAYQA="; + hash = "sha256-KDpc0zc65rvvpPojghFEujoS0aewyjv7B/bmpC2i1dA="; }; - vendorSha256 = "sha256-9zXoJ+c1aPWDqasechC4ModWE0+sfMqZzp/Pph/mYcs="; + vendorSha256 = "sha256-Y/Sd2hu1bPUb0TQRD1pANz+rtqKcHBXvjKpYwKgxHMQ="; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index e380cab6d43..bac74b0ffe1 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.3.1"; + version = "0.3.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-35MHq2G2L7yfz+W9uUaRb8fpEp/h0bt2HtK615XwZG8="; + sha256 = "sha256-HFZSIzP3G6f78gTOpzZFG5ZAo5Lo6VuxQe6xMvCVfss="; }; - cargoHash = "sha256-goIb8BoHSF0g/OWmeZtha+qKlcvLTqwMmYcD2uYUI7E="; + cargoHash = "sha256-ZsqxlwgXqw9eUEjw1DLBMz05V/y/ZbcrCL6I8TcnnDs="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/pkgs/applications/misc/pot/Cargo.lock b/pkgs/applications/misc/pot/Cargo.lock index 09971788db5..4e67e8bbfe1 100644 --- a/pkgs/applications/misc/pot/Cargo.lock +++ b/pkgs/applications/misc/pot/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -18,10 +18,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if", + "const-random", + "getrandom 0.2.10", + "once_cell", + "version_check", +] + +[[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -58,24 +82,23 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arboard" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" +checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" dependencies = [ "clipboard-win", - "core-graphics", + "core-graphics 0.22.3", "image", "log", "objc", "objc-foundation", "objc_id", - "once_cell", "parking_lot", "thiserror", "winapi", @@ -118,7 +141,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -149,17 +172,17 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.23", "slab", - "socket2", + "socket2 0.4.9", "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -177,7 +200,7 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix", + "rustix 0.37.23", "signal-hook", "windows-sys 0.48.0", ] @@ -190,7 +213,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -201,13 +224,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -217,7 +240,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" dependencies = [ "atk-sys", - "bitflags", + "bitflags 1.3.2", "glib", "libc", ] @@ -259,9 +282,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -280,9 +303,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bit_field" @@ -297,6 +326,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -321,7 +356,7 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] @@ -349,9 +384,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", "serde", @@ -364,6 +399,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] +name = "byte-unit" +version = "4.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" +dependencies = [ + "serde", + "utf8-width", +] + +[[package]] name = "bytecount" version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -391,12 +436,33 @@ dependencies = [ ] [[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] name = "cairo-rs" version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "glib", "libc", @@ -425,10 +491,23 @@ dependencies = [ ] [[package]] +name = "castaway" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +dependencies = [ + "rustversion", +] + +[[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] [[package]] name = "cesu8" @@ -458,9 +537,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -474,15 +553,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", "serde", - "winapi", + "time 0.1.45", + "wasm-bindgen", + "windows-targets 0.48.5", ] [[package]] @@ -492,6 +574,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a" [[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] name = "clipboard-win" version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -508,12 +600,28 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics 0.22.3", + "foreign-types 0.3.2", + "libc", + "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", - "core-graphics", - "foreign-types", + "core-graphics 0.23.1", + "foreign-types 0.5.0", "libc", "objc", ] @@ -524,11 +632,11 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "libc", "objc", ] @@ -550,6 +658,19 @@ dependencies = [ ] [[package]] +name = "compact_str" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +dependencies = [ + "castaway", + "cfg-if", + "itoa 1.0.9", + "ryu", + "static_assertions", +] + +[[package]] name = "concurrent-queue" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -559,6 +680,34 @@ dependencies = [ ] [[package]] +name = "const-random" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom 0.2.10", + "once_cell", + "proc-macro-hack", + "tiny-keccak", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] name = "convert_case" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -586,10 +735,23 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types 0.3.2", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +dependencies = [ + "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.5.0", "libc", ] @@ -599,7 +761,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "libc", ] @@ -705,7 +867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -739,7 +901,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -750,7 +912,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -765,6 +927,15 @@ dependencies = [ ] [[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", +] + +[[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -807,6 +978,20 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", + "subtle", +] + +[[package]] +name = "digest_auth" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3054f4e81d395e50822796c5e99ca522e6ba7be98947d6d4b0e5e61640bdb894" +dependencies = [ + "digest", + "hex", + "md-5", + "rand 0.8.5", + "sha2", ] [[package]] @@ -879,12 +1064,12 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "display-info" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06d9c500164fbeb11a2d7dc1df709882dad868a56240c5c972b460b3e6058d42" +checksum = "4f9fb6a73233755f827129d80a80a6a16448122040537c881248a09d5c80ab6b" dependencies = [ "anyhow", - "core-graphics", + "core-graphics 0.23.1", "fxhash", "widestring", "windows 0.48.0", @@ -920,21 +1105,21 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "embed-resource" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f1e82a60222fc67bfd50d752a9c89da5cce4c39ed39decc84a443b07bbd69a" +checksum = "fd0a2c9b742a980060d22545a7a83b573acd6b73045b9de6370c9530ce652f27" dependencies = [ "cc", "rustc_version", "toml 0.7.6", "vswhom", - "winreg 0.11.0", + "winreg 0.51.0", ] [[package]] @@ -945,9 +1130,9 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -957,7 +1142,7 @@ name = "enigo" version = "0.1.2" source = "git+https://github.com/enigo-rs/enigo?rev=c53be78#c53be78a4cdbd2d19ccda59f990050d8591bb969" dependencies = [ - "core-graphics", + "core-graphics 0.22.3", "libc", "objc", "pkg-config", @@ -982,7 +1167,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -993,9 +1178,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -1054,6 +1239,12 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] name = "fdeflate" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1063,6 +1254,15 @@ dependencies = [ ] [[package]] +name = "fern" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +dependencies = [ + "log", +] + +[[package]] name = "field-offset" version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1074,13 +1274,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] @@ -1092,9 +1292,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -1125,7 +1325,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", ] [[package]] @@ -1135,6 +1356,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] name = "form_urlencoded" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1144,6 +1371,25 @@ dependencies = [ ] [[package]] +name = "fraction" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] name = "futf" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1191,7 +1437,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1208,7 +1454,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -1255,7 +1501,7 @@ version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk-sys", @@ -1271,7 +1517,7 @@ version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -1404,9 +1650,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" @@ -1414,7 +1660,7 @@ version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -1444,7 +1690,7 @@ version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", @@ -1491,9 +1737,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", "bstr", @@ -1520,7 +1766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" dependencies = [ "atk", - "bitflags", + "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -1570,9 +1816,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1636,6 +1882,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] name = "html5ever" version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1685,9 +1940,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" @@ -1706,7 +1961,7 @@ dependencies = [ "httpdate", "itoa 1.0.9", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1794,9 +2049,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -1812,6 +2067,25 @@ dependencies = [ ] [[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] name = "indexmap" version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1830,6 +2104,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] @@ -1842,6 +2117,35 @@ dependencies = [ ] [[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1868,6 +2172,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1885,7 +2198,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "javascriptcore-rs-sys", ] @@ -1923,6 +2236,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] name = "jpeg-decoder" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1953,6 +2275,26 @@ dependencies = [ ] [[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] name = "kuchiki" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1996,7 +2338,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" dependencies = [ "gtk-sys", - "libloading", + "libloading 0.7.4", "once_cell", ] @@ -2017,6 +2359,15 @@ dependencies = [ ] [[package]] +name = "libloader" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d39e73d63036eb973937a3d247e8c9799b1cd0e131079ae8aba294cb0328073" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] name = "libloading" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2027,6 +2378,16 @@ dependencies = [ ] [[package]] +name = "libloading" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] name = "line-wrap" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2036,12 +2397,222 @@ dependencies = [ ] [[package]] +name = "lingua" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dc858be45965c868f5fa4a3c57d61842ff8aa2f2b1308eea14babbee5ef2478" +dependencies = [ + "ahash", + "brotli", + "compact_str", + "fraction", + "include_dir", + "itertools", + "lingua-arabic-language-model", + "lingua-chinese-language-model", + "lingua-english-language-model", + "lingua-french-language-model", + "lingua-german-language-model", + "lingua-hindi-language-model", + "lingua-indonesian-language-model", + "lingua-italian-language-model", + "lingua-japanese-language-model", + "lingua-korean-language-model", + "lingua-malay-language-model", + "lingua-mongolian-language-model", + "lingua-portuguese-language-model", + "lingua-russian-language-model", + "lingua-spanish-language-model", + "lingua-thai-language-model", + "lingua-turkish-language-model", + "lingua-vietnamese-language-model", + "maplit", + "once_cell", + "rayon", + "regex", + "serde", + "serde-wasm-bindgen", + "serde_json", + "strum", + "strum_macros", + "wasm-bindgen", +] + +[[package]] +name = "lingua-arabic-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ada75100728990b05bacaec7693efebf0c8b911599ac0c082cb4ed576bf494d" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-chinese-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45a1e3a38a0920f6ddbd9b6a79a8c04cd927142713b595ba32be6b811603f7c6" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-english-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbd066693abb10083bb5b5fc1c494dda357170265021ad873ef582211817b8a8" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-french-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba406de05309b212790036e576aee4b1a71ce62b77fbd084df5bc8d7c624866f" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-german-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd4041d542b6512d415c0ea6979333e5e88698b966dda7b9bf06029bf690a13" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-hindi-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63659e514fa8c706d2ed0d7a04b98adb05b8c8d4bc37e3d12edb9d35ce24fd0" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-indonesian-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc06b8937f6adaad76b28fd009cbfaa6f876ebe5fa887d96dccd1dff2d21d9ad" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-italian-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6e138047ac4d681e419e37ad9e383878652ac19e67056ff16085d4cc82e590" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-japanese-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b34b94aa96a1bc0838ddda2c7912d0ebd7256bb21e7a2974e4dd8b186df501a8" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-korean-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c47aa5e5dc8d029967375081aabda462faf10b070aefc1a175ea7f42f5267c" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-malay-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771c6b7ab2865e2563e1ce19bf06611aad674c3f0a180ec43c03a9883e49c8aa" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-mongolian-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f53de502920af44b5d8ec7787895c0a81b0f5f43e3f3c2b80a240f2b605122c1" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-portuguese-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9df0be307b3f5e24e10e76a7841302c0ff4a6ebf818a11d3a3c5c4cecfcfe58b" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-russian-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea97d6643e90ee4fc0043c728f0c06cdd9e69d4970fd1983e5c59b3448a676e" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-spanish-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d45be9bede9b9d6d53b6e06047822a18dbd83e5d515736afecd85c1e71cc6070" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-thai-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194b09209fc63d986d8ef9505689756eff1935fa52fd91031b60e7d546ca3c76" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-turkish-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b517e12fe94ce80e7f8f380fdd2c0223bcfe351c0898c9a83f56f78b3afad81" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-vietnamese-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07d08afaf263906aa3f2bfaffaf52eecd368992685e2468f1ba7f85f3e41fd49" +dependencies = [ + "include_dir", +] + +[[package]] name = "linux-raw-sys" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + +[[package]] name = "lock_api" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2053,9 +2624,12 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +dependencies = [ + "value-bag", +] [[package]] name = "loom" @@ -2080,25 +2654,15 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "mac-notification-sys" -version = "0.5.6" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" dependencies = [ "cc", "dirs-next", "objc-foundation", "objc_id", - "time", -] - -[[package]] -name = "macos-accessibility-client" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf7710fbff50c24124331760978fb9086d6de6288dcdb38b25a97f8b1bdebbb" -dependencies = [ - "core-foundation", - "core-foundation-sys", + "time 0.3.28", ] [[package]] @@ -2111,6 +2675,12 @@ dependencies = [ ] [[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] name = "markup5ever" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2140,10 +2710,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + +[[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "memoffset" @@ -2217,6 +2796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] @@ -2227,7 +2807,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffd272ac3ad817af3d158eecd4d4ba6f92a1fa5f7255e3c0d63b72d4dac12edd" dependencies = [ - "core-graphics", + "core-graphics 0.22.3", "winapi", "x11-dl", ] @@ -2265,7 +2845,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum", @@ -2299,7 +2879,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", @@ -2307,15 +2887,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", - "static_assertions", ] [[package]] @@ -2335,10 +2914,41 @@ dependencies = [ ] [[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "serde", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "notify-debouncer-mini" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e55ee272914f4563a2f8b8553eb6811f3c0caea81c756346bad15b7e3ef969f0" +dependencies = [ + "crossbeam-channel", + "notify", + "serde", +] + +[[package]] name = "notify-rust" -version = "4.8.0" +version = "4.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e" +checksum = "6d7b75c8958cb2eab3451538b32db8a7b74006abc33eb2e6a9a56d21e4775c2b" dependencies = [ "log", "mac-notification-sys", @@ -2358,6 +2968,40 @@ dependencies = [ ] [[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", +] + +[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2368,21 +3012,33 @@ dependencies = [ ] [[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] name = "num-rational" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", + "num-bigint", "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] @@ -2419,6 +3075,15 @@ dependencies = [ ] [[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] name = "objc" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2459,9 +3124,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -2484,13 +3149,13 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cfg-if", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -2505,7 +3170,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -2516,9 +3181,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", @@ -2543,6 +3208,17 @@ dependencies = [ ] [[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +dependencies = [ + "log", + "serde", + "winapi", +] + +[[package]] name = "os_pipe" version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2564,7 +3240,7 @@ version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "libc", "once_cell", @@ -2609,7 +3285,18 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", +] + +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", ] [[package]] @@ -2619,6 +3306,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest", + "hmac", + "password-hash", + "sha2", +] + +[[package]] name = "percent-encoding" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2626,12 +3325,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.0.0", ] [[package]] @@ -2734,29 +3433,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2776,21 +3475,21 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "indexmap 1.9.3", "line-wrap", "quick-xml 0.29.0", "serde", - "time", + "time 0.3.28", ] [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", @@ -2804,7 +3503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", @@ -2817,14 +3516,17 @@ dependencies = [ name = "pot" version = "0.0.0" dependencies = [ - "base64 0.21.2", - "core-graphics", + "arboard", + "base64 0.21.3", "dirs 5.0.1", - "dunce", "image", - "macos-accessibility-client", + "libloader", + "libloading 0.8.0", + "lingua", + "log", "mouse_position", "once_cell", + "reqwest_dav", "screenshots", "selection", "serde", @@ -2832,11 +3534,17 @@ dependencies = [ "tauri", "tauri-build", "tauri-plugin-autostart", + "tauri-plugin-fs-watch", + "tauri-plugin-log", "tauri-plugin-single-instance", + "tauri-plugin-store", + "thiserror", "tiny_http", - "toml 0.7.6", + "walkdir", "window-shadows", + "window-vibrancy", "windows 0.44.0", + "zip", ] [[package]] @@ -2938,9 +3646,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -3060,7 +3768,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3069,7 +3777,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3085,14 +3793,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.3", - "regex-syntax 0.7.4", + "regex-automata 0.3.7", + "regex-syntax 0.7.5", ] [[package]] @@ -3106,13 +3814,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -3123,17 +3831,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "bytes", "encoding_rs", "futures-core", @@ -3164,7 +3872,25 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg 0.10.1", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest_dav" +version = "0.1.3" +source = "git+https://github.com/pot-app/reqwest_dav.git#241363249e0fb2a12912ec04400fc55c93b4a079" +dependencies = [ + "async-trait", + "chrono", + "digest_auth", + "http", + "reqwest", + "serde", + "serde-xml-rs", + "serde_derive", + "serde_json", + "tokio", + "url", ] [[package]] @@ -3212,11 +3938,24 @@ version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] @@ -3270,11 +4009,12 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "screenshots" -version = "0.6.0" -source = "git+https://github.com/pot-app/screenshots-rs#f19fde2ced8306f2bb5113c11002f24d710c6914" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa2e9c30ca7f738a53367336d820f4a9af213c706ea55266d608d38e3b5cbff" dependencies = [ "anyhow", - "core-graphics", + "core-graphics 0.22.3", "dbus", "display-info", "fxhash", @@ -3287,11 +4027,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3300,9 +4040,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -3326,7 +4066,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cssparser", "derive_more", "fxhash", @@ -3351,29 +4091,52 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] +name = "serde-wasm-bindgen" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde-xml-rs" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" +dependencies = [ + "log", + "serde", + "thiserror", + "xml-rs", +] + +[[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa 1.0.9", "ryu", @@ -3382,13 +4145,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -3414,30 +4177,31 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "chrono", "hex", "indexmap 1.9.3", + "indexmap 2.0.0", "serde", "serde_json", "serde_with_macros", - "time", + "time 0.3.28", ] [[package]] name = "serde_with_macros" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -3504,10 +4268,20 @@ dependencies = [ ] [[package]] +name = "shared_child" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi", +] + +[[package]] name = "signal-hook" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b824b6e687aff278cdbf3b36f07aa52d4bd4099699324d5da86a2ebce3aa00b3" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -3524,21 +4298,21 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -3560,12 +4334,22 @@ dependencies = [ ] [[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "soup2" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gio", "glib", "libc", @@ -3579,7 +4363,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gio-sys", "glib-sys", "gobject-sys", @@ -3656,6 +4440,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3668,9 +4477,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.26" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -3678,6 +4487,19 @@ dependencies = [ ] [[package]] +name = "sys-locale" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" +dependencies = [ + "js-sys", + "libc", + "wasm-bindgen", + "web-sys", + "windows-sys 0.45.0", +] + +[[package]] name = "system-deps" version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3696,7 +4518,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ - "cfg-expr 0.15.3", + "cfg-expr 0.15.4", "heck 0.4.1", "pkg-config", "toml 0.7.6", @@ -3709,12 +4531,12 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6d198e01085564cea63e976ad1566c1ba2c2e4cc79578e35d9f05521505e31" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "cc", - "cocoa", + "cocoa 0.24.1", "core-foundation", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dirs-next", "dispatch", @@ -3754,9 +4576,9 @@ dependencies = [ [[package]] name = "tao-macros" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b27a4bcc5eb524658234589bdffc7e7bfb996dbae6ce9393bfd39cb4159b445" +checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" dependencies = [ "proc-macro2", "quote", @@ -3765,9 +4587,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -3776,9 +4598,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.9" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tauri" @@ -3787,9 +4609,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" dependencies = [ "anyhow", - "base64 0.21.2", + "base64 0.21.3", "bytes", - "cocoa", + "cocoa 0.24.1", "dirs-next", "embed_plist", "encoding_rs", @@ -3806,6 +4628,8 @@ dependencies = [ "objc", "once_cell", "open", + "os_info", + "os_pipe", "percent-encoding", "rand 0.8.5", "raw-window-handle", @@ -3817,7 +4641,9 @@ dependencies = [ "serde_json", "serde_repr", "serialize-to-javascript", + "shared_child", "state", + "sys-locale", "tar", "tauri-macros", "tauri-runtime", @@ -3825,7 +4651,7 @@ dependencies = [ "tauri-utils", "tempfile", "thiserror", - "time", + "time 0.3.28", "tokio", "url", "uuid", @@ -3858,7 +4684,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "brotli", "ico", "json-patch", @@ -3873,7 +4699,7 @@ dependencies = [ "sha2", "tauri-utils", "thiserror", - "time", + "time 0.3.28", "uuid", "walkdir", ] @@ -3895,7 +4721,7 @@ dependencies = [ [[package]] name = "tauri-plugin-autostart" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#51f20b438e42050cdbfd6c6dc72dbc985a31bbc1" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "auto-launch", "log", @@ -3906,9 +4732,38 @@ dependencies = [ ] [[package]] +name = "tauri-plugin-fs-watch" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +dependencies = [ + "log", + "notify", + "notify-debouncer-mini", + "serde", + "serde_json", + "tauri", + "thiserror", +] + +[[package]] +name = "tauri-plugin-log" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +dependencies = [ + "byte-unit", + "fern", + "log", + "serde", + "serde_json", + "serde_repr", + "tauri", + "time 0.3.28", +] + +[[package]] name = "tauri-plugin-single-instance" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#51f20b438e42050cdbfd6c6dc72dbc985a31bbc1" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "log", "serde", @@ -3920,6 +4775,18 @@ dependencies = [ ] [[package]] +name = "tauri-plugin-store" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +dependencies = [ + "log", + "serde", + "serde_json", + "tauri", + "thiserror", +] + +[[package]] name = "tauri-runtime" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3946,7 +4813,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7aa256a1407a3a091b5d843eccc1a5042289baf0a43d1179d9f0fcfea37c1b" dependencies = [ - "cocoa", + "cocoa 0.24.1", "gtk", "percent-encoding", "rand 0.8.5", @@ -4011,15 +4878,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix", + "rustix 0.38.10", "windows-sys 0.48.0", ] @@ -4042,22 +4908,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -4072,9 +4938,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ "flate2", "jpeg-decoder", @@ -4083,11 +4949,25 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +dependencies = [ + "deranged", "itoa 1.0.9", + "libc", + "num_threads", "serde", "time-core", "time-macros", @@ -4101,14 +4981,23 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] [[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] name = "tiny_http" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4137,18 +5026,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.3", "windows-sys 0.48.0", ] @@ -4245,7 +5133,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -4334,9 +5222,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -4370,9 +5258,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -4387,6 +5275,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] +name = "utf8-width" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" + +[[package]] name = "uuid" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4402,6 +5296,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] +name = "value-bag" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" + +[[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4478,6 +5378,12 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" @@ -4503,7 +5409,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -4537,7 +5443,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4550,9 +5456,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -4567,7 +5473,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" dependencies = [ - "bitflags", + "bitflags 1.3.2", "downcast-rs", "libc", "nix 0.24.3", @@ -4594,7 +5500,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-client", "wayland-commons", "wayland-scanner", @@ -4636,7 +5542,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk", "gdk-sys", @@ -4661,7 +5567,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" dependencies = [ "atk-sys", - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", @@ -4773,13 +5679,25 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29d30320647cfc3dc45554c8ad825b84831def81f967a2f7589931328ff9b16d" dependencies = [ - "cocoa", + "cocoa 0.24.1", "objc", "raw-window-handle", "windows-sys 0.42.0", ] [[package]] +name = "window-vibrancy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c0a73f45692662acb5dfe1ac22f33fbd5b3db2f1ef413985b480e655b61f5ee" +dependencies = [ + "cocoa 0.25.0", + "objc", + "raw-window-handle", + "windows-sys 0.48.0", +] + +[[package]] name = "windows" version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4821,7 +5739,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4867,11 +5785,20 @@ dependencies = [ [[package]] name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4891,17 +5818,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -4918,9 +5845,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -4942,9 +5869,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -4966,9 +5893,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -4990,9 +5917,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -5014,9 +5941,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -5026,9 +5953,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -5050,15 +5977,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -5074,12 +6001,22 @@ dependencies = [ [[package]] name = "winreg" -version = "0.11.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "winapi", + "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", + "windows-sys 0.48.0", ] [[package]] @@ -5108,8 +6045,8 @@ checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea" dependencies = [ "base64 0.13.1", "block", - "cocoa", - "core-graphics", + "cocoa 0.24.1", + "core-graphics 0.22.3", "crossbeam-channel", "dunce", "gdk", @@ -5192,20 +6129,20 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] [[package]] name = "xcb" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b90c622d513012e7419594a2138953603c63848cb189041e7b5dc04d3895da5" +checksum = "fb3acf6b0945550d37d3a683b8f7de9d9f66b2c14dc390313b34d7ac6f1b4089" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "quick-xml 0.28.2", ] @@ -5216,15 +6153,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" dependencies = [ - "nix 0.26.2", + "nix 0.26.4", "winapi", ] [[package]] name = "xml-rs" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" +checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" [[package]] name = "zbus" @@ -5250,7 +6187,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.26.2", + "nix 0.26.4", "once_cell", "ordered-stream", "rand 0.8.5", @@ -5298,9 +6235,48 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ + "aes", "byteorder", + "bzip2", + "constant_time_eq", "crc32fast", "crossbeam-utils", + "flate2", + "hmac", + "pbkdf2", + "sha1", + "time 0.3.28", + "zstd", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.8+zstd.1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +dependencies = [ + "cc", + "libc", + "pkg-config", ] [[package]] diff --git a/pkgs/applications/misc/pot/default.nix b/pkgs/applications/misc/pot/default.nix index 941796315c7..8866596cf7a 100644 --- a/pkgs/applications/misc/pot/default.nix +++ b/pkgs/applications/misc/pot/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "pot"; - version = "1.10.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "pot-app"; repo = "pot-desktop"; rev = version; - hash = "sha256-v5yx8pE8+m+5CDy7X3CwitYhFQMX8Ynt8Y2k1lEZKpg="; + hash = "sha256-VgEDV7bD5EfT5ZG7wuj5Ch3mfZ6x8a8473AvX96C64Q="; }; sourceRoot = "${src.name}/src-tauri"; @@ -37,10 +37,6 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" - - chmod -R +w .. - # Disable auto update check by default - sed -i -e '/auto_check/s/true/false/' src/main.rs ../src/windows/Config/index.jsx ''; pnpm-deps = stdenvNoCC.mkDerivation { @@ -70,17 +66,17 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-HJdVAjvHmhvztJMR9rVniWl12sGQYTyZojEYaoKnn5M="; + outputHash = "sha256-+/GDP3IFCidIs2/ZqQX7pZmZNQrCHNT6uy+x1CKkCmI="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "tauri-plugin-single-instance-0.0.0" = "sha256-Wb08d5Cpi8YhtngbnQ3ziy+zAwg5ZY+2xKejgE2oCNE="; - "tauri-plugin-autostart-0.0.0" = "sha256-Wb08d5Cpi8YhtngbnQ3ziy+zAwg5ZY+2xKejgE2oCNE="; + # All other crates in the same workspace reuse this hash. + "tauri-plugin-autostart-0.0.0" = "sha256-7Qi07yRb+ww569+sEXFIwAtS8jbUNQx6LsrUnMl5YOo="; "enigo-0.1.2" = "sha256-99VJ0WYD8jV6CYUZ1bpYJBwIE2iwOZ9SjOvyA2On12Q="; "selection-0.1.0" = "sha256-V4vixiyKqhpZeTXiFw0HKz5xr0zHd4DkC/hovJ8Y2a8="; - "screenshots-0.6.0" = "sha256-NHs7gqplg/eSUWYojayxeJtX7T4f8mt+akahi9LeukU="; + "reqwest_dav-0.1.3" = "sha256-nWOH1SOoNA2o2lmGAIEJj3OLOlP39FjlXqK8LPZ95hI="; }; }; @@ -105,12 +101,12 @@ stdenv.mkDerivation rec { ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override { buildGoModule = args: buildGoModule (args // rec { - version = "0.17.19"; + version = "0.18.20"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU="; + hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); @@ -119,6 +115,7 @@ stdenv.mkDerivation rec { preBuild = '' export HOME=$(mktemp -d) pnpm config set store-dir ${pnpm-deps} + chmod +w .. pnpm install --offline --frozen-lockfile --no-optional --ignore-script chmod -R +w ../node_modules pnpm rebuild diff --git a/pkgs/applications/misc/smb3-foundry/default.nix b/pkgs/applications/misc/smb3-foundry/default.nix index 81e54007b8b..c1a896d88e4 100644 --- a/pkgs/applications/misc/smb3-foundry/default.nix +++ b/pkgs/applications/misc/smb3-foundry/default.nix @@ -14,17 +14,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "smb3-foundry"; - version = "1.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "mchlnix"; repo = "SMB3-Foundry"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-iqqIyGp/sqWgShxk52omVcn7Q3WL2hK8sTLH4dashLE="; + hash = "sha256-8cf7VhvC372Cqi94n2FSHcoCGblpZoZvBXcXq5jU6CY="; }; - patches = [ ./fix-relative-dirs.patch ]; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -42,11 +40,12 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://github.com/mchlnix/SMB3-Foundry"; - description = "A modern Super Mario Bros. 3 Level Editor"; changelog = "https://github.com/mchlnix/SMB3-Foundry/releases/tag/${finalAttrs.version}"; + description = "A modern Super Mario Bros. 3 Level Editor"; + homepage = "https://github.com/mchlnix/SMB3-Foundry"; license = lib.licenses.gpl3Only; - platforms = lib.platforms.unix; + mainProgram = "smb3-foundry"; maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch b/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch deleted file mode 100644 index d49ddde897b..00000000000 --- a/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/foundry/gui/WarningList.py b/foundry/gui/WarningList.py -index ace83d7..46012df 100644 ---- a/foundry/gui/WarningList.py -+++ b/foundry/gui/WarningList.py -@@ -5,6 +5,7 @@ from PySide6.QtCore import QEvent, QRect, Qt, Signal, SignalInstance - from PySide6.QtGui import QCursor, QFocusEvent - from PySide6.QtWidgets import QLabel, QVBoxLayout, QWidget - -+from foundry import root_dir - from foundry.game import GROUND - from foundry.game.ObjectDefinitions import GeneratorType - from foundry.game.gfx.objects import EnemyItem -@@ -216,7 +217,7 @@ class WarningList(QWidget): - return [enemy for enemy in self.level_ref.level.enemies if enemy.type == enemy_id] - - def _build_enemy_clan_dict(self): -- with open("data/enemy_data.json", "r") as enemy_data_file: -+ with open(root_dir.joinpath("data", "enemy_data.json"), "r") as enemy_data_file: - enemy_data = json.loads(enemy_data_file.read()) - - self._enemy_dict.clear() -diff --git a/smb3parse/util/parser/__init__.py b/smb3parse/util/parser/__init__.py -index ecef169..8bba57e 100644 ---- a/smb3parse/util/parser/__init__.py -+++ b/smb3parse/util/parser/__init__.py -@@ -302,7 +302,7 @@ def gen_levels_in_rom( - - print("---------------------", level_count, "------------------------") - -- level_data = pathlib.Path("data/levels.dat") -+ level_data = pathlib.Path(__file__).parent.parent.parent.joinpath("data", "levels.dat") - - missing = 0 - levels: dict[int, set[int]] = defaultdict(set) diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/applications/misc/wofi-emoji/default.nix index eab1baedcac..f759ee34fb0 100644 --- a/pkgs/applications/misc/wofi-emoji/default.nix +++ b/pkgs/applications/misc/wofi-emoji/default.nix @@ -1,19 +1,18 @@ { stdenv, lib, fetchurl, fetchFromGitHub, jq, wofi, wtype, wl-clipboard }: let emojiJSON = fetchurl { - url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.6/dist/emoji-en-US.json"; - sha256 = "sha256-wf7zsIEbX/diLwmVvnN2Goxh2V5D3Z6nbEMSb5pSGt0="; -}; + url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.10/dist/emoji-en-US.json"; + hash = "sha256-UhAB5hVp5vV2d1FjIb2TBd2FJ6OPBbiP31HGAEDQFnA=";}; in stdenv.mkDerivation rec { pname = "wofi-emoji"; - version = "unstable-2022-08-19"; + version = "unstable-2023-06-19"; src = fetchFromGitHub { - owner = "dln"; + owner = "Zeioth"; repo = pname; - rev = "c5ecb4f0f164aedb046f52b5eacac889609c8522"; - sha256 = "1wq276bhf9x24ds13b2dwa69cjnr207p6977hr4bsnczryg609rh"; + rev = "796d688b71ac9fa1e5b2c1b9a3fa11dba801b02b"; + hash = "sha256-HBsqekNuKqxaKaSeLboukLm4Lkg9JakPO7uN3Z8QBC8="; }; nativeBuildInputs = [ jq ]; diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix deleted file mode 100644 index 0f5e807d006..00000000000 --- a/pkgs/applications/networking/cawbird/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, glib -, gtk3 -, json-glib -, sqlite -, libsoup -, liboauth -, gettext -, gspell -, vala -, meson -, ninja -, pkg-config -, dconf -, gst_all_1 -, wrapGAppsHook -, gobject-introspection -, glib-networking -, librest -, python3 -}: - -stdenv.mkDerivation rec { - version = "1.5"; - pname = "cawbird"; - - src = fetchFromGitHub { - owner = "IBBoard"; - repo = "cawbird"; - rev = "v${version}"; - sha256 = "sha256-XFN9gfCoQDmYYysg1yrUoPPE0Ow40LttvV5Ltu0DTfI="; - }; - - nativeBuildInputs = [ - meson - ninja - vala - pkg-config - wrapGAppsHook - python3 - gobject-introspection # for setup hook - ]; - - buildInputs = [ - glib - gtk3 - json-glib - sqlite - libsoup - liboauth - gettext - dconf - gspell - glib-networking - librest - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-bad - (gst-plugins-good.override { - gtkSupport = true; - }) - gst-libav - ]); - - postPatch = '' - chmod +x data/meson_post_install.py # patchShebangs requires executable file - patchShebangs data/meson_post_install.py - ''; - - # supply Twitter API keys - # use keys supplied by @SuperSandro2000, see https://github.com/IBBoard/cawbird/blob/master/README.md#preparation - mesonFlags = [ - "-Dconsumer_key_base64=YnJJNm01SE9PbEkzM3pWenZObVhVSHdlTg==" - "-Dconsumer_secret_base64=YUc1SkcyYzhsenlKT2VOWWhVSXlJMERDaFh0WEswUG9oTEp4TzhZNEdJb1hXN0hhYlY=" - ]; - - meta = with lib; { - description = "Native GTK Twitter client for the Linux desktop"; - longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird."; - homepage = "https://ibboard.co.uk/cawbird/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with lib.maintainers; [ jonafato schmittlauch ]; - }; -} diff --git a/pkgs/applications/networking/cluster/kn/default.nix b/pkgs/applications/networking/cluster/kn/default.nix index 0e4bcc8b6cf..ce4a5e83c6f 100644 --- a/pkgs/applications/networking/cluster/kn/default.nix +++ b/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-LkjE3GMHoD+PmB4J09xf71nBrY1KPvh13l2O3QN9EH0="; + sha256 = "sha256-Aiu8SedWCP2yIw51+aVEFcskJKee8RvUcW6yGtagSnI="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index 81ddb68b69e..7cbdab0d654 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "luigi"; - version = "3.0.2"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; + sha256 = "sha256-zIZC3rbiLwYB7o34rT3mOagVIbfmY6elBEkZGFrSs1c="; }; - propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 ]; + propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 tenacity ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index f88340f2c7e..047a44e84fd 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.13"; + version = "0.8.14"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nNi4YahrO4zwqwR90tIpQCAydGdQbfy5PXCifpP/T7Q="; + sha256 = "sha256-kh9rYg6UszBMCWYfVU+tP4ZRoigEm6+Z+7pnZWdbcwU="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/temporal-cli/default.nix b/pkgs/applications/networking/cluster/temporal-cli/default.nix index c35cf14e064..126a083b5b3 100644 --- a/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles, symlinkJoin }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles, symlinkJoin, stdenv }: let metaCommon = with lib; { @@ -40,6 +40,9 @@ let "-X github.com/temporalio/cli/headers.Version=${version}" ]; + # Tests fail with x86 on macOS Rosetta 2 + doCheck = !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64); + preCheck = '' export HOME=$(mktemp -d) ''; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index ac48c5e665a..ba870fea761 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.33.4"; + version = "0.33.5"; src = fetchFromGitHub { owner = "tilt-dev"; repo = "tilt"; rev = "v${version}"; - hash = "sha256-rQ5g5QyGyuJAHmE8zGFzqtpqW2xEju5JV386y9Cn+cs="; + hash = "sha256-o78PoIKj+0FvZRpm0AqtUq3N9a9/LDYc7DIPZgSZe4s="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index c0616c6ea39..7aa07705449 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "timoni"; - version = "0.11.1"; + version = "0.12.1"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-o5s/3c6fi6aYzKIBKq23U6FtzueDN0WVsG/wdCMEjDU="; + hash = "sha256-GILJAaid1kSO9281HQx7NI+mjmyJbTYTkwhvX4V/Idc="; }; - vendorHash = "sha256-rMLswgEWWaDupBHDXs/JATaaw4n5D+LjlM72eq8hPAM="; + vendorHash = "sha256-nGYAk9dwQ/+3SmNqGzbpptqBDAO/vNT9jhlcJf4y8jg="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 49035e9bd55..58351beab21 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230730"; + version = "20230905-3"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-5gXeAX3eV70p5wdQEMXv5QAv3vXH2OH46XL2rY0AUvE="; + hash = "sha256-xbQcrDtTZh0UeNIRODeA1OBgMdqEso2gAFuSpTSvrXo="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 1fa08dd530e..089521233b7 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.15.11.22019"; - versions.x86_64-darwin = "5.15.11.22019"; - versions.x86_64-linux = "5.15.11.7239"; + versions.aarch64-darwin = "5.15.12.22445"; + versions.x86_64-darwin = "5.15.12.22445"; + versions.x86_64-linux = "5.15.12.7665"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-R3QD2jo0+kwgOZ0PwHbFxAlbutSpxyDr+CzEwdKxioY="; + hash = "sha256-pTpNbKmJGTxRIrfD/zWIrkouhCbErxu9Gjy9mDdTtHc="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-nSiG2n8oN1k0xyBw4jWbrZT6AiP5VVJXkeBXppvNcAk="; + hash = "sha256-EItKg22id/e7OfJaWxxJdl9B+3nDHNl6ENvfGR4QJ6Y="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-pnVy+rS3NxMPwm86+ERLf1oSrsniP3i+FhSg16BuO38="; + hash = "sha256-DMFMLwxPt1LV4Qhhrw6gdToe0z9743hGcxVWeR4O1YU="; }; }; diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index b3ff51ab7c1..abc75b8bb73 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "ostinato"; - version = "1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "pstavirs"; repo = "ostinato"; rev = "v${version}"; - sha256 = "0B3jOj5rA3/rD2gXS2praZImeP34zN06fOPy/IswXOg="; + sha256 = "sha256-yhfhNfkiZulF0FxNT+3CeGqUTXLmwPQntl2TLdCcMTQ="; }; ostinatoIcon = fetchurl { diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index d218d7351b2..5146353dff4 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchurl , fetchFromGitHub , wrapGAppsHook , makeDesktopItem @@ -10,6 +11,7 @@ , jdk , gradle , perl +, python3 }: let @@ -19,20 +21,20 @@ let pin = "2.2.1-20230117.075740-16"; }; afterburner = { - snapshot = "testmoduleinfo-SNAPSHOT"; - pin = "0e337d8773"; + snapshot = "1.1.0-SNAPSHOT"; + pin = "1.1.0-20221226.155809-7"; }; }; in stdenv.mkDerivation rec { - version = "5.9"; + version = "5.10"; pname = "jabref"; src = fetchFromGitHub { owner = "JabRef"; repo = "jabref"; rev = "v${version}"; - hash = "sha256-uACmXas5L1NcxLwllkcbgCCt9bRicpQkiJkhkkVWDDY="; + hash = "sha256-Yj4mjXOZVM0dKcMfTjmnZs/kIs8AR0KJ9HKlyPM96j8="; }; desktopItems = [ @@ -49,35 +51,46 @@ stdenv.mkDerivation rec { }) ]; - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version postPatch; - - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon downloadDependencies -Dos.arch=amd64 - gradle --no-daemon downloadDependencies -Dos.arch=aarch64 - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ - | sh - mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \ - $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot} - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashMode = "recursive"; - outputHash = "sha256-s6GA8iT3UEVuELBgpBvzPJlVX+9DpfOQrEd3KIth8eA="; - }; + deps = + let + javafx-web = fetchurl { + url = "https://repo1.maven.org/maven2/org/openjfx/javafx-web/20/javafx-web-20.jar"; + hash = "sha256-qRtVN34KURlVM5Ie/x25IfKsKsUcux7V2m3LML74G/s="; + }; + in + stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit src version postPatch; + + nativeBuildInputs = [ gradle perl ]; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle --no-daemon downloadDependencies -Dos.arch=amd64 + gradle --no-daemon downloadDependencies -Dos.arch=aarch64 + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ + | sh + mv $out/org/jabref/afterburner.fx/${versionReplace.afterburner.pin} \ + $out/org/jabref/afterburner.fx/${versionReplace.afterburner.snapshot} + mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \ + $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot} + # This jar is required but not used or cached for unknown reason. + cp ${javafx-web} $out/org/openjfx/javafx-web/20/javafx-web-20.jar + ''; + # Don't move info to share/ + forceShare = [ "dummy" ]; + outputHashMode = "recursive"; + outputHash = "sha256-XswHEKjzErL+znau/F6mTORVJlFSgVuT0svK29v5dEU="; + }; postPatch = '' # Pin the version substituteInPlace build.gradle \ - --replace 'com.github.JabRef:afterburner.fx:${versionReplace.afterburner.snapshot}' \ - 'com.github.JabRef:afterburner.fx:${versionReplace.afterburner.pin}' \ + --replace 'org.jabref:afterburner.fx:${versionReplace.afterburner.snapshot}' \ + 'org.jabref:afterburner.fx:${versionReplace.afterburner.pin}' \ --replace 'com.tobiasdiez:easybind:${versionReplace.easybind.snapshot}' \ 'com.tobiasdiez:easybind:${versionReplace.easybind.pin}' ''; @@ -91,6 +104,18 @@ stdenv.mkDerivation rec { build.gradle \ buildSrc/build.gradle \ settings.gradle + + # The `plugin {}` block can't resolve plugins from the deps repo + sed -e '/plugins {/,/^}/d' buildSrc/build.gradle > buildSrc/build.gradle.tmp + cat > buildSrc/build.gradle <<EOF + buildscript { + repositories { maven { url uri("${deps}") } } + dependencies { classpath 'org.openjfx:javafx-plugin:0.0.14' } + } + apply plugin: 'java' + apply plugin: 'org.openjfx.javafxplugin' + EOF + cat buildSrc/build.gradle.tmp >> buildSrc/build.gradle ''; nativeBuildInputs = [ @@ -101,7 +126,10 @@ stdenv.mkDerivation rec { unzip ]; - buildInputs = [ gtk3 ]; + buildInputs = [ + gtk3 + python3 + ]; buildPhase = '' runHook preBuild @@ -129,6 +157,7 @@ stdenv.mkDerivation rec { # script to support browser extensions install -Dm755 buildres/linux/jabrefHost.py $out/lib/jabrefHost.py + patchShebangs $out/lib/jabrefHost.py install -Dm644 buildres/linux/native-messaging-host/firefox/org.jabref.jabref.json $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json sed -i -e "s|/opt/jabref|$out|" $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json @@ -137,11 +166,8 @@ stdenv.mkDerivation rec { tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1 - # remove openjfx libs for other platforms - rm $out/lib/javafx-*-win.jar ${lib.optionalString stdenv.isAarch64 "$out/lib/javafx-*-linux.jar"} - # workaround for https://github.com/NixOS/nixpkgs/issues/162064 - unzip $out/lib/javafx-web-*.jar libjfxwebkit.so -d $out/lib/ + unzip $out/lib/javafx-web-*-*.jar libjfxwebkit.so -d $out/lib/ DEFAULT_JVM_OPTS=$(sed -n -E "s/^DEFAULT_JVM_OPTS='(.*)'$/\1/p" $out/bin/JabRef | sed -e "s|\$APP_HOME|$out|g" -e 's/"//g') diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 0c52d8a0af7..66df0d26ac9 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.65.1"; + version = "0.65.3"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-VfYuqrz9YDHwY0atKXYkzHJW/lXlVWGgo5QjMTMeB+g="; + hash = "sha256-xAbfyjQ0MPNDC6UJthCLtu8nfI/AdtludvejA32/dIQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/pkgs/applications/science/math/wolfram-engine/l10ns.nix index 5a296330160..ae1886bae15 100644 --- a/pkgs/applications/science/math/wolfram-engine/l10ns.nix +++ b/pkgs/applications/science/math/wolfram-engine/l10ns.nix @@ -8,6 +8,13 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ { + version = "13.3.0"; + lang = "en"; + language = "English"; + sha256 = "96106ac8ed6d0e221a68d846117615c14025320f927e5e0ed95b1965eda68e31"; + installer = "WolframEngine_13.3.0_LINUX.sh"; + } + { version = "13.2.0"; lang = "en"; language = "English"; diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix index 5a0f3877cdb..b09183f71b9 100644 --- a/pkgs/applications/science/medicine/xmedcon/default.nix +++ b/pkgs/applications/science/medicine/xmedcon/default.nix @@ -6,6 +6,7 @@ , pkg-config , libpng , zlib +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -24,11 +25,11 @@ stdenv.mkDerivation rec { zlib ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; meta = with lib; { description = "An open source toolkit for medical image conversion "; - homepage = "https://xmedcon.sourceforge.io/Main/HomePage"; + homepage = "https://xmedcon.sourceforge.net/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ arianvp flokli ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index f7b5d082e1e..ae99781f83e 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -20,13 +20,13 @@ assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.2.2"; + version = "2.3.2"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-XXtir/sSjJ1rpv3UQHM3Kano/fMBch/sm8ZtYwGyFyQ="; + hash = "sha256-vfv6dCmTuDsh6MaD2HAKlxZtQGVE0B5HJZPnoAUwUnM="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; diff --git a/pkgs/applications/version-management/git-credential-manager/update.sh b/pkgs/applications/version-management/git-credential-manager/update.sh index a24eed3f271..e87352a3652 100755 --- a/pkgs/applications/version-management/git-credential-manager/update.sh +++ b/pkgs/applications/version-management/git-credential-manager/update.sh @@ -16,8 +16,8 @@ fi echo "updating $currentVersion -> $latestVersion" sed -i -e "s/version = \"${currentVersion}\"/version = \"${latestVersion}\"/" default.nix -hash="$(nix-prefetch ./.)" -sed -i -Ee "s/hash = \"sha256-[A-Za-z0-9=]{44}\"/hash = \"${hash}\"/" default.nix +hash="$(nix-prefetch -f "$(pwd)/../../../.." git-credential-manager)" +sed -i -Ee "s/hash = \"sha256-[A-Za-z0-9/+=]{44}\"/hash = \"${hash}\"/" default.nix $(nix-build ../../../.. -A git-credential-manager.fetch-deps --no-out-link) diff --git a/pkgs/applications/video/multiviewer-for-f1/default.nix b/pkgs/applications/video/multiviewer-for-f1/default.nix index 5dd929fcbaa..7a51720ec5d 100644 --- a/pkgs/applications/video/multiviewer-for-f1/default.nix +++ b/pkgs/applications/video/multiviewer-for-f1/default.nix @@ -23,15 +23,15 @@ , xorg }: let - id = "123365359"; + id = "123219506"; in stdenvNoCC.mkDerivation rec { pname = "multiviewer-for-f1"; - version = "1.26.4"; + version = "1.26.2"; src = fetchurl { url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; - sha256 = "sha256-VKpEE1o24Wc4IOagIC62kzPf7nCkgAWsXbeOQXNN4O4="; + sha256 = "sha256-nibPVqc4B3PHF/3wR5FsYZGVkkReQjy+4glfdnBysSU="; }; nativeBuildInputs = [ |