diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index d47a56ac55eb..cdc7a49deebe 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -692,6 +692,10 @@ - `cargo-tauri.hook` was introduced to help users build [Tauri](https://tauri.app/) projects. It is meant to be used alongside `rustPlatform.buildRustPackage` and Node hooks such as `npmConfigHook`, `pnpm.configHook`, and the new `yarnConfig` +- `power.ups` now powers off UPSs during a power outage event. + This saves UPS battery and ensures that host(s) get back up again when power comes back, even in the scenario when the UPS would have had enough capacity to keep power on during the whole power outage. + If you like the old behaviour of keeping the UPSs on (and emptying the battery) after the host(s) have shut down, and risk not getting a power cycle event to get the host(s) back up, set `power.ups.upsmon.settings.POWERDOWNFLAG = null;`. + - Support for *runner registration tokens* has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872) in `gitlab-runner` 15.6 and is expected to be removed in `gitlab-runner` 18.0. Configuration of existing runners should be changed to using *runner authentication tokens* by configuring diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index 9361393d91af..272f6f38f545 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -309,8 +309,10 @@ let defaultText = lib.literalMD '' { MINSUPPLIES = 1; - RUN_AS_USER = "root"; + MONITOR = NOTIFYCMD = "''${pkgs.nut}/bin/upssched"; + POWERDOWNFLAG = "/run/killpower"; + RUN_AS_USER = "root"; SHUTDOWNCMD = "''${pkgs.systemd}/bin/shutdown now"; } ''; @@ -330,11 +332,12 @@ let config = { enable = lib.mkDefault (lib.elem cfg.mode [ "standalone" "netserver" "netclient" ]); settings = { - RUN_AS_USER = "root"; # TODO: replace 'root' by another username. MINSUPPLIES = lib.mkDefault 1; - NOTIFYCMD = lib.mkDefault "${pkgs.nut}/bin/upssched"; - SHUTDOWNCMD = lib.mkDefault "${pkgs.systemd}/bin/shutdown now"; MONITOR = lib.flip lib.mapAttrsToList cfg.upsmon.monitor (name: monitor: with monitor; [ system powerValue user "\"@upsmon_password_${name}@\"" type ]); + NOTIFYCMD = lib.mkDefault "${pkgs.nut}/bin/upssched"; + POWERDOWNFLAG = lib.mkDefault "/run/killpower"; + RUN_AS_USER = "root"; # TODO: replace 'root' by another username. + SHUTDOWNCMD = lib.mkDefault "${pkgs.systemd}/bin/shutdown now"; }; }; }; @@ -574,6 +577,24 @@ in ]; }; + systemd.services.ups-killpower = lib.mkIf (cfg.upsmon.settings.POWERDOWNFLAG != null) { + enable = cfg.upsd.enable; + description = "UPS Kill Power"; + wantedBy = [ "shutdown.target" ]; + after = [ "shutdown.target" ]; + before = [ "final.target" ]; + unitConfig = { + ConditionPathExists = cfg.upsmon.settings.POWERDOWNFLAG; + DefaultDependencies = "no"; + }; + environment = envVars; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.nut}/bin/upsdrvctl shutdown"; + Slice = "system-ups.slice"; + }; + }; + environment.etc = { "nut/nut.conf".source = pkgs.writeText "nut.conf" '' diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix index cd2ed9b87368..ce748881824c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix @@ -10,16 +10,16 @@ let in rustPlatform.buildRustPackage { pname = "lspce-module"; - version = "1.1.0-unstable-2024-07-29"; + version = "1.1.0-unstable-2024-09-07"; src = fetchFromGitHub { owner = "zbelial"; repo = "lspce"; - rev = "e954e4d77aeb45deb14182631f3d5aa9bcc9e587"; - hash = "sha256-9AUffkdgvVbHRIrHQPVl36plIfGxf3vsN9JCuFe0P6Q="; + rev = "4bf1fa9d3d8b17eb6ae628e93018ee8f020565ba"; + hash = "sha256-OeDUQXqVBUfKjYt5oSmfl2N/19PFYIbPXfFqloai0LQ="; }; - cargoHash = "sha256-wrrdXX/rEVxmHdyblm4I9iHD3bPoDd1KlBe3ODeGFeM="; + cargoHash = "sha256-VMGdB4dF3Ccxl6DifdXFH4+XVT7RoeqI/l/AR/epg4o="; checkFlags = [ # flaky test diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 14d682e14e43..a5443ab4896c 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -101,8 +101,18 @@ in ### neovim tests ################## nvim_with_plugins = wrapNeovim2 "-with-plugins" nvimConfNix; + nvim_singlelines = wrapNeovim2 "-single-lines" nvimConfSingleLines; - singlelinesconfig = runTest (wrapNeovim2 "-single-lines" nvimConfSingleLines) '' + # test that passthru.initRc hasn't changed + passthruInitRc = runTest nvim_singlelines '' + INITRC=${pkgs.writeTextFile { name = "initrc"; text = nvim_singlelines.passthru.initRc; }} + assertFileContent \ + $INITRC \ + "${./init-single-lines.vim}" + ''; + + # test single line concatenation + singlelinesconfig = runTest nvim_singlelines '' assertFileContains \ "$luarcGeneric" \ "vim.cmd.source \"/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-init.vim" @@ -127,6 +137,7 @@ in viAlias = true; }; + # test it still works with vim-plug nvim_with_plug = neovim.override { extraName = "-with-plug"; configure.packages.plugins = with pkgs.vimPlugins; { diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 9f0aa86de48c..5f63f2e60df8 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -13,6 +13,30 @@ let inherit (vimUtils) toVimPlugin; + /* transform all plugins into an attrset + { optional = bool; plugin = package; } + */ + normalizePlugins = plugins: + let + defaultPlugin = { + plugin = null; + config = null; + optional = false; + }; + in + map (x: defaultPlugin // (if (x ? plugin) then x else { plugin = x; })) plugins; + + + /* accepts a list of normalized plugins and convert themn + */ + normalizedPluginsToVimPackage = normalizedPlugins: + let + pluginsPartitioned = lib.partition (x: x.optional == true) normalizedPlugins; + in { + start = map (x: x.plugin) pluginsPartitioned.wrong; + opt = map (x: x.plugin) pluginsPartitioned.right; + }; + /* returns everything needed for the caller to wrap its own neovim: - the generated content of the future init.vim - the arguments to wrap neovim with @@ -23,103 +47,19 @@ let Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc wont be loaded anymore, $MYVIMRC wont be set etc */ - makeNeovimConfig = - { withPython3 ? true - /* the function you would have passed to python3.withPackages */ - , extraPython3Packages ? (_: [ ]) - , withNodeJs ? false - , withRuby ? true - /* the function you would have passed to lua.withPackages */ - , extraLuaPackages ? (_: [ ]) - - # expects a list of plugin configuration - # expects { plugin=far-vim; config = "let g:far#source='rg'"; optional = false; } - , plugins ? [] - # custom viml config appended after plugin-specific config - , customRC ? "" - - # for forward compability, when adding new environments, haskell etc. - , ... - }@args: - let - rubyEnv = bundlerEnv { - name = "neovim-ruby-env"; - gemdir = ./ruby_provider; - postBuild = '' - ln -sf ${ruby}/bin/* $out/bin - ''; - }; - - # transform all plugins into an attrset - # { optional = bool; plugin = package; } - pluginsNormalized = let - defaultPlugin = { - plugin = null; - config = null; - optional = false; - }; - in - map (x: defaultPlugin // (if (x ? plugin) then x else { plugin = x; })) plugins; - - pluginRC = lib.foldl (acc: p: if p.config != null then acc ++ [p.config] else acc) [] pluginsNormalized; - - pluginsPartitioned = lib.partition (x: x.optional == true) pluginsNormalized; - requiredPlugins = vimUtils.requiredPluginsForPackage myVimPackage; - getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ])); - myVimPackage = { - start = map (x: x.plugin) pluginsPartitioned.wrong; - opt = map (x: x.plugin) pluginsPartitioned.right; - }; - - pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; - python3Env = python3Packages.python.withPackages (ps: - [ ps.pynvim ] - ++ (extraPython3Packages ps) - ++ (lib.concatMap (f: f ps) pluginPython3Packages)); - - luaEnv = neovim-unwrapped.lua.withPackages extraLuaPackages; - - # as expected by packdir - packpathDirs.myNeovimPackages = myVimPackage; - ## Here we calculate all of the arguments to the 1st call of `makeWrapper` - # We start with the executable itself NOTE we call this variable "initial" - # because if configure != {} we need to call makeWrapper twice, in order to - # avoid double wrapping, see comment near finalMakeWrapperArgs - makeWrapperArgs = - let - binPath = lib.makeBinPath (lib.optionals withRuby [ rubyEnv ] ++ lib.optionals withNodeJs [ nodejs ]); - in - [ - "--inherit-argv0" - ] ++ lib.optionals withRuby [ - "--set" "GEM_HOME" "${rubyEnv}/${rubyEnv.ruby.gemPath}" - ] ++ lib.optionals (binPath != "") [ - "--suffix" "PATH" ":" binPath - ] ++ lib.optionals (luaEnv != null) [ + makeNeovimConfig = { + customRC ? "" + /* the function you would have passed to lua.withPackages */ + , extraLuaPackages ? (_: [ ]) + , ...}@attrs: let + luaEnv = neovim-unwrapped.lua.withPackages extraLuaPackages; + in attrs // { + neovimRcContent = customRC; + wrapperArgs = lib.optionals (luaEnv != null) [ "--prefix" "LUA_PATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaPathAbsStr luaEnv) "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.luaLib.genLuaCPathAbsStr luaEnv) - ]; - - manifestRc = vimUtils.vimrcContent { customRC = ""; }; - # we call vimrcContent without 'packages' to avoid the init.vim generation - neovimRcContent = vimUtils.vimrcContent { - beforePlugins = ""; - customRC = lib.concatStringsSep "\n" (pluginRC ++ [customRC]); - packages = null; - }; - in - - builtins.removeAttrs args ["plugins"] // { - wrapperArgs = makeWrapperArgs; - inherit packpathDirs; - inherit neovimRcContent; - inherit manifestRc; - inherit python3Env; - inherit luaEnv; - inherit withNodeJs; - } // lib.optionalAttrs withRuby { - inherit rubyEnv; - }; + ]; + }; # to keep backwards compatibility for people using neovim.override @@ -198,6 +138,9 @@ let in lib.concatStringsSep ";" hostProviderLua; + /* Converts a lua package into a neovim plugin. + Does so by installing the lua package with a flat hierarchy of folders + */ buildNeovimPlugin = callPackage ./build-neovim-plugin.nix { inherit (vimUtils) toVimPlugin; inherit lua; @@ -275,6 +218,7 @@ in inherit legacyWrapper; inherit grammarToPlugin; inherit packDir; + inherit normalizePlugins normalizedPluginsToVimPackage; inherit buildNeovimPlugin; buildNeovimPluginFrom2Nix = lib.warn "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 8bcd1b5ebbd6..164146814262 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -1,4 +1,7 @@ { stdenv, symlinkJoin, lib, makeWrapper +, bundlerEnv +, ruby +, nodejs , writeText , nodePackages , python3 @@ -6,6 +9,7 @@ , neovimUtils , perl , lndir +, vimUtils }: neovim-unwrapped: @@ -18,10 +22,11 @@ let extraName ? "" # should contain all args but the binary. Can be either a string or list , wrapperArgs ? [] - # a limited RC script used only to generate the manifest for remote plugins - , manifestRc ? null , withPython2 ? false - , withPython3 ? true, python3Env ? python3 + , withPython3 ? true + /* the function you would have passed to python3.withPackages */ + , extraPython3Packages ? (_: [ ]) + , withNodeJs ? false , withPerl ? false , rubyEnv ? null @@ -39,23 +44,67 @@ let , neovimRcContent ? null # lua code to put into the generated init.lua file , luaRcContent ? "" - # entry to load in packpath - , packpathDirs + # DEPRECATED: entry to load in packpath + # use 'plugins' instead + , packpathDirs ? null # not used anymore + + # a list of neovim plugin derivations, for instance + # plugins = [ + # { plugin=far-vim; config = "let g:far#source='rg'"; optional = false; } + # ] + , plugins ? [] , ... - }: + }@attrs: assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; + assert packpathDirs != null -> throw "packpathdirs is not used anymore: pass a list of neovim plugin derivations in 'plugins' instead."; + stdenv.mkDerivation (finalAttrs: let + pluginsNormalized = neovimUtils.normalizePlugins plugins; + + myVimPackage = neovimUtils.normalizedPluginsToVimPackage pluginsNormalized; + + rubyEnv = bundlerEnv { + name = "neovim-ruby-env"; + gemdir = ./ruby_provider; + postBuild = '' + ln -sf ${ruby}/bin/* $out/bin + ''; + }; + + pluginRC = lib.foldl (acc: p: if p.config != null then acc ++ [p.config] else acc) [] pluginsNormalized; + + # a limited RC script used only to generate the manifest for remote plugins + manifestRc = vimUtils.vimrcContent { customRC = ""; }; + # we call vimrcContent without 'packages' to avoid the init.vim generation + neovimRcContent' = vimUtils.vimrcContent { + beforePlugins = ""; + customRC = lib.concatStringsSep "\n" (pluginRC ++ [neovimRcContent]); + packages = null; + }; finalPackdir = neovimUtils.packDir packpathDirs; rcContent = '' ${luaRcContent} - '' + lib.optionalString (!isNull neovimRcContent) '' - vim.cmd.source "${writeText "init.vim" neovimRcContent}" + '' + lib.optionalString (neovimRcContent' != null) '' + vim.cmd.source "${writeText "init.vim" neovimRcContent'}" ''; + getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ])); + + requiredPlugins = vimUtils.requiredPluginsForPackage myVimPackage; + pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; + + python3Env = lib.warnIf (attrs ? python3Env) "Pass your python packages via the `extraPython3Packages`, e.g., `extraPython3Packages = ps: [ ps.pandas ]`" + python3.pkgs.python.withPackages (ps: + [ ps.pynvim ] + ++ (extraPython3Packages ps) + ++ (lib.concatMap (f: f ps) pluginPython3Packages)); + + packpathDirs.myNeovimPackages = myVimPackage; + wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; generatedWrapperArgs = @@ -94,6 +143,7 @@ let in { name = "${pname}-${version}${extraName}"; inherit pname version; + inherit plugins; __structuredAttrs = true; dontUnpack = true; @@ -193,7 +243,7 @@ let passthru = { inherit providerLuaRc packpathDirs; unwrapped = neovim-unwrapped; - initRc = neovimRcContent; + initRc = neovimRcContent'; tests = callPackage ./tests { }; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index a56409fec9f1..d183730963b5 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 = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2024-08-26"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "4d9d297c2409c8ebc715da7f1d7705a221564555"; - sha256 = "0i4ras7n66i4h64bb0v70v85b70d0rw33hy16kgyr20b6qkm53vm"; + rev = "5b6d296eefc75331e2ff9f0adcffbd7d27862dd6"; + sha256 = "07f0p03fb4060lc7jfvp8mqi0jbk8mril9fg3b8rx9mq8415g1gr"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -197,12 +197,12 @@ final: prev: LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-09-29"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "ed349b76f3feff7dc68a1e478d51e59cb41e1e6f"; - sha256 = "1cyhgc7hh73gnn5k41xryndfxxnan0f1vpl4fndbwslxyfmilvy0"; + rev = "1f00feafbde66263760ea6b066ef07515ae03a42"; + sha256 = "01s4f0nihvq0haldrdgiqi2rpkpmqzaslqq09q42sn5kx5yg3xn7"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -329,12 +329,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-10-04"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "dd374887d6e1de38e9d7041da824a8dc10cae401"; - sha256 = "02k5grghlzmxw03av99y5xbmkyq9rh3mb26nhmcs0wmf0d431d92"; + rev = "6f86b595c24ba3d6d1de23e219bf3be6131aa617"; + sha256 = "0im4niazj7cmzs2gkncc6pgmv2a8p10ak0s13f2zxidhh3ajs78k"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -473,12 +473,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-09-14"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "63ab13e95141c252c545f9a6c7144ced6790d68f"; - sha256 = "0v7xb149q9wvmd7arin397415bl6rrscgipwcb46wmjm08qzwjyp"; + rev = "35d188247bb481ed721584612fea4736a373e8ca"; + sha256 = "0j8nc144vnmxz2nky8snfh7yvzdfd4lz57k808944qs93i7rndp1"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -751,12 +751,12 @@ final: prev: astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-09-26"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "53d093f172c7beb72bae5c0a350880223c2735de"; - sha256 = "0vfzvbk4k5gawv3q9924sr5yydjxbfw4qdn3qk1jgph7p3iw64z8"; + rev = "4fd678a3eac7712ffe2d9e964563066dbb97aa0f"; + sha256 = "1sfspgsh3gnmm87nh34amiada0cid86mgimklljyvyzkb9qpbc3k"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -943,12 +943,12 @@ final: prev: auto-save-nvim = buildVimPlugin { pname = "auto-save.nvim"; - version = "2024-04-25"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "okuuva"; repo = "auto-save.nvim"; - rev = "5fe9ab0c42f0457f2a973e814a6352b8eeb04730"; - sha256 = "1c4xmp1cy3h7z68yh09bcazdqj8kimyrddgl0wc068sb6pmnpbbi"; + rev = "5fbcaac0a2698c87a9a1bd2083cb6949505cca12"; + sha256 = "1ncp19p7glgwjy372kmiffk5l78xd2byjmk3l87a4vxjf5d3gp9l"; }; meta.homepage = "https://github.com/okuuva/auto-save.nvim/"; }; @@ -1136,12 +1136,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2024-10-07"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "177af7c0e492f6332bf78675a47b8983b1a32291"; - sha256 = "1fj1lvjzizp47f41pnsdjx19qpl12rfcw9awis2ci65095xrzv12"; + rev = "fec9fa583025e69e0c4f902bd61990e8d13d1975"; + sha256 = "0zzkpl73cf1xd8lhmn9468ca8xpdyhbpki6yazwsdvdvn657fyy7"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1640,11 +1640,11 @@ final: prev: cmp-async-path = buildVimPlugin { pname = "cmp-async-path"; - version = "2024-08-27"; + version = "2024-10-11"; src = fetchgit { url = "https://codeberg.org/FelipeLema/cmp-async-path/"; - rev = "03fac5dfd6f7880be2c059d58bebe007f0d6d8ee"; - sha256 = "1dycqym1n4i5cxah2a151ih5k3h238vipf54d7jcr3jgx1ad8glv"; + rev = "e3206e521ce89fe0e97cc8f14e4fc8c131f369e4"; + sha256 = "0r6kb1c25m4wwxdx1mxkakfl2qhmmfivvmxx1wp3c8f16rny5m6i"; }; meta.homepage = "https://codeberg.org/FelipeLema/cmp-async-path/"; }; @@ -1913,6 +1913,18 @@ final: prev: meta.homepage = "https://github.com/notomo/cmp-neosnippet/"; }; + cmp-nixpkgs-maintainers = buildVimPlugin { + pname = "cmp-nixpkgs-maintainers"; + version = "2024-10-12"; + src = fetchFromGitHub { + owner = "GaetanLepage"; + repo = "cmp-nixpkgs-maintainers"; + rev = "da6a5050bc6be7a55c333d0009ae87d909e30b3f"; + sha256 = "sha256-z/k7lC2tZvll+BlXoj5N7EwOGN3f3Lu4gT6YWocCL8c="; + }; + meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/"; + }; + cmp-npm = buildVimPlugin { pname = "cmp-npm"; version = "2023-06-12"; @@ -2311,12 +2323,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-09-02"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "69b16f8651b4d92d9ea5d6b000c084f275ed7928"; - sha256 = "1fw1jridm31gw41xq6cx2k51nkxk8jv3b26idbkynm4isr02g0ig"; + rev = "57d488a06bdb34de89acef3c2f3e9ce609d632ed"; + sha256 = "106w4kgrqlgnszpkzlxrlzsvca880qagv07h93dxsl2ggbdkm91l"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2335,24 +2347,24 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2024-10-05"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "ed65f0a5262c746b2d69a7ae67af7c1da89f94ab"; - sha256 = "061i7q55mdqsnk02iz37s0k4l00mxgg0xqcb410j0m281knxicmp"; + rev = "ca38490ef963b066d6f686146d73213c70ef7f6b"; + sha256 = "0ya0bp8l846l2zank4gbd44fzb464wz2bhdzc5k0z592xrvavjky"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-10-04"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "9ff8d323ff56ff513457f3f7f4305523408d538e"; - sha256 = "1yp6n5377baxkwz7dq9cgxnhp9cvhf1kv4w2fypsky6nrqdcgsak"; + rev = "452fcfa08dcf293cd2f78e32e9d7c6dbe618e0f0"; + sha256 = "194wapl8fq32xa6kh1f386qjr0bv6rb6ggqbl69acwn7p9vgcp4s"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2720,12 +2732,12 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-08-29"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "782461159655b259cff10ecff05efa761e3d4764"; - sha256 = "0f0iszaphi1p411wgpn8r4slqrxlwdcy03raqypdg5f40jmiad9c"; + rev = "87038123804796ca7af20d1b71c3428d858a9124"; + sha256 = "1532h9694na7mx2lxmg0cx683df0x7w83vrrvd1gn5hwv96bhvpp"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; @@ -2840,12 +2852,12 @@ final: prev: csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; - version = "2024-10-06"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "csharpls-extended-lsp.nvim"; - rev = "abcd1c82ae4eb959eb1cf4276139abe01547815b"; - sha256 = "0gzz1d8qwcmmqcfvvbb8madhahbm5z5s1nyprjvjm0b83856knjp"; + rev = "b647e1bd1f9c0410f5ef4a1517a331cbac322d9a"; + sha256 = "0157f53l65r68dy3swx221nijzfxqq3hrhpfz8sg8fi1j9bwzqmh"; }; meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; }; @@ -2912,12 +2924,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-10-06"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "1af5dbd6fba7c92c6fc17c775a625f9402dd9980"; - sha256 = "1j6hvxvhp007nc2va3vf9nq2pf1i41nb7lsrf89375msvibg8smv"; + rev = "e2ff36e57bb6f75a627e282fa2c6654e658d3052"; + sha256 = "0fdhamfbvlzjjsla81a20pkyaw71ras3zkba41j1vfas9h6kjr0g"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -3044,12 +3056,12 @@ final: prev: debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-10-02"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "aa2e6966e1caf57a80df293565bb669cc8dbe50d"; - sha256 = "1qz31i7ggcq5zzav1v3hz4zb6d2gr56r0k4wcbj5wslnz869k42f"; + rev = "954f0b6c1c2e9338a71442a64ccf464a20ee9134"; + sha256 = "09z2f0fv1gfnvkn2z5f5s9a5cgxna09rach6v7cmcia9f5wg2ncf"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -3502,12 +3514,12 @@ final: prev: distant-nvim = buildVimPlugin { pname = "distant.nvim"; - version = "2024-09-30"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "chipsenkbeil"; repo = "distant.nvim"; - rev = "f3a4a1c87a2a67a08deb472b57148cd55b29d0fc"; - sha256 = "1y4q7gwyanj43cxg5vvaichc28c9k59ylvlg82xw163k0wlm0m70"; + rev = "cf8f00d88fac3ed52ecdd8d485e4a565ba4c660f"; + sha256 = "0677mgkp91nx9hbmjkxpagqbpzxiapylz89yiq50al34hqaqbl4w"; }; meta.homepage = "https://github.com/chipsenkbeil/distant.nvim/"; }; @@ -3562,12 +3574,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-09-26"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "669e325489202ae4da5a951314bbf8dbb20e7cff"; - sha256 = "056iyj4l3rjb6w5vg0h8w7mn930dj74fknra1282xdiz5qf70myx"; + rev = "35988affc74c0cebb1484bcdfccfed523c0e7267"; + sha256 = "0ap101wxi1y3f2dx6x9b0ag0gbibifhqj2ybn13z5kab8pindc2r"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -4045,12 +4057,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-09-26"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "nvim-flutter"; repo = "flutter-tools.nvim"; - rev = "ce18f5da5f9c458cd26eef5c3accb0c37b2263c2"; - sha256 = "17w7hz2nxwq57k25canbfy11i6fy8vpf435jbd8fdq578a1jcwmj"; + rev = "6bf887bb9442b80a67f36e7465a66de4202d8a3f"; + sha256 = "1y4fksq8lrz2v15vinvvgj3bbqavyx8nsajmf5r81bgmkpqa8bhr"; }; meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/"; }; @@ -4069,12 +4081,12 @@ final: prev: formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; - version = "2024-10-01"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "b0edd69cec589bb65930cb15ab58b7e61d9a7e70"; - sha256 = "0sffbiygib9mnyl3k2aiwap4xnp5gpyasgdiyz21j2mkvs850kpj"; + rev = "77979a90a80849e60c6a9249427421b65d5a9a68"; + sha256 = "139wx2bhvs2iyyc3bysgln40rj1jcm5iag5yd39hcwwdk2f6f4iz"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -4453,12 +4465,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2024-10-01"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "5b4f1ab2689c903ab801f2cf195bebbc95f0d156"; - sha256 = "1wppn4rhqlcjac0i67x1q2388v803syjkaffnn2jdrwknhpc5vpd"; + rev = "0d099822d56db4f611f0b9b7c74c75dbedcf8318"; + sha256 = "1z344h0v4gcrrdx1grwgjsb005xif585p06dcb413y6mbgsv4vh5"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4573,12 +4585,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2024-09-30"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "b7c2b28e49d55ff71cd9bb3ad19a2021316510d8"; - sha256 = "0cxvza1f45h07zms30wsnx8m5mklpfhgb9x7rw1v8jcvlsgx2dm8"; + rev = "f47594f05d10b0bedfc0ed78e488e7fd714d57be"; + sha256 = "14s0y1lzchqghr1rkirwmfys0q1l3rl9h1b80acik3pcmdzgr1i5"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; }; @@ -4657,24 +4669,24 @@ final: prev: guard-collection = buildVimPlugin { pname = "guard-collection"; - version = "2024-10-06"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard-collection"; - rev = "06da4a065b974bbedf1a5535232c90a3526f8a43"; - sha256 = "1clpsgzq2iw0srhyf85l8qf0jr6bsdrq1pmpbvcqd69r8s2wybgy"; + rev = "21864299f3f5bd8eedddf2fa7f1253fa20e1c568"; + sha256 = "1rrkf51bf7wb60vpjzhhzc9ic8hgyzp7i52affsw3fw4r96mlwfm"; }; meta.homepage = "https://github.com/nvimdev/guard-collection/"; }; guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2024-10-06"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "bdbc43dadd530b0058708723db76e705a4542063"; - sha256 = "0198gbvx52c0g15pjjlncq9gir3x0f3lnm253v2yf9qc0y2w8zm0"; + rev = "cc8df48248eb795b71be21f7a30f08fc47a2c22d"; + sha256 = "1khw69wymn22wisp29z8yh4avr826l7d0vpvks857zk79lm3lm89"; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; }; @@ -4729,12 +4741,12 @@ final: prev: hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2024-08-20"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "6513bf42cd9261669d1ee41ff8b4065dfdc53a09"; - sha256 = "0v522mzz7cp62hjf9bqnfrpnadapywb56r5d888kjvc4gcy9kzrv"; + rev = "027d6f991927a71bd510a7673ae5bb404ca2a1c7"; + sha256 = "1vpxrcrw8hh6jcs74ykvld4rk7dhvjp0k4sd7jqn5ijj73h3ah48"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4861,12 +4873,12 @@ final: prev: hex-nvim = buildVimPlugin { pname = "hex.nvim"; - version = "2024-09-03"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "RaafatTurki"; repo = "hex.nvim"; - rev = "d0f553dcd2c08d226026d769119b2eb6b09b8dfd"; - sha256 = "0dqv23i08ng4g7mm35g484p39i4b3vr6xnz3m7ij7n3d6bpfc8c3"; + rev = "fcff75fcf43b5a6c5b471eed65b3a06c412d6020"; + sha256 = "1wh8dnx9a8pjq53v7crhxczv0bzvv2gdj2ra7n2w66cql75piw4v"; }; meta.homepage = "https://github.com/RaafatTurki/hex.nvim/"; }; @@ -5512,12 +5524,12 @@ final: prev: kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2024-10-07"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "9140eed63adff50993d9eb7b0b82900db57dbc17"; - sha256 = "02rnb0pf6iwck9wmf9msp8dbwxpb2a5sgpsxw67dsq4dn34w6bjm"; + rev = "ee9a49ad838637cf8dd6db74aa22dd22f0d1b1a8"; + sha256 = "1ma3c3jgg9yfx24mw1iw0hd16afcl46xw94xvxfghrci24m64dni"; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; }; @@ -5620,12 +5632,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-10-02"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "62946f6d54c4a255d48b5de964aec034e1d07a1b"; - sha256 = "1w9whxcq8jp7xnmjp0k7bx9s67j6h24884s3alnjpqqqzwmldb3q"; + rev = "fbe0f3fec1fa2f8cf94d2b4a2f248a163ecf5c6d"; + sha256 = "1mj4xrnkjpgnpqk9cprs4r9ddy6m7dmzj0z7v32k3nff9dbkscqy"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5668,12 +5680,12 @@ final: prev: legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2024-10-04"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "71a8d41f18d931b47ed69879da832ce4fe33d647"; - sha256 = "086l1kbcwwcxxs9fbrwwh4591d7c1dwxn0n0ab560w9al8a8cwrw"; + rev = "192fbef32d1f7d70463c4c8a634c2a75adc41348"; + sha256 = "0grhj484513hrnmpr9wlvc6fa44lm3jr65cm50ymkza3qjnjnbcj"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -6087,12 +6099,12 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-09-10"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "e64351d0e6335eadf089aa2b9f17221e54ca10a4"; - sha256 = "0n8jmfg7rg23skdd4qlqyx78acww6ahskd3j6l5k2lvh5jlxjc4r"; + rev = "3c1af059348350b0bbb81c5ca3c1f8f573dbd64a"; + sha256 = "15y7bv8ywaihc1s0ifs5g8a6pcpdlqm4c15ahg8ygys2hnb4l5r7"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; @@ -6268,12 +6280,12 @@ final: prev: markview-nvim = buildVimPlugin { pname = "markview.nvim"; - version = "2024-10-07"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "markview.nvim"; - rev = "493c054c6463156f1c584cffe006b2fc9ed2d34c"; - sha256 = "0vag2lgibq4d8jmzvsf6c3hazpf4mvlr1pbjindpbaygcj063wz9"; + rev = "67b69cdaf9055bebac3682a070d7e5c8eecba29c"; + sha256 = "029ysnbnp5nl2jxgpg2q6zpm3ajk8yqxbnwqj42z3lcn3ylhcvsa"; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/markview.nvim/"; @@ -6641,12 +6653,12 @@ final: prev: mini-files = buildVimPlugin { pname = "mini.files"; - version = "2024-09-28"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.files"; - rev = "1b5ada9d3a0df36cfbf7f50a314646c0673b8c87"; - sha256 = "0hjsvp3lhby2qcl88bawykdvy4fplrh9gr81wjkmy47fiq9y2n9r"; + rev = "f5d06532a9b8cfff0f17226bf8ae7b15227ddb88"; + sha256 = "1j78i8bzkcnvxb7qvdgzfcnsmr1fp58niywdwlzwaja36kzjli3k"; }; meta.homepage = "https://github.com/echasnovski/mini.files/"; }; @@ -6677,12 +6689,12 @@ final: prev: mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "2024-10-03"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.hues"; - rev = "c54a85c68040640cc990d91762ea06ab3617abca"; - sha256 = "13cw0gp7isfx7rbw3kk9a075nizcp3szqqsc4hpm6mxlw5zb43ri"; + rev = "40d515229a7ed19c423bcfea8646f6e4354dcfc6"; + sha256 = "1v94yljlpwzbqa4g44n1wvc3hi5wyj6w7mvjx4qg954ak81yfv1j"; }; meta.homepage = "https://github.com/echasnovski/mini.hues/"; }; @@ -6773,24 +6785,24 @@ final: prev: mini-notify = buildVimPlugin { pname = "mini.notify"; - version = "2024-09-06"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.notify"; - rev = "1c901d62581439f3d17382a5bf7001a282d6468b"; - sha256 = "1vi3nsclkx9myglb0mxizhmzil02pglh96jf4291cblkgycs6zil"; + rev = "efec01f9e419642502421c3b1b1b8d7d627774c4"; + sha256 = "1gxpzzkzbc57aiwsgmb1hib2pb5vldis8csljs3hg3in11dj22hh"; }; meta.homepage = "https://github.com/echasnovski/mini.notify/"; }; mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-10-07"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "e52ac74bd4e9c0ce6a182ee551eb099236b5a89d"; - sha256 = "18kl8hlrkgywq6s9lz53fy4wyzh76j8wpyic12dxhm57clc6hkny"; + rev = "df1559e2ed7ece458e0a97a8bb9556d465d1c775"; + sha256 = "0sxv1hf423cnsp95lkfdhy6cj63f3c2az2pdpkycxnv41bjjla30"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -6809,12 +6821,12 @@ final: prev: mini-pairs = buildVimPlugin { pname = "mini.pairs"; - version = "2024-09-27"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.pairs"; - rev = "919a89ed3c9f4142215a44c9fffca72fa8c8e792"; - sha256 = "14dm1jch4fnj0a2q33ibznj4gx718984crn62a7gkp7fqfb5mw8d"; + rev = "7e834c5937d95364cc1740e20d673afe2d034cdb"; + sha256 = "04x3gwrg64xxbg0njrb64bjb66rpi2aayydfqx9nbcimllng3l9y"; }; meta.homepage = "https://github.com/echasnovski/mini.pairs/"; }; @@ -7001,12 +7013,12 @@ final: prev: modus-themes-nvim = buildVimPlugin { pname = "modus-themes.nvim"; - version = "2024-10-01"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "miikanissi"; repo = "modus-themes.nvim"; - rev = "24b34562a71cb75769411ca3146d35c093e7f4e6"; - sha256 = "1lg0y8ravnsk1swdx8k5668yrly6hlzs2jg9fl01x0b211xn5xx6"; + rev = "a702bfbc144344518dab9c4f474400293927ef35"; + sha256 = "1rvnljfr79bnl38g80n3xngn622xrcyizr2c0hi2r2za4382zsxy"; }; meta.homepage = "https://github.com/miikanissi/modus-themes.nvim/"; }; @@ -7025,12 +7037,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-10-05"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "f2e9ba9d229fbc847b7f19da68744954513aff11"; - sha256 = "13pp9dpbj0ndqzkdgvdsn6lf4633qd3a3n1lil42sk47s5g7vwqv"; + rev = "66ee5c0a0fbe3e014b867d04db44592f2d3eb30f"; + sha256 = "0k88b6ix8sqsnhm8z02jrphbkjzpimg1wx3jbqcmzlnm8i49nghs"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -7361,12 +7373,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-10-06"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "545b57d48d4bbc8f426aade4f2122c8296e9a0c0"; - sha256 = "1px6r6dj02p65wzwhrby0d0bvx81qikg61hj10xs29hbngz815ax"; + rev = "3a3ae3858ffe11abbd9dc24617cb81ae232a7df0"; + sha256 = "0g0l58sly3vv5sijrx5an8hpyvbjmska6c3fkjd2fl1z7ifmj0sd"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -7433,12 +7445,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-10-04"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "d55bf6114c6cfba013e4c0e817e29e7752554ab7"; - sha256 = "1bvzwmifvjl14p2vix8rxj50sp3yxj9yq3fx5gighhqyf4fvmals"; + rev = "bab8703a4d5406548ab7feb47efbabf023f5ae1a"; + sha256 = "06yhpj64vdha7c0mpgwgssinqrcxfdgw8lfx75r0pdcij6xms2ri"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -7700,24 +7712,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-10-07"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "08c0e81415971b37a41193e66f56344886d05fec"; - sha256 = "1sgfbj9d6p7bfk7az4jsz81kz7rs9izglccg5hwxhkp8d9mksycv"; + rev = "6b555ce43d3b9d29f484abf98ccb70e7597a50bb"; + sha256 = "02wrqp854na7k2rxr204ckwc4kvm1pxlsrxknpm60jqinm1fj3i0"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-10-06"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "b880a7dacd78425965fc7b70c39a56ddea2e31c1"; - sha256 = "0216mfpgk8qrq374d1grh8442ddjickhy1814snm993l6q8xpybi"; + rev = "800393067cf97b0f20eb0a3e61506cc6ffc76128"; + sha256 = "0765v6l9asinbzpynlqcm0abp1f20af934810i8rpsnx2z46wkmw"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -7820,12 +7832,12 @@ final: prev: neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2024-04-08"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "0418811e1e3499b2501593f2e131d02f5e6823d4"; - sha256 = "1ffa0in8zvw6fc9lwga67s9gjqmvn1a69i3wpajrslf2d0ngmw3y"; + rev = "f2e0b3713d3559ce33be9aa32ace3a6051ec5593"; + sha256 = "1nm03cb1vwak6qc3l9f3zj51iabsz6bh3x9sip5jy88rfxpxgp6l"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -8096,12 +8108,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2024-10-03"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "bfa30195eecde4f0e2d30ab8b7013ed8aa637208"; - sha256 = "1f0rd3zac6kh1qf7i2gbrhx3cn9a02g0yz0m6iv42291i4rp6ypb"; + rev = "941dd4b9d8c9420968dfdef0675f120965f7d637"; + sha256 = "099mql8lw6xbvdvdqbg0ks2l0z1xy4k895kc8cl0bl89970r5908"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -8168,12 +8180,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-10-01"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "0e0a940477cc08fa7b1799384a1d668058ed4e61"; - sha256 = "1z5crc8zjiv6p41b15pk83nvsmibl6fshyki3zn05lx1bbny80yx"; + rev = "6bdd9b3364e12ffb346ac224db3df37de0b1429b"; + sha256 = "145jzbjsx10dl4n9ni7p0ggcnhjwbz5fs6ksyrq73h9f0h6vcfxw"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -8264,12 +8276,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-10-07"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "a69f893e49ee36d4c74431044b40f08042c396a2"; - sha256 = "0h5fiml0gsiigfyvfw3w700bnj01bx0xj4nlf06b26xknzbb9azp"; + rev = "f6025f0788880989484733c90deff07dff01ef02"; + sha256 = "0y7pi4czifx7di9j8msd8nicqvn6scd4vysg7zbrxpkavzzg09jy"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -8528,24 +8540,24 @@ final: prev: nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2024-09-08"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "db72bf6ab9f75fe841e8e11e772ee7fef6f484f1"; - sha256 = "1m2bs71l4wdk6kippwkmsvw4978qcqh8lnkx7h9sa82l87wb76mp"; + rev = "03fe9592409236b9121c03b66a682dfca15a5cac"; + sha256 = "0d72nmrvy070x5cmx9xh0bmrj1hayccs347l30cajfrzajj4bmnr"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; nvim-dap-rego = buildVimPlugin { pname = "nvim-dap-rego"; - version = "2024-10-05"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "rinx"; repo = "nvim-dap-rego"; - rev = "7316f3fa47266dbb28a82f77a0e1e9adc83ab4a3"; - sha256 = "10v0ixp27anjnwbdjqabwgir2jnlhbg90db8wc9a27099a25kwa3"; + rev = "ae2d30780a3beae563ccb5f14eafa5be563af5a3"; + sha256 = "056jby3plfjrmr7dl0rn4d22rk57q5qx56kxgfs2x1amwisx2fsh"; }; meta.homepage = "https://github.com/rinx/nvim-dap-rego/"; }; @@ -8696,12 +8708,12 @@ final: prev: nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-09-04"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "0dd4a4ab5892b02661ad18ceb9071428c3391a89"; - sha256 = "0rn2crlih3wmxpq0c0c9j1cksvlzn687wx8v88jdn5a643jbaxvp"; + rev = "f1d7665d8eb8aebf67effed7f80452c418defad0"; + sha256 = "0fh7zq1mall399bf11b7zlr07jy23694d4rcl7nz3cn73fhh7zwj"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -8815,12 +8827,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-10-03"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "27f44d1cc3d733a38a736acb902f94879d99c76c"; - sha256 = "02632rx9sn954ds17wb30lznaqnf2cfsdl9a0vnj7zig4q0yss73"; + rev = "f707b3ae50417067fa63fdfe179b0bff6b380da1"; + sha256 = "0zws4m0jcprpn0d0ny2k6pvkmca917wjbqwk13g1p8rp87ia5yy1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -8851,12 +8863,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-10-07"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "04680101ff79e99b4e33a4386ec27cbd0d360c75"; - sha256 = "1qv90xhs7i9mqh66kar7awjz1vhnn12i3fc1sbjck50gqsy3131b"; + rev = "d141895d1d9f41048fff201d62a2d6e96d299e32"; + sha256 = "1f55f69xn6nd0n7j6bb9s21q4ymglhskclds679w2i843j8mfhfq"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -9031,12 +9043,12 @@ final: prev: nvim-paredit = buildVimPlugin { pname = "nvim-paredit"; - version = "2024-07-11"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "julienvincent"; repo = "nvim-paredit"; - rev = "dd851b3a17e393b6837c26ee14fc96db9ffdef82"; - sha256 = "084vc5rfqa8k9ir5pd5rwfssmkq8yi2ndg3gr8mj2fylr14lp9z7"; + rev = "b3e69d234f6d64bd4c3a0c60d92833d945f0df66"; + sha256 = "18vag3gvamgyawzadwgz3n9a8d2lzcahjbqp9f28i9l5wyqv6hwn"; }; meta.homepage = "https://github.com/julienvincent/nvim-paredit/"; }; @@ -9103,12 +9115,12 @@ final: prev: nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "2024-10-02"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "144154d012b8352827363cdb58b1bb57a9a60294"; - sha256 = "0xb3dcmv193bgw7rg9zpm431myy4gnx4nrfqcrjgqa2vkkv3q93s"; + rev = "dd0ad18f207998ce08355ccefaa332376257552a"; + sha256 = "19az20g2jr2vvmkcadsdpppcn1fbsvi1dhg3lyq02a67s9525ln4"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; }; @@ -9127,12 +9139,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-10-01"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "b0febf803081dab602649e72b7f6685683c88a3b"; - sha256 = "1sr76silz6mg5v6zjqri7yylawhn84mysx1vc417lcmki9ciys52"; + rev = "99034ef77e910c650d024b6e36ea59938c0bdafc"; + sha256 = "0qvsa351msyg2nk6qxg1kpw5v0iyvhyc3ibk0aj5n3x1xr2ly76r"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -9271,24 +9283,24 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-10-07"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "010ae0365aafd6275c478d932515d2e8e897b7bb"; - sha256 = "0dsg3c3n79vhmcfg5ng6hrxbkhskgxsap5b444wsksy6xdi0304h"; + rev = "1c9553a19f70df3dcb171546a3d5e034531ef093"; + sha256 = "0zcjngykbgv6chchh8x6qqgyyd8blsi0179k0l9a21x25hmjmc5a"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-10-07"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "45e0d66246f31306d890b91301993fa1623e79f1"; - sha256 = "1dpfzs118rv5717i81y9cibxqqy0x6xy98r93xcnkba75yyn0qbi"; + rev = "5a2ff8b7ca5470b1011ed82ef3fdd53139ffc467"; + sha256 = "1ckvcspjjnlash61lsjgs9rrxnqlinz9vxm9hlqx0v0sc0qym4z4"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -9427,12 +9439,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-10-04"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "56f17def81478e406e3a8ec4aa727558e79786f3"; - sha256 = "1855li3b7j64w1m1jxqxxdsdf0m6vs8migddhkrfkz6nmm1f3lfq"; + rev = "19d257cf889f79f4022163c3fbb5e08639077bd8"; + sha256 = "0rwlikjvc469fkmpn980abvk27dyf23azamac7iz2wchkwx88ia9"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -9547,12 +9559,12 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-10-03"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "29d4ed4463ce4f487a3d4d0b5a649ab943e62fae"; - sha256 = "0m5wq6czs0vscq207qinxyh2v0msxqkn3y9s2sg7spmb47mims2h"; + rev = "c8f503b38a6bcef5b658678136f03d7483683a71"; + sha256 = "1km2wf3zjfmy6ddw0pk745y5fc6zsk0gwnp9f7j14qh8hljbglyy"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -9740,12 +9752,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-09-25"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "8ead368a78c7e1df0c15432dfb41d95dd4365f5c"; - sha256 = "1pmdzgb23d3hynaszmdh3fkdgsfbav84vazg7amj4fy372m8dcsa"; + rev = "a5aeb14663ef08e0bb4bb847f8d79f9c253094a0"; + sha256 = "0hwplx3dj7mn95cqhj9hrc9dl2q211ib8hlz3fn4771bsadabxzh"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -10078,12 +10090,12 @@ final: prev: precognition-nvim = buildVimPlugin { pname = "precognition.nvim"; - version = "2024-08-13"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "tris203"; repo = "precognition.nvim"; - rev = "8a81c310b4e76b4884fc5350a5741cf683c645c7"; - sha256 = "1x6h94jcpyqdqg5ranrmsp2di4lh8kchi03bp80600r54f5sgqf3"; + rev = "35c402c19a10e524d5378c9c0a5151ff5d847b06"; + sha256 = "1sq7ahnj9kj0cijr8jb4shr226rv65a3gdcnrv10glf9kisbpk6i"; }; meta.homepage = "https://github.com/tris203/precognition.nvim/"; }; @@ -10186,12 +10198,12 @@ final: prev: pum-vim = buildVimPlugin { pname = "pum.vim"; - version = "2024-10-05"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "pum.vim"; - rev = "5997cfc3b7941bde582aab276ff82e9a5f43db66"; - sha256 = "0szsqlx6hinwamrc36ha8p4x9kg5wbg7b28mbj7ynwbncjfbnini"; + rev = "b2ca20dedf32b80dd0cbd654770ec3f70841be68"; + sha256 = "1qq0ha1r3yl4m94p83lcy0lrjazajcpnsd2v9rd9y74mznbh93f1"; }; meta.homepage = "https://github.com/Shougo/pum.vim/"; }; @@ -10259,12 +10271,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2024-07-09"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "eed598983fa4040eed77191f69462c1348770b8a"; - sha256 = "0za72ishz4gbc43887r18n7qlzayx05i5apfix1v77pn0c8fwwnr"; + rev = "23083a0152799ca7263ac9ae53d768d4dd93d24e"; + sha256 = "0mamwyjgb1l4bvy741ixqyzr4ggjhzh4nsqr6rdb22p98g465r15"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -10474,12 +10486,12 @@ final: prev: render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "2024-10-04"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "fe1002fddc61207e4ef4325d4bc0ca33697bbc7a"; - sha256 = "1srxz1916qbbgaf2xxp29sdvjib9j4kfqjr7qb0grddk7s5hrywz"; + rev = "e13ac2c05d2f081453db1451ec07fbd8be33ceec"; + sha256 = "1zl4y51wqh7y31kl8082nihy3dqr7l8mdak2a5l9yhl4hpaydp3f"; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; }; @@ -10510,12 +10522,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-09-30"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "3a7eecb442d9c02538cc99f76c611ba4912654a3"; - sha256 = "0g93hk677l092mcsxmdihn51ahqkzgahw3gy623hv5sj8rpqjbld"; + rev = "113dce7749eb22b84cbde052d1cdc1f70702ed58"; + sha256 = "0cjck6c2qpa13rll3n1i0a97kpzlzpmk93nl2c4lvgplc3xp6zkf"; fetchSubmodules = true; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; @@ -10703,12 +10715,12 @@ final: prev: scss-syntax-vim = buildVimPlugin { pname = "scss-syntax.vim"; - version = "2019-06-30"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "cakebaker"; repo = "scss-syntax.vim"; - rev = "bda22a93d1dcfcb8ee13be1988560d9bb5bd0fef"; - sha256 = "0p6yy6d7lwi87rvk4c6b2ggrvpddrfksrgdwz993gvxxxbnpwi8q"; + rev = "a6515bad76259f34d885d1f54cdd82c1dd98d91a"; + sha256 = "1na3x1n24xpybw4v7mi25pwfk18nm27kp7iywprdh7x6y6sx0czk"; }; meta.homepage = "https://github.com/cakebaker/scss-syntax.vim/"; }; @@ -10872,12 +10884,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-10-04"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "0523920a07c54eea7610f342ca8c1bddbee4b626"; - sha256 = "1cccikkr5gvxv0ml23la4gsma6nyanr1a0h00mx949cwjl9q9m4s"; + rev = "70f9e4f36082bf28b8bc1d05e2ea7c3f6aeb51ff"; + sha256 = "1rkwqh6nnf9fv2s1g4fbwsqb6jydkr5zspb60sy1bs1y4maj3lv2"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -11233,12 +11245,12 @@ final: prev: stay-centered-nvim = buildVimPlugin { pname = "stay-centered.nvim"; - version = "2024-10-01"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "arnamak"; repo = "stay-centered.nvim"; - rev = "09fc8a4f0f20b0dc8b5c4310af2e970665332ae0"; - sha256 = "16dnmzp3vs4km7lzykgmmq2syyjvswh3zydyj1hyfzcd1syajbgh"; + rev = "c28430fe49615680587458914070d7bd1d8782cc"; + sha256 = "0gwvvzw4vv6v7r9bzfvzj7lkvhx64hsb3nn8vp12jsl3g5rqxrvm"; }; meta.homepage = "https://github.com/arnamak/stay-centered.nvim/"; }; @@ -11777,12 +11789,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-10-06"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "19dfbb91ba74755e5e348805d1a96ea5a3dec86a"; - sha256 = "0a06xb9fq6b65rv3c1zvq37k1rb9x7crr9g4bcmlqjqzqvp3yiqw"; + rev = "b04d358d3c1bf65e1a3b10812c4f0a9f57fb6fc0"; + sha256 = "02b91csvggcw5yln87kbbx7jl7j9h0dl8rd0nlqw77ds0345yvbi"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -11934,12 +11946,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-10-06"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "dc6fc321a5ba076697cca89c9d7ea43153276d81"; - sha256 = "0jknzk7fi5w05zwl7l5yymgn80nb6sdlqmmkiqzrqn2808aaa4bf"; + rev = "df534c3042572fb958586facd02841e10186707c"; + sha256 = "0a82h051ymnbkzxsz21f454fbk5qq26fhxk4h42jby6vgy7myqqx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -12476,12 +12488,12 @@ final: prev: ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-09-13"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "ff21db642847840db183b9421ab3d89795a7fbba"; - sha256 = "0rkxfmacwwpzifpnqfbizla425b7gfay0jfgw84bfidspvc33vab"; + rev = "9e3209190c22953566ae4e6436ad2b4ff4dabb95"; + sha256 = "0xchw704s2wy0p4f1v8gmrbh2z4n9l1k0dl6f9zgjkzrvi0pnw13"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; @@ -12524,12 +12536,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-10-06"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "ff47921b96796cef9db2782a541ffd40a893c126"; - sha256 = "1hx5y68f6d2738bzqj2byz8cqdz61pyqjkpqx64c5bcpx5y4bxrf"; + rev = "e2c42cac45a77b5548ddcec57eb79b6996659d2a"; + sha256 = "1cjg9plvwq00plynk7k993rbg65zdwgmyv0jvl824wa3inh0fv7w"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -12632,12 +12644,12 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-09-11"; + version = "2024-10-09"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "b1fe33e532aa360203e8015a557ba79dd38e07e4"; - sha256 = "0gwcn7r43143k95k5gzni6g9gj20kf5k4yy0gax8kdmdfc6660k1"; + rev = "785866e76397fafb7bce1f9bd0eb925aa29151aa"; + sha256 = "0j02065ayciz0qnqh5a9h2lka9w20ijjsnlbs8hpcv944ynls1r8"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -13148,12 +13160,12 @@ final: prev: vim-autoformat = buildVimPlugin { pname = "vim-autoformat"; - version = "2024-02-07"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "38a01acb7471d276ecf5970ab4fd58bfebb9ea06"; - sha256 = "1f9cppm7x0vyxcch256lm0m7k2wj3njpp62b9xlphw8cwyqx45dp"; + rev = "9a8e716e457b9d95447e054435ebdae5943cab8c"; + sha256 = "14iw5iab12axwdr2vdsnsgp77br1z2y2r229ihmsnlll4i645nx0"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -14072,12 +14084,12 @@ final: prev: vim-eunuch = buildVimPlugin { pname = "vim-eunuch"; - version = "2024-02-04"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "8fb3904be27b6b60d086f87c2570085902414069"; - sha256 = "1icir4spx0hj4zp2ps26v9q2jgbqi9fw4anhn6k48n8ahgvim614"; + rev = "0dcadd30d3a406e9c7572a3a91cbb791662fc196"; + sha256 = "1yf72ysjrz9qmiwr8006j62lawbdfyy3zjk61arq9gd01s04ygx4"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -15455,12 +15467,12 @@ final: prev: vim-matchtag = buildVimPlugin { pname = "vim-matchtag"; - version = "2022-06-24"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "leafOfTree"; repo = "vim-matchtag"; - rev = "54357c00979e07d86aa12b383ddd1d6a7fbda2c2"; - sha256 = "01ar9qma2glb6wyhpafnwpf1f63v9i417hx1dzck1gi4fcz1pfqa"; + rev = "008aee75e4003cb11cf7eea800c849182693275b"; + sha256 = "0a17nw3f3jl599d6i6jbga11mmlayqbm65dr2gjw4a88z2djkvsj"; }; meta.homepage = "https://github.com/leafOfTree/vim-matchtag/"; }; @@ -16211,12 +16223,12 @@ final: prev: vim-projectionist = buildVimPlugin { pname = "vim-projectionist"; - version = "2024-06-22"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "3736bd4a5f23b30821cbb892385bb1f1b0088cfc"; - sha256 = "0q5jly140pjf9z6cc2n8g833glwpal07lrvkcq9ay3gn9pznpjwy"; + rev = "104394c31ead4b09fbf0e16f9d367e3e179ee50a"; + sha256 = "0g5xwzp5wixk2f6a4325jpz1hg7m0jv3klkdglv1qz23ffgdznbh"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -16847,12 +16859,12 @@ final: prev: vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2024-10-03"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "612b5c42ff2d33c0d044da0affa54f9edba22b64"; - sha256 = "11kpwy4f4j19waxq3n83iaalr678nn9a6qk9bsvsz1g6wbc0p8sc"; + rev = "11f7c6d26baf79a29ac8d2321810a5e3f7a45397"; + sha256 = "10wkfiqg4ccl671j8wc1kghck0jah7b74l4i648ybjly00ikybbh"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; @@ -17039,12 +17051,12 @@ final: prev: vim-teal = buildVimPlugin { pname = "vim-teal"; - version = "2024-06-19"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "teal-language"; repo = "vim-teal"; - rev = "912602f9fab602234a55ad8b0f5f590f657d3e66"; - sha256 = "0lqr6ss3pvsd9q3w88vy3qf456939crddv17jhc1ynib90ngb59c"; + rev = "a82ffa437a6a146d28da1c24356995155ebeb6a5"; + sha256 = "00hh8lqjvbv6rcfb2wlgifk4sznxcxcs3sjqdlpxhk3m9hhl4g10"; }; meta.homepage = "https://github.com/teal-language/vim-teal/"; }; @@ -17448,12 +17460,12 @@ final: prev: vim-vp4 = buildVimPlugin { pname = "vim-vp4"; - version = "2022-06-06"; + version = "2024-10-11"; src = fetchFromGitHub { owner = "ngemily"; repo = "vim-vp4"; - rev = "c08df4fa9639949c339cbac7835b67288aad63ae"; - sha256 = "1sr75a4rgcgfqxh5ipivpks4y2nzzdxybijawgqyjn1i110iy502"; + rev = "7e958ba378b24981b90edd4c56b6d2c3ce20b558"; + sha256 = "0hlg5akv512fw7az8inbd2z67vmhiqmaz1i818k4kc73jxl2h5h7"; }; meta.homepage = "https://github.com/ngemily/vim-vp4/"; }; @@ -17724,12 +17736,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2024-10-06"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "39a045585efa47f34307834cfe2d978f4f87a73b"; - sha256 = "07z3fzlikg2sn0isx9wlvih7vvnhn1iiklqv9nxaqcszj20wvf7i"; + rev = "831b4b9149f02b329de029e7486ecd0721e13192"; + sha256 = "0387dsl6yawx6bfn9s0g7q1mhi37b4zwy9z9c3b5s08nsa6lvn7q"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -17832,12 +17844,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2024-09-27"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "8d497913d4fc311cc6884889eb4aed062ef9c177"; - sha256 = "170kqy9ndqs656ccrjna8ygpcgz55app8bqbkm288spvcnacs9lr"; + rev = "ecb4669e5641abc3099b5a0b907f15ba3ceabd02"; + sha256 = "1czc5li3rrd2zl2bjh54c0alpmgnl309kdp8z4ynl0g0ga9lp896"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -17845,12 +17857,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-10-03"; + version = "2024-10-12"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "fcbaf66887bd19f5d973406848cf2a5ac46bd65e"; - sha256 = "0r24jlb2qh45ai7fhk7a3k4jhgv0r01sjm6w2hm1ky40ycl5xw6g"; + rev = "a4db0ee3271f58a08596ba853ea1e167f41ff9d6"; + sha256 = "1zxn6ciqbxyvzcqjk9wfa3nayygma6v7nm16s9jbhjscp340vwf8"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -18218,12 +18230,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2024-10-06"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "55e66733a7d05e761f97fa11589f569233be6616"; - sha256 = "1bng3j8mm0mx9pq0kf4v5vlvnm9bz5a9j1jynin30c46kagn24fx"; + rev = "d7513472d66d2adc5698d7f791347ead36b4988b"; + sha256 = "061rb6v5yas9avp4w00sx6hsf1rlprxcvxb9fcla6729b4wkdi0c"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; @@ -18446,12 +18458,12 @@ final: prev: gbprod-nord = buildVimPlugin { pname = "gbprod-nord"; - version = "2024-10-03"; + version = "2024-10-10"; src = fetchFromGitHub { owner = "gbprod"; repo = "nord.nvim"; - rev = "33a928133fd031b9714cb390645b5b01a900d9f9"; - sha256 = "03zxdh9b5bjx3apz884diai8gb2xmngb706qrwmpmgnf33bfr0xp"; + rev = "4cc19936b1b57ba08eb461c5f450b3976cbb8e0c"; + sha256 = "1k09fv0cb8xaa6z1fz6l58cdzgz4wfnfhv32dw3y395gr69a9sra"; }; meta.homepage = "https://github.com/gbprod/nord.nvim/"; }; @@ -18518,12 +18530,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-10-07"; + version = "2024-10-13"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "da65abac6649a239a8fb89e2f2ad6262bcd0ac63"; - sha256 = "063qfs233jyjjdqaxg5025q4ycz3ak9mv0q6kzks8wj0zclf4ayf"; + rev = "22f5777a521891a1b15849b38097a336eeef7ac9"; + sha256 = "02yi3rcrvr9dj8j1nhs7v2v444rg7lap2k13c439ffhip1shmsl1"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -18566,12 +18578,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-08-25"; + version = "2024-10-08"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "8b1fd252255a7f2c41b4192a787ab62660b29f72"; - sha256 = "0djiabbm8c9kxwaz2awb5a9a20qiy5xap9r9prwiak4apk96v299"; + rev = "d396005db5bbd1d4ec7772a7c96c96f4c4802328"; + sha256 = "1ahcvljrk073mwr2ipmlf3gd2k7gp1n6g921q2s2v4i0136v2lyr"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -18624,17 +18636,5 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; - cmp-nixpkgs-maintainers = buildVimPlugin { - pname = "cmp-nixpkgs-maintainers"; - version = "2024-10-12"; - src = fetchFromGitHub { - owner = "GaetanLepage"; - repo = "cmp-nixpkgs-maintainers"; - rev = "da6a5050bc6be7a55c333d0009ae87d909e30b3f"; - sha256 = "sha256-z/k7lC2tZvll+BlXoj5N7EwOGN3f3Lu4gT6YWocCL8c="; - }; - meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/"; - }; - } diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index c95199d6ee68..986924a1a43f 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -38,12 +38,12 @@ }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=943a3eb"; + version = "0.0.0+rev=46d4a12"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "943a3eb7f55733929ccafe06841087c3004cb4e0"; - hash = "sha256-eTdNxvK3vcC7MiE5g0DgptuChYs7fv+WjEmxhwmUI4U="; + rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074"; + hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -259,12 +259,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=69d7a8b"; + version = "0.0.0+rev=f2569dd"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "69d7a8b0f7493b0dbb07d54e8fea96c5421e8a71"; - hash = "sha256-WyWKf/cqMPClo8xwech3xm4if4Tu9TwA9YstBIEjkoI="; + rev = "f2569dd1fce0f252097a25bcbcb9ed8898840310"; + hash = "sha256-LegfQzHPF85Fa3x2T79fCNLIK9/iUbE+gsqvanfGye8="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -526,12 +526,12 @@ }; editorconfig = buildGrammar { language = "editorconfig"; - version = "0.0.0+rev=a761198"; + version = "0.0.0+rev=efbe0b2"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-editorconfig"; - rev = "a761198025448c77ea11bcf22505b395a77fc0d0"; - hash = "sha256-KuaXFJGp1kxn0hqssiAFYL36zb0HY22warBb/40Ftzg="; + rev = "efbe0b2f2eaa248e8c657a80a8c2305056bda477"; + hash = "sha256-PUDL81jk8WllJSpnGXGl2wiIgMlsbLuzEdBLf1zbMCk="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig"; }; @@ -1441,12 +1441,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=ec98567"; + version = "0.0.0+rev=76f53c4"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "ec985672ff21f7fd7f835869d8021e8f87304bb4"; - hash = "sha256-ThttqJxC3yaGufY2H9H5KgUu2bSTp+BKInyi0vucrS8="; + rev = "76f53c48d29e8588934fb55b0240d7bdfe00bfe5"; + hash = "sha256-EBySJmzXH0FoWcslHNs70N9e9K9O/4/RcpbcdWYmgI4="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1552,12 +1552,12 @@ }; llvm = buildGrammar { language = "llvm"; - version = "0.0.0+rev=1b96e58"; + version = "0.0.0+rev=c14cb83"; src = fetchFromGitHub { owner = "benwilliamgraham"; repo = "tree-sitter-llvm"; - rev = "1b96e58faf558ce057d4dc664b904528aee743cb"; - hash = "sha256-9OCiD7Hotl7EYoggX0lArwFvK2OZisBUsX7xv8+Ig+o="; + rev = "c14cb839003348692158b845db9edda201374548"; + hash = "sha256-L3XwPhvwIR/mUbugMbaHS9dXyhO7bApv/gdlxQ+2Bbo="; }; meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm"; }; @@ -1686,23 +1686,23 @@ }; meson = buildGrammar { language = "meson"; - version = "0.0.0+rev=bd17c82"; + version = "0.0.0+rev=c5fffb8"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; - rev = "bd17c824196ce70800f64ad39cfddd1b17acc13f"; - hash = "sha256-+RqhCA+WoE2Lnk9vGiAYcdvl+ovxX5kaJhQ8m9H/fvo="; + rev = "c5fffb8edd39f22644084ab3f73a924a75721ee3"; + hash = "sha256-Q+5sCO+1CAbnaE7nq7vl/CxUpydxEHVtmPXIAUGJiOE="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=ccf732d"; + version = "0.0.0+rev=0238b7f"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "ccf732d3dbe6ca415a29b9be887c783111b297c7"; - hash = "sha256-liYapDXD8R2nLHaDvynKAYvIfJPrXITVsn8IA/snclU="; + rev = "0238b7fb6a630f77b3fc8b8a48285ef6ed45cbcc"; + hash = "sha256-rQDkvs/z+sunTlcquHLMN6wmsCP3RRT6vcnSqxNNo+0="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; @@ -1786,12 +1786,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=9ef77ce"; + version = "0.0.0+rev=456b14a"; src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; - rev = "9ef77ceefff61d31a63133d8d697f219ab62c841"; - hash = "sha256-hBdruZbMKoPtcsoaMAVKsLJZree4WBiifRNCdzJLJUs="; + rev = "456b14a2fa6315abc7e02fcffaf4a1f35d4955d3"; + hash = "sha256-eY+e48XFHvTRlew4LvndGHQog3d/RKDLlIrGr7QOWBY="; }; meta.homepage = "https://github.com/cstrahan/tree-sitter-nix"; }; @@ -1932,12 +1932,12 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=81c57e2"; + version = "0.0.0+rev=76ab9a5"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "81c57e274c541c30d6c204c8dbceb90ec647ed8d"; - hash = "sha256-xtsLJx9tzj3KNhlCDuXnAGBz3EYnJ/J+EJ0UKHVN4g4="; + rev = "76ab9a52b9dd2a1758aae3da8286519d995037e9"; + hash = "sha256-w45JH2sFLgnzk7ECfWTFvz2QIpkhFKxvZ/LiZT0HzzQ="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; @@ -1967,23 +1967,23 @@ }; phpdoc = buildGrammar { language = "phpdoc"; - version = "0.0.0+rev=df5e7da"; + version = "0.0.0+rev=fe3202e"; src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; - rev = "df5e7da4b83da072f99135079ac3436550b8d67d"; - hash = "sha256-LIqu5+DaybdxY57IPwVACtgrGTiCXIiIIqUK45ISzYw="; + rev = "fe3202e468bc17332bec8969f2b50ff1f1da3a46"; + hash = "sha256-sQ8jmVvZD0fIc9qlfyl6MaXvP/2ljzViKIl9RgVOJqw="; }; meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc"; }; pioasm = buildGrammar { language = "pioasm"; - version = "0.0.0+rev=924aada"; + version = "0.0.0+rev=afece58"; src = fetchFromGitHub { owner = "leo60228"; repo = "tree-sitter-pioasm"; - rev = "924aadaf5dea2a6074d72027b064f939acf32e20"; - hash = "sha256-og5DjoyTtKUTp0V4/PpcGb8xwzLeidsb2lq0+QF7u9M="; + rev = "afece58efdb30440bddd151ef1347fa8d6f744a9"; + hash = "sha256-rUuolF/jPJGiqunD6SLUJ0x/MTIJ+mJ1QSBCasUw5T8="; }; meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm"; }; @@ -2499,12 +2499,12 @@ }; sflog = buildGrammar { language = "sflog"; - version = "0.0.0+rev=943a3eb"; + version = "0.0.0+rev=46d4a12"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "943a3eb7f55733929ccafe06841087c3004cb4e0"; - hash = "sha256-eTdNxvK3vcC7MiE5g0DgptuChYs7fv+WjEmxhwmUI4U="; + rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074"; + hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY="; }; location = "sflog"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2577,24 +2577,24 @@ }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=943a3eb"; + version = "0.0.0+rev=46d4a12"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "943a3eb7f55733929ccafe06841087c3004cb4e0"; - hash = "sha256-eTdNxvK3vcC7MiE5g0DgptuChYs7fv+WjEmxhwmUI4U="; + rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074"; + hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=943a3eb"; + version = "0.0.0+rev=46d4a12"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "943a3eb7f55733929ccafe06841087c3004cb4e0"; - hash = "sha256-eTdNxvK3vcC7MiE5g0DgptuChYs7fv+WjEmxhwmUI4U="; + rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074"; + hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2700,12 +2700,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=b684bbe"; + version = "0.0.0+rev=36f37aa"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "b684bbe28ecd740a7110ead5674355770186ca9c"; - hash = "sha256-9Aw51LvTIBzptXuW3rEco/wTOdSADEhWJ/sI9OHr854="; + rev = "36f37aa5aa440805f27d4a9f5203e616a303c6a1"; + hash = "sha256-oegEpBCk7Fhx4SbXebBq33b7Ef9XshYfx2SciaKwINY="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -2734,12 +2734,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=1466855"; + version = "0.0.0+rev=a6ec57a"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "14668554259c5a82fc0c8ca825aa3bb895034c67"; - hash = "sha256-+coXjHJSa5jKOx3DE4zD4Crqp8NWn8jcsrK/eEgZQtk="; + rev = "a6ec57ad4d12c68d952ba1f869bd373a7ac95832"; + hash = "sha256-mdBrUgq8uux7p/DEm4jBNtB5a4UFDTrNRXX4hexKN7s="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2801,12 +2801,12 @@ }; tact = buildGrammar { language = "tact"; - version = "0.0.0+rev=09c57b6"; + version = "0.0.0+rev=83e2649"; src = fetchFromGitHub { owner = "tact-lang"; repo = "tree-sitter-tact"; - rev = "09c57b6b9759560b4d067e0546c9953ee0e065da"; - hash = "sha256-WyCBuWPTYzNEApxtACTNt7StYoaSXIR9oqrOUlIquOY="; + rev = "83e264928fa194b7283428527259e88e54205264"; + hash = "sha256-gSLVUjn8MBRDQhZoEsPGao2lZI1gcxJsg6d8suA4D50="; }; meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; }; @@ -2823,12 +2823,12 @@ }; teal = buildGrammar { language = "teal"; - version = "0.0.0+rev=19b02da"; + version = "0.0.0+rev=485fbdc"; src = fetchFromGitHub { owner = "euclidianAce"; repo = "tree-sitter-teal"; - rev = "19b02da829d1721a521bf7b802eb80a50bd53aab"; - hash = "sha256-xIws9Q8AsaIowv6nc01ZpF87Dy8rL78EoZgXuBmg6Kg="; + rev = "485fbdc00d811b01b2090dff4d0469fd1d0350f5"; + hash = "sha256-Py825x38vkRgHqqEg/btFVQMgalSdonEgtFKSLPlZdw="; }; generate = true; meta.homepage = "https://github.com/euclidianAce/tree-sitter-teal"; @@ -3082,12 +3082,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=bc5b3ca"; + version = "0.0.0+rev=ea53875"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "bc5b3caa85f7a8d4597f51aeaf92b83162ed6b33"; - hash = "sha256-44WUptfNjp4hsHa3BQLdzjRIiCyppzNNOqoqU/rJGNA="; + rev = "ea538758a1273b59774dc9179cde460d9c73fd89"; + hash = "sha256-r2Mn7hvMjMYp+jvceGHNT0ss4UzoOjLeqN+DFj/mB0U="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3127,12 +3127,12 @@ }; vhdl = buildGrammar { language = "vhdl"; - version = "0.0.0+rev=3f13cd1"; + version = "0.0.0+rev=d6e8301"; src = fetchFromGitHub { owner = "jpt13653903"; repo = "tree-sitter-vhdl"; - rev = "3f13cd14952b39ccf6817f58880834b84565ca54"; - hash = "sha256-bChHzBGWlfJpSUpUqQW8L1y4CiM1Qqen3MaGcUT9lh0="; + rev = "d6e8301999336b47d663052d43f983c3edeb01dd"; + hash = "sha256-vQIsWcmm5szh7L8iSDDHenSJDqJrXcTDn0A/0WJYWGc="; }; meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; }; diff --git a/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix b/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix index af1e8c3df0f3..3020dc31b76e 100644 --- a/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix +++ b/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "Millet"; publisher = "azdavis"; - version = "0.13.5"; - hash = "sha256-sWM7N+axgu1zOGWexR4JVupVmYhZrd4cZz3pmLxRj8Q="; + version = "0.14.7"; + hash = "sha256-+PrGTeov5lTP1SgB6E0E40QHXfX+/vhm2DzW6DJB1/A="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index a660ee2a5d83..170d6a3d1dd4 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ { requireFile, callPackage }: callPackage ./runtime-build.nix rec { - version = "20.5.332"; + version = "20.5.370"; eulaDate = "2021-10-13"; src = requireFile { name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz"; - hash = "sha256-ZqbLCWfPUo0fXS9liKOXsUEpm1d60bHIkbx+K98gFtU="; + hash = "sha256-QwPCU7E5yoJvWsiRUMBSAhEJYckbFTrQa1S4fto8dy0="; url = "https://www.sidefx.com/download/daily-builds/?production=true"; }; } diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 683b45ccbf21..51a7b72223cd 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -127,7 +127,7 @@ in buildFHSEnv { libselinux # Winetricks - fribidi + fribidi pango ] ++ xorgDeps pkgs ++ gstreamerDeps pkgs ++ extraLibraries pkgs; diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 4ad51e4a7dac..58aae6450ed0 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "mediaelch"; - version = "2.10.6"; + version = "2.12.0"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - hash = "sha256-qc7HaCMAmALY9MoIKmaCWF0cnwBBFDAXwqiBzwzu2bU="; + hash = "sha256-m2d4lnyD8HhhqovMdeG36dMK+4kJA7rlPHE2tlhfevo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/hy/hydra/package.nix b/pkgs/by-name/hy/hydra/package.nix index 343d7d0a75af..42ebcc581caf 100644 --- a/pkgs/by-name/hy/hydra/package.nix +++ b/pkgs/by-name/hy/hydra/package.nix @@ -124,13 +124,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hydra"; - version = "0-unstable-2024-09-24"; + version = "0-unstable-2024-10-08"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "95003f2eb503f71979856470c7caea946f1ae7f0"; - hash = "sha256-6FI0QIkMAL35J8mzAiAntCsFbMMZBuOBpKuDIctflaA="; + rev = "c69e30122bf7e7a7d3de70dc2418263c6e44159b"; + hash = "sha256-khkY1GG43/VUBt6g7Egt0Zz0V/rXxnDUpOLtanFum7Y="; }; buildInputs = [ diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 4d1a69a3b0be..5d9e6f1b2125 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -53,13 +53,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.75.2"; + version = "1.76"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-olMlYzde97RSx0OmDULSOFlM3imUq3AVxQdXyYBPd3Q="; + hash = "sha256-0zV9aZIfNnbV/K6xYUp+ucdJvdEfuGdKgE/Q7vcBopQ="; }; enableParallelBuilding = true; @@ -166,6 +166,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/LostRuins/koboldcpp/releases/tag/v${finalAttrs.version}"; description = "Way to run various GGML and GGUF models"; + homepage = "https://github.com/LostRuins/koboldcpp"; license = lib.licenses.agpl3Only; mainProgram = "koboldcpp"; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/li/libvpl/package.nix b/pkgs/by-name/li/libvpl/package.nix index e4fb7e0180ab..c0ae60f2bb96 100644 --- a/pkgs/by-name/li/libvpl/package.nix +++ b/pkgs/by-name/li/libvpl/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libvpl"; - version = "2.10.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "intel"; repo = "libvpl"; rev = "v${finalAttrs.version}"; - hash = "sha256-2yfJo4iwI/h0CJ+mJJ3cAyG5S7KksUibwJHebF3MR+E="; + hash = "sha256-H+pRdpk1B/QgsXaTxhQfm3JW5Plgz4esrUV1kKfjY1s="; }; nativeBuildInputs = [ @@ -24,13 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DENABLE_DRI3=ON" - "-DENABLE_DRM=ON" - "-DENABLE_VA=ON" - "-DENABLE_WAYLAND=ON" - "-DENABLE_X11=ON" - "-DINSTALL_EXAMPLE_CODE=OFF" - "-DBUILD_TOOLS=OFF" + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; patches = [ @@ -40,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + doCheck = true; + meta = with lib; { description = "Intel Video Processing Library"; homepage = "https://intel.github.io/libvpl/"; diff --git a/pkgs/by-name/nv/nvrh/package.nix b/pkgs/by-name/nv/nvrh/package.nix index e07c9649706f..8faaeec11a0f 100644 --- a/pkgs/by-name/nv/nvrh/package.nix +++ b/pkgs/by-name/nv/nvrh/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "nvrh"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "mikew"; repo = "nvrh"; rev = "refs/tags/v${version}"; - hash = "sha256-rOEzzKvz4z0KEu39snNJsxr9chx/hCf5PCQ99NJR4qI="; + hash = "sha256-fVoyxq2iCUANEsq+mCaQnBV9kQ59PZsGi9r7bSwStwQ="; }; postPatch = '' @@ -26,7 +26,7 @@ buildGoModule rec { cp manifest.json src/ ''; - vendorHash = "sha256-Ao2BrB6fUOw2uFziQWNKeVTZtIeoW0MP7aLyuI1J3ng="; + vendorHash = "sha256-BioDzQMZWtTiM08aBQTPT4IGxK4f2JNx7dzNbcCgELQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 569ebca0c44a..590eb84c8e88 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -23,17 +23,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -104,12 +93,6 @@ version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" -[[package]] -name = "arc-swap" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" - [[package]] name = "arrayref" version = "0.3.9" @@ -177,9 +160,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" dependencies = [ "bzip2", "flate2", @@ -195,13 +178,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -337,15 +320,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "backtrace-ext" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" -dependencies = [ - "backtrace", -] - [[package]] name = "base64" version = "0.21.7" @@ -358,33 +332,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "bench" -version = "0.0.0" -dependencies = [ - "anyhow", - "codspeed-criterion-compat", - "criterion", - "distribution-filename", - "distribution-types", - "install-wheel-rs", - "jiff", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", - "tokio", - "uv-cache", - "uv-client", - "uv-configuration", - "uv-dispatch", - "uv-distribution", - "uv-git", - "uv-python", - "uv-resolver", - "uv-types", -] - [[package]] name = "bisection" version = "0.1.0" @@ -403,18 +350,6 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -426,9 +361,9 @@ dependencies = [ [[package]] name = "boxcar" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510a90332002c1af3317ef6b712f0dab697f30bbe809b86965eac2923c0bca8e" +checksum = "fba19c552ee63cb6646b75e1166d1bdb8a6d34a6d19e319dec88c8adadff2db3" [[package]] name = "bstr" @@ -437,7 +372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", - "regex-automata 0.4.7", + "regex-automata 0.4.8", "serde", ] @@ -449,24 +384,25 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytecheck" -version = "0.6.12" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +checksum = "50c8f430744b23b54ad15161fcbc22d82a29b73eacbe425fea23ec822600bc6f" dependencies = [ "bytecheck_derive", "ptr_meta", + "rancor", "simdutf8", ] [[package]] name = "bytecheck_derive" -version = "0.6.12" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +checksum = "523363cbe1df49b68215efdf500b103ac3b0fb4836aed6d15689a076eadb8fff" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -514,15 +450,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "cache-key" -version = "0.0.1" -dependencies = [ - "hex", - "seahash", - "url", -] - [[package]] name = "cachedir" version = "0.3.1" @@ -632,9 +559,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" dependencies = [ "clap_builder", "clap_derive", @@ -642,15 +569,15 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" dependencies = [ "anstream", "anstyle", "clap_lex", "strsim", - "terminal_size", + "terminal_size 0.4.0", ] [[package]] @@ -685,14 +612,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -1011,49 +938,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "distribution-filename" -version = "0.0.1" -dependencies = [ - "insta", - "pep440_rs", - "platform-tags", - "rkyv", - "serde", - "thiserror", - "url", - "uv-normalize", -] - -[[package]] -name = "distribution-types" -version = "0.0.1" -dependencies = [ - "anyhow", - "cache-key", - "distribution-filename", - "fs-err", - "itertools 0.13.0", - "jiff", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", - "rkyv", - "rustc-hash", - "schemars", - "serde", - "serde_json", - "thiserror", - "tracing", - "url", - "urlencoding", - "uv-cache-info", - "uv-fs", - "uv-git", - "uv-normalize", -] - [[package]] name = "doc-comment" version = "0.3.3" @@ -1108,6 +992,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "erased-serde" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" +dependencies = [ + "serde", + "typeid", +] + [[package]] name = "errno" version = "0.3.9" @@ -1185,9 +1079,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "libz-ng-sys", @@ -1259,17 +1153,11 @@ dependencies = [ "winapi", ] -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1282,9 +1170,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1292,15 +1180,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1309,9 +1197,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -1328,32 +1216,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1421,8 +1309,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -1476,15 +1364,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.14.5" @@ -1492,10 +1371,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] -name = "heck" -version = "0.4.1" +name = "hashbrown" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" [[package]] name = "heck" @@ -1635,7 +1514,7 @@ dependencies = [ "hyper", "hyper-util", "rustls", - "rustls-native-certs 0.8.0", + "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls", @@ -1645,9 +1524,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -1658,7 +1537,6 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] @@ -1683,7 +1561,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.7", + "regex-automata 0.4.8", "same-file", "walkdir", "winapi-util", @@ -1708,12 +1586,12 @@ checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf" [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -1752,43 +1630,6 @@ dependencies = [ "similar", ] -[[package]] -name = "install-wheel-rs" -version = "0.0.1" -dependencies = [ - "anyhow", - "assert_fs", - "clap", - "configparser", - "csv", - "data-encoding", - "distribution-filename", - "fs-err", - "indoc", - "mailparse", - "pathdiff", - "pep440_rs", - "platform-info", - "platform-tags", - "pypi-types", - "reflink-copy", - "regex", - "rustc-hash", - "schemars", - "serde", - "serde_json", - "sha2", - "tempfile", - "thiserror", - "tracing", - "uv-cache-info", - "uv-fs", - "uv-normalize", - "uv-warnings", - "walkdir", - "zip", -] - [[package]] name = "instant" version = "0.1.13" @@ -2113,30 +1954,19 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - [[package]] name = "miette" version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" dependencies = [ - "backtrace", - "backtrace-ext", "cfg-if", "miette-derive", "owo-colors", "supports-color", "supports-hyperlinks", "supports-unicode", - "terminal_size", + "terminal_size 0.3.0", "textwrap", "thiserror", "unicode-width", @@ -2150,7 +1980,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2168,6 +1998,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "miniz_oxide" version = "0.7.4" @@ -2208,6 +2048,26 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "munge" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64142d38c84badf60abf06ff9bd80ad2174306a5b11bd4706535090a30a419df" +dependencies = [ + "munge_macro", +] + +[[package]] +name = "munge_macro" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "nanoid" version = "0.4.0" @@ -2226,7 +2086,7 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.7.1", + "memoffset", "pin-utils", ] @@ -2301,15 +2161,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "once-map" -version = "0.0.1" -dependencies = [ - "dashmap", - "futures", - "tokio", -] - [[package]] name = "once_cell" version = "1.20.0" @@ -2418,48 +2269,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" -[[package]] -name = "pep440_rs" -version = "0.6.0" -dependencies = [ - "indoc", - "pyo3", - "rkyv", - "serde", - "tracing", - "unicode-width", - "unscanny", -] - -[[package]] -name = "pep508_rs" -version = "0.6.0" -dependencies = [ - "boxcar", - "indexmap", - "insta", - "itertools 0.13.0", - "log", - "pep440_rs", - "pubgrub", - "pyo3", - "pyo3-log", - "regex", - "rustc-hash", - "schemars", - "serde", - "serde_json", - "smallvec", - "testing_logger", - "thiserror", - "tracing", - "unicode-width", - "url", - "uv-fs", - "uv-normalize", - "uv-pubgrub", -] - [[package]] name = "percent-encoding" version = "2.3.1" @@ -2497,7 +2306,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2544,7 +2353,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -2579,24 +2388,14 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "platform-info" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5ff316b9c4642feda973c18f0decd6c8b0919d4722566f6e4337cce0dd88217" +checksum = "91077ffd05d058d70d79eefcd7d7f6aac34980860a7519960f7913b6563a8c3a" dependencies = [ "libc", "winapi", ] -[[package]] -name = "platform-tags" -version = "0.0.1" -dependencies = [ - "insta", - "rustc-hash", - "serde", - "thiserror", -] - [[package]] name = "png" version = "0.17.13" @@ -2696,22 +2495,22 @@ dependencies = [ [[package]] name = "ptr_meta" -version = "0.1.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90" dependencies = [ "ptr_meta_derive", ] [[package]] name = "ptr_meta_derive" -version = "0.1.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -2726,105 +2525,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "pyo3" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8" -dependencies = [ - "cfg-if", - "indoc", - "libc", - "memoffset 0.9.1", - "parking_lot 0.12.3", - "portable-atomic", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", - "unindent", -] - -[[package]] -name = "pyo3-build-config" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50" -dependencies = [ - "once_cell", - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-log" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af49834b8d2ecd555177e63b273b708dea75150abc6f5341d0a6e1a9623976c" -dependencies = [ - "arc-swap", - "log", - "pyo3", -] - -[[package]] -name = "pyo3-macros" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c" -dependencies = [ - "proc-macro2", - "pyo3-macros-backend", - "quote", - "syn 2.0.77", -] - -[[package]] -name = "pyo3-macros-backend" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "pyo3-build-config", - "quote", - "syn 2.0.77", -] - -[[package]] -name = "pypi-types" -version = "0.0.1" -dependencies = [ - "anyhow", - "distribution-filename", - "indexmap", - "itertools 0.13.0", - "jiff", - "mailparse", - "pep440_rs", - "pep508_rs", - "regex", - "rkyv", - "serde", - "thiserror", - "toml", - "toml_edit", - "tracing", - "url", - "uv-fs", - "uv-git", - "uv-normalize", -] - [[package]] name = "quinn" version = "0.11.5" @@ -2889,10 +2589,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "640c9bd8497b02465aeef5375144c26062e0dcd5939dfcbb0f5db76cb8c17c73" [[package]] -name = "radium" -version = "0.7.0" +name = "rancor" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +checksum = "caf5f7161924b9d1cea0e4cabc97c372cea92b5f927fc13c6bca67157a0ad947" +dependencies = [ + "ptr_meta", +] [[package]] name = "rand" @@ -3001,14 +2704,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -3022,13 +2725,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -3039,54 +2742,24 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rend" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +checksum = "a31c1f1959e4db12c985c0283656be0925f1539549db1e47c4bd0b8b599e1ef7" dependencies = [ "bytecheck", ] -[[package]] -name = "requirements-txt" -version = "0.0.1" -dependencies = [ - "anyhow", - "assert_fs", - "distribution-types", - "fs-err", - "indoc", - "insta", - "itertools 0.13.0", - "pep508_rs", - "pypi-types", - "regex", - "reqwest", - "reqwest-middleware", - "tempfile", - "test-case", - "thiserror", - "tokio", - "tracing", - "unscanny", - "url", - "uv-client", - "uv-configuration", - "uv-fs", - "uv-normalize", - "uv-warnings", -] - [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "async-compression", "base64 0.22.1", @@ -3104,12 +2777,13 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", "quinn", "rustls", - "rustls-native-certs 0.7.3", + "rustls-native-certs", "rustls-pemfile", "rustls-pki-types", "serde", @@ -3118,6 +2792,7 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-rustls", + "tokio-socks", "tokio-util", "tower-service", "url", @@ -3218,31 +2893,32 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.45" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" +checksum = "395027076c569819ea6035ee62e664f5e03d74e281744f55261dd1afd939212b" dependencies = [ - "bitvec", "bytecheck", "bytes", - "hashbrown 0.12.3", + "hashbrown 0.14.5", + "indexmap", + "munge", "ptr_meta", + "rancor", "rend", "rkyv_derive", - "seahash", "tinyvec", "uuid", ] [[package]] name = "rkyv_derive" -version = "0.7.45" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" +checksum = "09cb82b74b4810f07e460852c32f522e979787691b0b7b7439fe473e49d49b2f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -3343,19 +3019,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-native-certs" version = "0.8.0" @@ -3458,7 +3121,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn", ] [[package]] @@ -3484,7 +3147,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3531,6 +3194,17 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-untagged" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6" +dependencies = [ + "erased-serde", + "serde", + "typeid", +] + [[package]] name = "serde_derive" version = "1.0.210" @@ -3539,7 +3213,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3550,7 +3224,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3691,6 +3365,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "spdx" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47317bbaf63785b53861e1ae2d11b80d6b624211d42cb20efcd210ee6f8a14bc" +dependencies = [ + "smallvec", +] + [[package]] name = "spin" version = "0.9.8" @@ -3777,20 +3460,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.109" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -3822,12 +3494,6 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eddb6b06d20fba9ed21fca3d696ee1b6e870bca0bcf9fa2971f6ae2436de576a" -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "target-lexicon" version = "0.12.16" @@ -3845,9 +3511,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -3866,6 +3532,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "terminal_size" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +dependencies = [ + "rustix", + "windows-sys 0.59.0", +] + [[package]] name = "termtree" version = "0.4.1" @@ -3890,7 +3566,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3901,7 +3577,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", "test-case-core", ] @@ -3923,7 +3599,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -3948,22 +3624,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -4077,7 +3753,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -4091,6 +3767,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-socks" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.16" @@ -4140,9 +3828,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.21" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap", "serde", @@ -4151,27 +3839,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - [[package]] name = "tower-service" version = "0.3.3" @@ -4184,7 +3851,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4198,7 +3864,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -4295,6 +3961,12 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" +[[package]] +name = "typeid" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" + [[package]] name = "typenum" version = "1.17.0" @@ -4307,6 +3979,15 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.15" @@ -4370,12 +4051,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" -[[package]] -name = "unindent" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" - [[package]] name = "unscanny" version = "0.1.0" @@ -4459,7 +4134,7 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "uv" -version = "0.4.11" +version = "0.4.20" dependencies = [ "anstream", "anyhow", @@ -4468,11 +4143,8 @@ dependencies = [ "axoupdater", "base64 0.22.1", "byteorder", - "cache-key", "clap", "ctrlc", - "distribution-filename", - "distribution-types", "etcetera", "filetime", "flate2", @@ -4484,17 +4156,11 @@ dependencies = [ "indicatif", "indoc", "insta", - "install-wheel-rs", "itertools 0.13.0", "jiff", "miette", - "mimalloc", "owo-colors", - "pep440_rs", - "pep508_rs", - "platform-tags", "predicates", - "pypi-types", "rayon", "regex", "reqwest", @@ -4505,7 +4171,6 @@ dependencies = [ "tempfile", "textwrap", "thiserror", - "tikv-jemallocator", "tokio", "toml", "tracing", @@ -4515,18 +4180,30 @@ dependencies = [ "unicode-width", "url", "uv-auth", + "uv-build-backend", "uv-cache", "uv-cache-info", + "uv-cache-key", "uv-cli", "uv-client", "uv-configuration", "uv-dispatch", "uv-distribution", + "uv-distribution-filename", + "uv-distribution-types", "uv-extract", "uv-fs", "uv-git", + "uv-install-wheel", "uv-installer", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-performance-flate2-backend", + "uv-performance-memory-allocator", + "uv-platform-tags", + "uv-publish", + "uv-pypi-types", "uv-python", "uv-requirements", "uv-resolver", @@ -4552,7 +4229,6 @@ dependencies = [ "futures", "http", "insta", - "once-map", "reqwest", "reqwest-middleware", "rust-netrc", @@ -4563,23 +4239,78 @@ dependencies = [ "tracing", "url", "urlencoding", + "uv-once-map", "wiremock", ] [[package]] -name = "uv-build" +name = "uv-bench" +version = "0.0.0" +dependencies = [ + "anyhow", + "codspeed-criterion-compat", + "criterion", + "jiff", + "tokio", + "uv-cache", + "uv-client", + "uv-configuration", + "uv-dispatch", + "uv-distribution", + "uv-distribution-filename", + "uv-distribution-types", + "uv-git", + "uv-install-wheel", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", + "uv-python", + "uv-resolver", + "uv-types", +] + +[[package]] +name = "uv-build-backend" +version = "0.1.0" +dependencies = [ + "csv", + "fs-err", + "glob", + "indoc", + "insta", + "itertools 0.13.0", + "serde", + "sha2", + "spdx", + "tempfile", + "thiserror", + "toml", + "tracing", + "uv-distribution-filename", + "uv-fs", + "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-pubgrub", + "uv-pypi-types", + "uv-version", + "uv-warnings", + "walkdir", + "zip", +] + +[[package]] +name = "uv-build-frontend" version = "0.0.1" dependencies = [ "anstream", "anyhow", - "distribution-types", "fs-err", "indoc", "insta", "itertools 0.13.0", - "pep440_rs", - "pep508_rs", - "pypi-types", + "owo-colors", "regex", "rustc-hash", "serde", @@ -4590,7 +4321,11 @@ dependencies = [ "toml_edit", "tracing", "uv-configuration", + "uv-distribution-types", "uv-fs", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-python", "uv-types", "uv-virtualenv", @@ -4600,14 +4335,11 @@ dependencies = [ name = "uv-cache" version = "0.0.1" dependencies = [ - "cache-key", "clap", "directories", - "distribution-types", "etcetera", "fs-err", "nanoid", - "pypi-types", "rmp-serde", "rustc-hash", "serde", @@ -4615,8 +4347,11 @@ dependencies = [ "tracing", "url", "uv-cache-info", + "uv-cache-key", + "uv-distribution-types", "uv-fs", "uv-normalize", + "uv-pypi-types", "walkdir", ] @@ -4633,6 +4368,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "uv-cache-key" +version = "0.0.1" +dependencies = [ + "hex", + "seahash", + "url", +] + [[package]] name = "uv-cli" version = "0.0.1" @@ -4641,17 +4385,17 @@ dependencies = [ "anyhow", "clap", "clap_complete_command", - "distribution-types", "fs-err", "insta", - "install-wheel-rs", - "pep508_rs", - "pypi-types", "serde", "url", "uv-cache", "uv-configuration", + "uv-distribution-types", + "uv-install-wheel", "uv-normalize", + "uv-pep508", + "uv-pypi-types", "uv-python", "uv-resolver", "uv-settings", @@ -4667,9 +4411,7 @@ dependencies = [ "async-trait", "async_http_range_reader", "async_zip", - "cache-key", - "distribution-filename", - "distribution-types", + "bytecheck", "fs-err", "futures", "html-escape", @@ -4680,10 +4422,6 @@ dependencies = [ "insta", "itertools 0.13.0", "jiff", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", "reqwest", "reqwest-middleware", "reqwest-retry", @@ -4701,10 +4439,17 @@ dependencies = [ "urlencoding", "uv-auth", "uv-cache", + "uv-cache-key", "uv-configuration", + "uv-distribution-filename", + "uv-distribution-types", "uv-fs", "uv-metadata", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", "uv-version", "uv-warnings", ] @@ -4714,15 +4459,13 @@ name = "uv-configuration" version = "0.0.1" dependencies = [ "anyhow", - "cache-key", "clap", "either", - "pep508_rs", - "platform-tags", - "pypi-types", + "fs-err", "rustc-hash", "schemars", "serde", + "serde-untagged", "serde_json", "thiserror", "tracing", @@ -4730,7 +4473,20 @@ dependencies = [ "uv-auth", "uv-cache", "uv-cache-info", + "uv-cache-key", "uv-normalize", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", + "which", +] + +[[package]] +name = "uv-console" +version = "0.0.1" +dependencies = [ + "console", + "ctrlc", ] [[package]] @@ -4740,24 +4496,18 @@ dependencies = [ "anstream", "anyhow", "clap", - "distribution-filename", - "distribution-types", "fs-err", "itertools 0.13.0", "markdown", - "mimalloc", "owo-colors", - "pep508_rs", "poloto", "pretty_assertions", - "pypi-types", "resvg", "schemars", "serde", "serde_json", "tagu", "textwrap", - "tikv-jemallocator", "tokio", "tracing", "tracing-durations-export", @@ -4765,9 +4515,14 @@ dependencies = [ "uv-cache", "uv-cli", "uv-client", + "uv-distribution-filename", + "uv-distribution-types", "uv-installer", "uv-macros", "uv-options-metadata", + "uv-pep508", + "uv-performance-memory-allocator", + "uv-pypi-types", "uv-python", "uv-settings", "uv-workspace", @@ -4779,20 +4534,20 @@ name = "uv-dispatch" version = "0.0.1" dependencies = [ "anyhow", - "distribution-types", "futures", - "install-wheel-rs", "itertools 0.13.0", - "pypi-types", "rustc-hash", "tracing", - "uv-build", + "uv-build-frontend", "uv-cache", "uv-client", "uv-configuration", "uv-distribution", + "uv-distribution-types", "uv-git", + "uv-install-wheel", "uv-installer", + "uv-pypi-types", "uv-python", "uv-resolver", "uv-types", @@ -4803,18 +4558,13 @@ name = "uv-distribution" version = "0.0.1" dependencies = [ "anyhow", - "cache-key", - "distribution-filename", - "distribution-types", + "either", "fs-err", "futures", "indoc", "insta", "nanoid", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", + "owo-colors", "reqwest", "reqwest-middleware", "rmp-serde", @@ -4828,13 +4578,20 @@ dependencies = [ "url", "uv-cache", "uv-cache-info", + "uv-cache-key", "uv-client", "uv-configuration", + "uv-distribution-filename", + "uv-distribution-types", "uv-extract", "uv-fs", "uv-git", "uv-metadata", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", "uv-types", "uv-warnings", "uv-workspace", @@ -4842,18 +4599,59 @@ dependencies = [ "zip", ] +[[package]] +name = "uv-distribution-filename" +version = "0.0.1" +dependencies = [ + "insta", + "rkyv", + "serde", + "thiserror", + "url", + "uv-normalize", + "uv-pep440", + "uv-platform-tags", +] + +[[package]] +name = "uv-distribution-types" +version = "0.0.1" +dependencies = [ + "anyhow", + "fs-err", + "itertools 0.13.0", + "jiff", + "rkyv", + "rustc-hash", + "schemars", + "serde", + "serde_json", + "thiserror", + "tracing", + "url", + "urlencoding", + "uv-cache-info", + "uv-cache-key", + "uv-distribution-filename", + "uv-fs", + "uv-git", + "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", +] + [[package]] name = "uv-extract" version = "0.0.1" dependencies = [ "async-compression", "async_zip", - "distribution-filename", "fs-err", "futures", "krata-tokio-tar", "md-5", - "pypi-types", "rayon", "reqwest", "rustc-hash", @@ -4862,6 +4660,8 @@ dependencies = [ "tokio", "tokio-util", "tracing", + "uv-distribution-filename", + "uv-pypi-types", "xz2", "zip", ] @@ -4879,12 +4679,14 @@ dependencies = [ "fs2", "junction", "path-slash", + "rustix", + "schemars", "serde", "tempfile", "tokio", "tracing", "urlencoding", - "uv-warnings", + "winsafe 0.0.22", ] [[package]] @@ -4892,7 +4694,6 @@ name = "uv-git" version = "0.0.1" dependencies = [ "anyhow", - "cache-key", "cargo-util", "dashmap", "fs-err", @@ -4904,25 +4705,55 @@ dependencies = [ "tracing", "url", "uv-auth", + "uv-cache-key", "uv-fs", ] +[[package]] +name = "uv-install-wheel" +version = "0.0.1" +dependencies = [ + "anyhow", + "assert_fs", + "clap", + "configparser", + "csv", + "data-encoding", + "fs-err", + "indoc", + "mailparse", + "pathdiff", + "platform-info", + "reflink-copy", + "regex", + "rustc-hash", + "schemars", + "serde", + "serde_json", + "sha2", + "tempfile", + "thiserror", + "tracing", + "uv-cache-info", + "uv-distribution-filename", + "uv-fs", + "uv-normalize", + "uv-pep440", + "uv-platform-tags", + "uv-pypi-types", + "uv-warnings", + "walkdir", + "zip", +] + [[package]] name = "uv-installer" version = "0.0.1" dependencies = [ "anyhow", "async-channel", - "cache-key", - "distribution-filename", - "distribution-types", "fs-err", "futures", - "install-wheel-rs", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", "rayon", "rustc-hash", "same-file", @@ -4933,12 +4764,18 @@ dependencies = [ "url", "uv-cache", "uv-cache-info", + "uv-cache-key", "uv-configuration", "uv-distribution", + "uv-distribution-types", "uv-extract", "uv-fs", - "uv-git", + "uv-install-wheel", "uv-normalize", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", "uv-python", "uv-types", "uv-warnings", @@ -4951,7 +4788,7 @@ version = "0.0.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", "textwrap", ] @@ -4960,14 +4797,14 @@ name = "uv-metadata" version = "0.1.0" dependencies = [ "async_zip", - "distribution-filename", "fs-err", "futures", - "pypi-types", "thiserror", "tokio", "tokio-util", + "uv-distribution-filename", "uv-normalize", + "uv-pypi-types", "zip", ] @@ -4980,6 +4817,15 @@ dependencies = [ "serde", ] +[[package]] +name = "uv-once-map" +version = "0.0.1" +dependencies = [ + "dashmap", + "futures", + "tokio", +] + [[package]] name = "uv-options-metadata" version = "0.0.1" @@ -4987,14 +4833,137 @@ dependencies = [ "serde", ] +[[package]] +name = "uv-pep440" +version = "0.7.0" +dependencies = [ + "indoc", + "rkyv", + "serde", + "tracing", + "unicode-width", + "unscanny", +] + +[[package]] +name = "uv-pep508" +version = "0.6.0" +dependencies = [ + "boxcar", + "indexmap", + "insta", + "itertools 0.13.0", + "log", + "pubgrub", + "regex", + "rustc-hash", + "schemars", + "serde", + "serde_json", + "smallvec", + "testing_logger", + "thiserror", + "tracing", + "unicode-width", + "url", + "uv-fs", + "uv-normalize", + "uv-pep440", + "uv-pubgrub", +] + +[[package]] +name = "uv-performance-flate2-backend" +version = "0.1.0" +dependencies = [ + "flate2", +] + +[[package]] +name = "uv-performance-memory-allocator" +version = "0.1.0" +dependencies = [ + "mimalloc", + "tikv-jemallocator", +] + +[[package]] +name = "uv-platform-tags" +version = "0.0.1" +dependencies = [ + "insta", + "rustc-hash", + "serde", + "thiserror", +] + [[package]] name = "uv-pubgrub" version = "0.0.1" dependencies = [ "itertools 0.13.0", - "pep440_rs", "pubgrub", "thiserror", + "uv-pep440", +] + +[[package]] +name = "uv-publish" +version = "0.1.0" +dependencies = [ + "async-compression", + "base64 0.22.1", + "fs-err", + "futures", + "glob", + "insta", + "itertools 0.13.0", + "krata-tokio-tar", + "reqwest", + "reqwest-middleware", + "reqwest-retry", + "rustc-hash", + "serde", + "serde_json", + "sha2", + "thiserror", + "tokio", + "tokio-util", + "tracing", + "url", + "uv-client", + "uv-configuration", + "uv-distribution-filename", + "uv-fs", + "uv-metadata", + "uv-pypi-types", + "uv-warnings", +] + +[[package]] +name = "uv-pypi-types" +version = "0.0.1" +dependencies = [ + "anyhow", + "indexmap", + "itertools 0.13.0", + "jiff", + "mailparse", + "regex", + "rkyv", + "serde", + "serde-untagged", + "thiserror", + "toml", + "toml_edit", + "tracing", + "url", + "uv-distribution-filename", + "uv-fs", + "uv-git", + "uv-normalize", + "uv-pep440", + "uv-pep508", ] [[package]] @@ -5003,26 +4972,18 @@ version = "0.0.1" dependencies = [ "anyhow", "assert_fs", - "cache-key", "clap", "configparser", - "distribution-filename", "fs-err", "futures", "goblin", "indoc", - "install-wheel-rs", "itertools 0.13.0", "owo-colors", - "pep440_rs", - "pep508_rs", - "platform-tags", - "pypi-types", "regex", "reqwest", "reqwest-middleware", "rmp-serde", - "rustix", "same-file", "schemars", "serde", @@ -5038,16 +4999,22 @@ dependencies = [ "url", "uv-cache", "uv-cache-info", + "uv-cache-key", "uv-client", + "uv-distribution-filename", "uv-extract", "uv-fs", + "uv-install-wheel", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", + "uv-pypi-types", "uv-state", "uv-warnings", "which", "windows-registry", "windows-result 0.2.0", "windows-sys 0.59.0", - "winsafe 0.0.22", ] [[package]] @@ -5055,60 +5022,81 @@ name = "uv-requirements" version = "0.1.0" dependencies = [ "anyhow", - "cache-key", "configparser", "console", - "ctrlc", - "distribution-filename", - "distribution-types", "fs-err", "futures", - "pep508_rs", - "pypi-types", - "requirements-txt", "rustc-hash", "serde", "thiserror", "toml", "tracing", "url", + "uv-cache-key", "uv-client", "uv-configuration", + "uv-console", "uv-distribution", + "uv-distribution-filename", + "uv-distribution-types", "uv-fs", "uv-git", "uv-normalize", + "uv-pep508", + "uv-pypi-types", + "uv-requirements-txt", "uv-resolver", "uv-types", "uv-warnings", "uv-workspace", ] +[[package]] +name = "uv-requirements-txt" +version = "0.0.1" +dependencies = [ + "anyhow", + "assert_fs", + "fs-err", + "indoc", + "insta", + "itertools 0.13.0", + "regex", + "reqwest", + "reqwest-middleware", + "tempfile", + "test-case", + "thiserror", + "tokio", + "tracing", + "unscanny", + "url", + "uv-client", + "uv-configuration", + "uv-distribution-types", + "uv-fs", + "uv-normalize", + "uv-pep508", + "uv-pypi-types", + "uv-warnings", +] + [[package]] name = "uv-resolver" version = "0.0.1" dependencies = [ "anyhow", - "cache-key", "clap", "dashmap", - "distribution-filename", - "distribution-types", "either", "futures", "indexmap", "insta", "itertools 0.13.0", "jiff", - "once-map", "owo-colors", - "pep440_rs", - "pep508_rs", "petgraph", - "platform-tags", "pubgrub", - "pypi-types", - "requirements-txt", "rkyv", "rustc-hash", "same-file", @@ -5122,15 +5110,24 @@ dependencies = [ "toml_edit", "tracing", "url", + "uv-cache-key", "uv-client", "uv-configuration", "uv-distribution", + "uv-distribution-filename", + "uv-distribution-types", "uv-fs", "uv-git", "uv-metadata", "uv-normalize", + "uv-once-map", + "uv-pep440", + "uv-pep508", + "uv-platform-tags", "uv-pubgrub", + "uv-pypi-types", "uv-python", + "uv-requirements-txt", "uv-types", "uv-warnings", "uv-workspace", @@ -5143,12 +5140,12 @@ dependencies = [ "fs-err", "indoc", "memchr", - "pep440_rs", - "pep508_rs", - "pypi-types", "serde", "thiserror", "toml", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-settings", "uv-workspace", ] @@ -5159,23 +5156,24 @@ version = "0.0.1" dependencies = [ "clap", "dirs-sys", - "distribution-types", "fs-err", - "install-wheel-rs", - "pep508_rs", - "pypi-types", "schemars", "serde", "textwrap", "thiserror", "toml", "tracing", + "url", "uv-cache-info", "uv-configuration", + "uv-distribution-types", "uv-fs", + "uv-install-wheel", "uv-macros", "uv-normalize", "uv-options-metadata", + "uv-pep508", + "uv-pypi-types", "uv-python", "uv-resolver", "uv-warnings", @@ -5209,11 +5207,7 @@ version = "0.0.1" dependencies = [ "dirs-sys", "fs-err", - "install-wheel-rs", "pathdiff", - "pep440_rs", - "pep508_rs", - "pypi-types", "serde", "thiserror", "toml", @@ -5221,7 +5215,11 @@ dependencies = [ "tracing", "uv-cache", "uv-fs", + "uv-install-wheel", "uv-installer", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-python", "uv-settings", "uv-state", @@ -5233,24 +5231,24 @@ name = "uv-types" version = "0.0.1" dependencies = [ "anyhow", - "distribution-types", - "once-map", - "pep440_rs", - "pep508_rs", - "pypi-types", "rustc-hash", "thiserror", "url", "uv-cache", "uv-configuration", + "uv-distribution-types", "uv-git", "uv-normalize", + "uv-once-map", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-python", ] [[package]] name = "uv-version" -version = "0.4.11" +version = "0.4.20" [[package]] name = "uv-virtualenv" @@ -5259,11 +5257,11 @@ dependencies = [ "fs-err", "itertools 0.13.0", "pathdiff", - "platform-tags", - "pypi-types", "thiserror", "tracing", "uv-fs", + "uv-platform-tags", + "uv-pypi-types", "uv-python", "uv-version", ] @@ -5288,14 +5286,13 @@ dependencies = [ "glob", "insta", "itertools 0.13.0", - "pep440_rs", - "pep508_rs", - "pypi-types", + "owo-colors", "regex", "rustc-hash", "same-file", "schemars", "serde", + "serde-untagged", "tempfile", "thiserror", "tokio", @@ -5308,6 +5305,9 @@ dependencies = [ "uv-macros", "uv-normalize", "uv-options-metadata", + "uv-pep440", + "uv-pep508", + "uv-pypi-types", "uv-warnings", ] @@ -5379,7 +5379,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn", "wasm-bindgen-shared", ] @@ -5413,7 +5413,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5518,7 +5518,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -5580,7 +5580,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -5591,7 +5591,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -5602,7 +5602,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -5613,7 +5613,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] @@ -5858,15 +5858,6 @@ dependencies = [ "url", ] -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "xattr" version = "1.3.1" @@ -5917,7 +5908,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn", ] [[package]] diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 7b507ceebd62..9ac434f41c54 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -9,21 +9,20 @@ python3Packages, rustPlatform, stdenv, - testers, - uv, + versionCheckHook, nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.4.11"; + version = "0.4.20"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-a8mN2wag26BSL+2b5i4P1XN34J8jt+lZm2poZQdsAzM="; + hash = "sha256-PfjYGCPPRZVm4H9oxkWdjW7kHu4CqdkenFgL61dOU5k="; }; cargoDeps = rustPlatform.importCargoLock { @@ -65,8 +64,12 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "uv" ]; + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + passthru = { - tests.version = testers.testVersion { package = uv; }; updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 0993515eb1ae..690eba3a3b28 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -44,6 +44,9 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-cIwCNYXbg7l6z9OAkMAGJ783QI/nCOyrhLPURDcDv+Y="; }; + # https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7 + pythonRelaxDeps = [ "rapidfuzz" ]; + patches = [ # FIXME This shouldn't be necessary and probably has to do with some dependency mismatch. ./cache.lock.patch diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 24ac89eb4c5b..9e38dc8d285f 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "angelscript"; - version = "2.36.1"; + version = "2.37.0"; src = fetchurl { url = "https://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - sha256 = "sha256-WLt0mvnH44YwRwX05uYnrkHf4D4LanPD0NLgF8T8lI8="; + sha256 = "sha256-DFLRaIAWoLJITpylSUccTild8GB3DFeEAUTGSBX1TxA="; }; nativeBuildInputs = [ unzip cmake ]; diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix index 0ab380064429..7485e230d677 100644 --- a/pkgs/development/libraries/libblocksruntime/default.nix +++ b/pkgs/development/libraries/libblocksruntime/default.nix @@ -1,31 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, clang }: +{ + lib, + stdenv, + fetchFromGitHub, +}: stdenv.mkDerivation { pname = "blocksruntime"; - version = "unstable-2014-06-24"; + version = "unstable-2017-10-28"; src = fetchFromGitHub { owner = "mackyle"; repo = "blocksruntime"; - rev = "b5c5274daf1e0e46ecc9ad8f6f69889bce0a0a5d"; - sha256 = "0ic4lagagkylcvwgf10mg0s1i57h4i25ds2fzvms22xj4zwzk1sd"; + rev = "9cc93ae2b58676c23fd02cf0c686fa15b7a3ff81"; + sha256 = "sha256-pQMNZBgkF4uADOVCWXB5J3qQt8JMe8vo6ZmbtSVA5Xo="; }; - buildInputs = [ clang ]; - - configurePhase = '' - export CC=clang - export CXX=clang++ + buildPhase = '' + runHook preBuild + ./buildlib ${lib.optionalString (!stdenv.hostPlatform.isStatic) "-shared"} + runHook postBuild ''; - buildPhase = "./buildlib"; + installPhase = '' + runHook preInstall + prefix="/" DESTDIR=$out ./installlib ${ + if stdenv.hostPlatform.isStatic then "-static" else "-shared" + } + runHook postInstall + ''; - checkPhase = "./checktests"; + checkPhase = '' + runHook preCheck + ./checktests + runHook postChck + ''; doCheck = false; # hasdescriptor.c test fails, hrm. - installPhase = ''prefix="/" DESTDIR=$out ./installlib''; - meta = with lib; { description = "Installs the BlocksRuntime library from the compiler-rt"; homepage = "https://github.com/mackyle/blocksruntime"; diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index f2e7c88af82d..5e5499e2bcaa 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.6.6"; + version = "0.6.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-a1UsRmDCieCMblH2SpNujDj98GjqDcMN6+TRAWkkV3I="; + hash = "sha256-6M80Qm5stk3wsZ55wcrJc8Y/TDd5zLWwiOhKj+5FQHs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index fd5e8e992775..f4e52431ed4b 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.4.1"; + version = "2.4.2"; pyproject = true; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; rev = "refs/tags/v${version}"; - hash = "sha256-4UPiQt1hVVlPFZnuKlMK3FLv2cIEXToHKxnyYLXR/sY="; + hash = "sha256-o5mjZhqQc7tu44EjrScuGzv6pZNlnZnndMIAhl8pY5o="; }; build-system = [ diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix new file mode 100644 index 000000000000..5d0e946bd1b5 --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-test-utils, + pytestCheckHook, +}: + +buildPythonPackage rec { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-logging"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-logging"; + + build-system = [ hatchling ]; + + dependencies = [ + opentelemetry-api + opentelemetry-instrumentation + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.logging" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-logging"; + description = "Logging instrumentation for OpenTelemetry"; + }; +} diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 2f81ba27079d..da906793d206 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1147"; + version = "3.0.1248"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-dqc29D7Zpq7Hkvlx1+CKJop7zRRAXvHBUu4mnUOTpKM="; + hash = "sha256-w0iM9Pq3A7uJ3Q29Oo+YEhN2vPNJINjCwIoGaDwHK2A="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index 720ff9bba026..e5d9b4bef619 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -2,10 +2,9 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, + setuptools, spark-parser, xdis, - nose, pytestCheckHook, hypothesis, six, @@ -14,20 +13,23 @@ buildPythonPackage rec { pname = "uncompyle6"; version = "3.9.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-b3CYD/4IpksRS2hxgy/QLYbJkDX4l2qPH4Eh2tb8pCU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ spark-parser xdis ]; + pythonRelaxDeps = [ "spark-parser" ]; + nativeCheckInputs = [ - nose pytestCheckHook hypothesis six @@ -35,7 +37,7 @@ buildPythonPackage rec { # No tests are provided for versions past 3.8, # as the project only targets bytecode of versions <= 3.8 - doCheck = pythonOlder "3.9"; + doCheck = false; meta = { description = "A bytecode decompiler for Python versions 3.8 and below"; diff --git a/pkgs/development/tools/gcov2lcov/default.nix b/pkgs/development/tools/gcov2lcov/default.nix index 0ac499923f2a..4bc714a6a199 100644 --- a/pkgs/development/tools/gcov2lcov/default.nix +++ b/pkgs/development/tools/gcov2lcov/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gcov2lcov"; - version = "1.0.6"; + version = "1.1.0"; src = fetchFromGitHub { owner = "jandelgado"; repo = "gcov2lcov"; rev = "v${version}"; - hash = "sha256-S5fAhd0bh1XEeQwaya8LvnKQ/iz4PjAbpjK4uFI6H1g="; + hash = "sha256-E8TPxaKJTd+5OP9e5S1FD5aZP42nJvjiqqNs4xP9gm4="; }; - vendorHash = "sha256-r95PFkTywGiDIEnDfLpzt97SkuDeXo4xg2N7ikG0hs0="; + vendorHash = "sha256-/2OIBWXbNch6lmw0C1jkyJfNefJXOVG9/jNW8CYHTsc="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/gptcommit/0001-update-time.patch b/pkgs/development/tools/gptcommit/0001-update-time.patch deleted file mode 100644 index eb6f9692f401..000000000000 --- a/pkgs/development/tools/gptcommit/0001-update-time.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 203afecca3717787628eab30b550ba25389cb188 Mon Sep 17 00:00:00 2001 -From: Sander -Date: Sat, 12 Oct 2024 12:26:51 +0000 -Subject: [PATCH] deps: bump time to fix compilation error - ---- - Cargo.lock | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 9ce33e5..785764d 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1420,6 +1420,12 @@ dependencies = [ - "minimal-lexical", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num_cpus" - version = "1.16.0" -@@ -2219,13 +2225,14 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.31" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", - "powerfmt", - "serde", -@@ -2241,10 +2248,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.16" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - --- -2.44.1 - diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix index 9aabb2ef5058..1a4036d77189 100644 --- a/pkgs/development/tools/gptcommit/default.nix +++ b/pkgs/development/tools/gptcommit/default.nix @@ -11,7 +11,7 @@ let pname = "gptcommit"; - version = "0.5.16"; + version = "0.5.17"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,16 +20,10 @@ rustPlatform.buildRustPackage { owner = "zurawiki"; repo = pname; rev = "v${version}"; - hash = "sha256-JhMkK2zw3VL9o7j8DJmjY/im+GyCjfV2TJI3GDo8T8c="; + hash = "sha256-MB78QsJA90Au0bCUXfkcjnvfPagTPZwFhFVqxix+Clw="; }; - cargoPatches = [ - # Bump `time` and friends to fix compilation with rust 1.80. - # See https://github.com/NixOS/nixpkgs/issues/332957 - ./0001-update-time.patch - ]; - - cargoHash = "sha256-0UAttCCbSH91Dn7IvEX+Klp/bSYZM4rml7/dD3a208A="; + cargoHash = "sha256-F4nabUeQZMnmSNC8KlHjx3IcyR2Xn36kovabmJ6g1zo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/inferno/default.nix b/pkgs/development/tools/inferno/default.nix index 9657129fd0cb..366bc42727b3 100644 --- a/pkgs/development/tools/inferno/default.nix +++ b/pkgs/development/tools/inferno/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "inferno"; - version = "0.11.20"; + version = "0.11.21"; src = fetchFromGitHub { owner = "jonhoo"; repo = pname; rev = "v${version}"; - hash = "sha256-+A27B50hRAQvk0QrcCP0QQe6zJkVUIX7qggL8kjJmQY="; + hash = "sha256-/tFbizGsgrmeTfd3W6BhVOX8BvOuakWqReQ1vQ0lrjw="; fetchSubmodules = true; }; - cargoHash = "sha256-XmxB18IQh2Bvbez6BowoV+P0qghmOcHpC0ZH4PgsIZo="; + cargoHash = "sha256-BoRlKD34c9RZz9fYMgxTbsbU9XL724PG+CVh9G/tl0M="; # skip flaky tests checkFlags = [ diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index d15c5d7cfc37..4e213a0b4c21 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.13"; + version = "1.2.18"; src = fetchurl { # To find the most recent version go to # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php # and retreive the download link for source package for x86 CPU - url = "https://download3.ebz.epson.net/dsc/f/03/00/16/00/23/60c57d2774eea9b27d2c636f0c3615b8619291b3/epson-inkjet-printer-escpr2-1.2.13-1.src.rpm"; - sha256 = "sha256-yOZqeNrtC28OucY5HOT6OY6qqvLSGh1LTIXbIB7VNrY="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/16/25/39/fcf17405f25e851f3ee0e5ed3ce97d09f22ecb41/epson-inkjet-printer-escpr2-1.2.18-1.src.rpm"; + sha256 = "sha256-cdCcZzi31jPGmMnlKtPCFVla0YWfrCTbXsXHSeB0Vk4="; }; unpackPhase = '' diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix index 8780ce2fa256..52ee2d92eccd 100644 --- a/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix +++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2024.09.5"; + version = "2024.10.3"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; rev = "refs/tags/${version}"; - hash = "sha256-mpsa+9LBnDfvMbOuEwctoPSg8IHRmkrFalVyg+1KR00=x"; + hash = "sha256-6XLXCD7ItTGCRN9XQUetZfZBuMbFEmho6IOyFs4m0ek="; }; dependencies = [ pymodbus ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 6187baf60f60..adfa793f1d35 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -211,8 +211,8 @@ in lib.makeExtensible (self: ({ }; nix_2_24 = (common { - version = "2.24.8"; - hash = "sha256-YPJA0stZucs13Y2DQr3JIL6JfakP//LDbYXNhic/rKk="; + version = "2.24.9"; + hash = "sha256-OwJByTdCz1t91ysBqynK+ifszkoIGEXUn6HE2t82+c8="; self_attribute_name = "nix_2_24"; }).override (lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) { # Fix the following error with the default x86_64-darwin SDK: diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix index 69ce4aa511b6..efc6f6f8e53f 100644 --- a/pkgs/tools/security/ecdsautils/default.nix +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -2,7 +2,7 @@ let pname = "ecdsautils"; - version = "0.4.1"; + version = "0.4.2"; in stdenv.mkDerivation { inherit pname version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "freifunk-gluon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dv0guQTmot5UO1GkMgzvD6uJFyum5kV89LI3xWS1DZA="; + sha256 = "sha256-vGHLAX/XOtePvdT/rljCOdlILHVO20mCt6p+MUi13dg="; }; nativeBuildInputs = with pkgs; [ cmake pkg-config doxygen ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69316e9551c7..b17b75f832d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20221,7 +20221,7 @@ with pkgs; hwloc = callPackage ../development/libraries/hwloc { }; - hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_23; }; + hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_24; }; hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c3a1d9cc3d8..93cc7ac350e8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9421,6 +9421,8 @@ self: super: with self; { opentelemetry-instrumentation-grpc = callPackage ../development/python-modules/opentelemetry-instrumentation-grpc { }; + opentelemetry-instrumentation-logging = callPackage ../development/python-modules/opentelemetry-instrumentation-logging { }; + opentelemetry-instrumentation-psycopg2 = callPackage ../development/python-modules/opentelemetry-instrumentation-psycopg2 { }; opentelemetry-instrumentation-requests = callPackage ../development/python-modules/opentelemetry-instrumentation-requests { };