diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index 769336be3c98..ed2046922d63 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -41,10 +41,6 @@ jobs: run: runs-on: ubuntu-slim if: github.event_name != 'schedule' || github.repository_owner == 'NixOS' - env: - # TODO: Remove after 2026-03-04, when Node 24 becomes the default. - # https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/ - FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true" steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: diff --git a/doc/channels.chapter.md b/doc/channels.chapter.md new file mode 100644 index 000000000000..1b6b28a4382d --- /dev/null +++ b/doc/channels.chapter.md @@ -0,0 +1,26 @@ +# How channels work {#how-channels-work} + +nixpkgs uses the [channels feature](https://nixos.org/nix/manual/#sec-channels) of nix. + +nixpkgs is distributed for users of Nix on non-NixOS distributions through the channel +`nixpkgs-unstable`. Users of NixOS generally use one of the `nixos-*` channels, +e.g. `nixos-22.11`, which includes all packages and modules for the stable NixOS +22.11. Stable NixOS releases are generally only given +security updates. More up to date packages and modules are available via the +`nixos-unstable` channel. + +Both `nixos-unstable` and `nixpkgs-unstable` follow the `master` branch of the +nixpkgs repository, although both do lag the `master` branch by generally +[a couple of days](https://status.nixos.org/). Updates to a channel are +distributed as soon as all tests for that channel pass, e.g. +[this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents) +shows the status of tests for the `nixpkgs-unstable` channel. + +The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/), +which also builds binary packages from the Nix expressions in Nixpkgs for +`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`. +The binaries are made available via a [binary cache](https://cache.nixos.org). + +The current Nix expressions of the channels are available in the +[nixpkgs repository](https://github.com/NixOS/nixpkgs) in branches +that correspond to the channel names (e.g. `nixos-22.11-small`). diff --git a/doc/languages-frameworks/rocq.section.md b/doc/languages-frameworks/rocq.section.md index b93a2b62e33e..6aec9e804c26 100644 --- a/doc/languages-frameworks/rocq.section.md +++ b/doc/languages-frameworks/rocq.section.md @@ -68,7 +68,7 @@ The recommended way of defining a derivation for a Rocq library, is to use the ` * `overrideBuildInputs` (optional) replaces the default list of derivation to which `buildInputs` and `extraBuildInputs` adds extras elements, * `propagatedBuildInputs` (optional) is passed as is to `mkDerivation`, we recommend to use this for Rocq libraries and Rocq plugin dependencies, as this makes sure the paths of the compiled libraries and plugins will always be added to the build environments of subsequent derivation, which is necessary for Rocq packages to work correctly, * `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `rocq-core.ocamlPackages` attribute can be used in `nativeBuildInputs`, `buildInputs`, and `propagatedBuildInputs` to depend on the same package set Rocq was built against. -* `useDuneifVersion` (optional, default to `(x: false)` uses Dune to build the package if the provided predicate evaluates to true on the version, e.g. `useDuneifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, +* `useDuneifVersion` (optional, default to `(x: false)`) uses Dune to build the package if the provided predicate evaluates to true on the version, e.g. `useDuneifVersion = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, * `useDune` (optional, defaults to `false`) uses Dune to build the package if set to true, the presence of this attribute overrides the behavior of the previous one. * `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build. * `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it. diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 91b59e3f0cab..6f1c855df1d9 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -149,6 +149,11 @@ Note: this is not possible anymore for Neovim. ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} +:::{.note} +Before adding a Neovim Lua plugin, check if a release is available on [luarocks](https://luarocks.org/). +If it is, add it as a [LuaRocks based plugin](#neovim-luarocks-based-plugins). +::: + Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`nix-shell -p vimPluginsUpdater --run vim-plugins-updater`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/utils/updater.nix). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). When the vim updater detects an nvim-treesitter update, it also runs [`nvim-treesitter/update.py $(nix-build -A vimPlugins.nvim-treesitter)`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/utils/update.py) to update the tree sitter grammars for `nvim-treesitter`. diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index 30722e9fcdaa..204ccf1fb2dd 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -1,50 +1,14 @@ -# Preface {#preface} +# Overview {#preface} -The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the -[Nix package manager](https://nixos.org/nix/), released under a -[permissive MIT license](https://github.com/NixOS/nixpkgs/blob/master/COPYING). -Packages are available for several platforms, and can be used with the Nix -package manager on most GNU/Linux distributions as well as [NixOS](https://nixos.org/nixos). +Nixpkgs is a set of packages for the [Nix package manager](https://nixos.org/nix/), released under the [MIT license](https://github.com/NixOS/nixpkgs/blob/master/COPYING). -This document is the user [_reference_](https://nix.dev/contributing/documentation/diataxis#reference) manual for Nixpkgs. -It describes the entire public interface of Nixpkgs in a concise and orderly manner, and all relevant behaviors, with examples and cross-references. +Further documentation: -To discover other kinds of documentation: - [nix.dev](https://nix.dev/): Tutorials and guides for getting things done with Nix -- [NixOS **Option Search**](https://search.nixos.org/options) and reference documentation -- [Nixpkgs **Package Search**](https://search.nixos.org/packages) -- [**NixOS** manual](https://nixos.org/manual/nixos/stable/): Reference documentation for the NixOS Linux distribution -- [`CONTRIBUTING.md`](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md): Contributing to Nixpkgs, including this manual - -## Overview of Nixpkgs {#overview-of-nixpkgs} +- [NixOS Search](https://search.nixos.org) +- [Contributing](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md): to Nixpkgs Nix expressions describe how to build packages from source and are collected in -the [Nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the -collection are Nix expressions for -[NixOS modules](https://nixos.org/nixos/manual/index.html#sec-writing-modules). -With these expressions the Nix package manager can build binary packages. +the [nixpkgs repository](https://github.com/NixOS/nixpkgs). -Packages, including the Nix packages collection, are distributed through -[channels](https://nixos.org/nix/manual/#sec-channels). The collection is -distributed for users of Nix on non-NixOS distributions through the channel -`nixpkgs-unstable`. Users of NixOS generally use one of the `nixos-*` channels, -e.g., `nixos-22.11`, which includes all packages and modules for the stable NixOS -22.11. Stable NixOS releases are generally only given -security updates. More up-to-date packages and modules are available via the -`nixos-unstable` channel. - -Both `nixos-unstable` and `nixpkgs-unstable` follow the `master` branch of the -Nixpkgs repository, although both do lag the `master` branch by generally -[a couple of days](https://status.nixos.org/). Updates to a channel are -distributed as soon as all tests for that channel pass, e.g., -[this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents) -shows the status of tests for the `nixpkgs-unstable` channel. - -The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/), -which also builds binary packages from the Nix expressions in Nixpkgs for -`x86_64-linux`, `aarch64-linux`, and `aarch64-darwin`. -The binaries are made available via a [binary cache](https://cache.nixos.org). - -The current Nix expressions of the channels are available in the -[Nixpkgs repository](https://github.com/NixOS/nixpkgs) in branches -that correspond to the channel names (e.g., `nixos-22.11-small`). +Packages are distributed through [channels](#how-channels-work). diff --git a/doc/redirects.json b/doc/redirects.json index 04d844ceaa2c..19ac1ce89977 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -152,6 +152,9 @@ "ghc-deprecation-policy": [ "index.html#ghc-deprecation-policy" ], + "how-channels-work": [ + "index.html#how-channels-work" + ], "inkscape-plugins": [ "index.html#inkscape-plugins" ], @@ -395,9 +398,7 @@ "index.html#pnpm-build-hook-honored-variables" ], "preface": [ - "index.html#preface" - ], - "overview-of-nixpkgs": [ + "index.html#preface", "index.html#overview-of-nixpkgs" ], "part-using": [ diff --git a/doc/using-nixpkgs.md b/doc/using-nixpkgs.md index f850b2e83c28..a8546d0cc0f1 100644 --- a/doc/using-nixpkgs.md +++ b/doc/using-nixpkgs.md @@ -1,6 +1,7 @@ # Using Nixpkgs {#part-using} ```{=include=} chapters +channels.chapter.md using/platform-support.chapter.md using/configuration.chapter.md using/overlays.chapter.md diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 122ea9f1f499..7e4c54b1362a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1598,6 +1598,12 @@ githubId = 153175; name = "Andrew Marshall"; }; + ambiso = { + email = "ambisotopy@gmail.com"; + github = "ambiso"; + githubId = 3750466; + name = "Robin Leander Schröder"; + }; ambossmann = { email = "timogottszky+git@gmail.com"; github = "Ambossmann"; @@ -5238,6 +5244,12 @@ githubId = 1448923; name = "Christian Kauhaus"; }; + ckgxrg = { + email = "ckgxrg@ckgxrg.io"; + github = "ckgxrg-salt"; + githubId = 165614491; + name = "ckgxrg"; + }; cko = { email = "christine.koppelt@gmail.com"; github = "cko"; @@ -13260,12 +13272,6 @@ githubId = 879272; name = "Julio Merino"; }; - jn-sena = { - email = "jn-sena@proton.me"; - github = "jn-sena"; - githubId = 45771313; - name = "Sena"; - }; jnsgruk = { email = "jon@sgrs.uk"; github = "jnsgruk"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 01baaae3e503..7e42800e5db3 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -6,13 +6,13 @@ basexx,,,,,, bcrypt,,,,,,ulysseszhan binaryheap,,,,,,vcunat bit32,,,,,5.1,lblasc -busted,,,,,, +busted,,,,,,alerque busted-htest,,,,,,mrcjkb canola.nvim,,,,,,saadndm cassowary,,,,,,alerque cldr,,,,,,alerque commons.nvim,,,,,5.1,mrcjkb -compat53,,,,,,vcunat +compat53,,,,,,vcunat alerque coop.nvim,,,,,, cosmo,,,,,, coxpcall,,,,1.17.0-1,, @@ -38,7 +38,7 @@ inspect,,,,,, jsregexp,,,,0.0.7-2,, kulala.nvim,,,,,, ldbus,,,https://luarocks.org/dev,,, -ldoc,,,,,, +ldoc,,,,,,alerque lgi,,,,,, linenoise,https://raw.githubusercontent.com/hoelzro/lua-linenoise/master/linenoise-0.9-1.rockspec,,,,, ljsyscall,,,,,5.1,lblasc @@ -62,7 +62,7 @@ lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, lua-ffi-zlib,,,,,, -lua-iconv,,,,7.0.0,, +lua-iconv,,,,7.0.0,,alerque lua-lsp,,,,,, lua-messagepack,,,,,, lua-protobuf,,,,,,lockejan @@ -78,10 +78,10 @@ lua-toml,,,,,, lua-utils.nvim,,,,,,mrcjkb lua-yajl,,,,,,pstn lua-zlib,,,,,,koral -lua_cliargs,,,,,, +lua_cliargs,,,,,,alerque luabitop,https://raw.githubusercontent.com/teto/luabitop/master/luabitop-1.0.2-3.rockspec,,,,, -luacheck,,,,,, -luacov,,,,,, +luacheck,,,,,,alerque +luacov,,,,,,alerque luacov-reporter-lcov,,,,,,ulysseszhan luadbi,,,,,, luadbi-mysql,,,,,, @@ -91,7 +91,7 @@ luaepnf,,,,,, luaevent,,,,,, luaexpat,,,,,,arobyn flosse luaffi,,,https://luarocks.org/dev,,, -luafilesystem,,,,,,flosse +luafilesystem,,,,,,flosse alerque lualdap,,,,,,aanderse lualine.nvim,,,https://luarocks.org/dev,,, lualogging,,,,,, @@ -104,12 +104,12 @@ luarocks-build-rust-mlua,,,,,,mrcjkb luarocks-build-tree-sitter-cli,,,,,, luarocks-build-treesitter-parser,,,,,,mrcjkb luarocks-build-treesitter-parser-cpp,,,,,,mrcjkb -luasec,,,,,,flosse +luasec,,,,,,flosse alerque luasnip,,,,,, -luasocket,,,,,, +luasocket,,,,,,alerque luasql-sqlite3,,,,,, -luassert,,,,,, -luasystem,,,,,, +luassert,,,,,,alerque +luasystem,,,,,,alerque luatext,,,,,, luaunbound,,,,,, luaunit,,,,,,lockejan @@ -159,7 +159,7 @@ rocks-git.nvim,,,,,5.1,mrcjkb rocks.nvim,,,,,5.1,mrcjkb rtp.nvim,,,,,5.1,mrcjkb rustaceanvim,,,,,5.1,mrcjkb -say,,,,,, +say,,,,,,alerque serpent,,,,,,lockejan sofa,,,,,,f4z3r sqlite,,,,,, diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 12cfdd1d9063..27be44d30b25 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -2306,6 +2306,9 @@ "test-opt-meta.hydraPlatforms": [ "index.html#test-opt-meta.hydraPlatforms" ], + "test-opt-meta.teams": [ + "index.html#test-opt-meta.teams" + ], "test-opt-meta.timeout": [ "index.html#test-opt-meta.timeout" ], diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 15365b49c57e..0f0c252654b1 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -154,3 +154,5 @@ - If [`system.stateVersion`](#opt-system.stateVersion) is >=26.05, `pkgs.nextcloud33` will be installed by default. - If [`system.stateVersion`](#opt-system.stateVersion) is >=25.11, `pkgs.nextcloud32` will be installed by default. - Please note that Nextcloud prohibits skipping major versions while upgrading. You can upgrade to specific versions by declaring `services.nextcloud.package = pkgs.nextcloud33;`. + +- `trilium-desktop` and `trilium-server` have been updated to 0.104.0. This release includes security hardening fixes that may break functionality. [See upstream release note for details](https://github.com/TriliumNext/Trilium/releases/tag/v0.104.0). diff --git a/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix index 1e8f37cf9b51..2194c04f4eda 100644 --- a/nixos/lib/testing/meta.nix +++ b/nixos/lib/testing/meta.nix @@ -1,6 +1,20 @@ -{ lib, ... }: +{ lib, options, ... }: let inherit (lib) types mkOption literalMD; + + # Approximate position of meta.teams / meta.maintainers in nixos tests. + # Right now this assumes only one such position and ignores other definitions. + # FIXME allow having multiple `maintainersPosition` et al.. + getPosition = + definitionsWithLocations: + if definitionsWithLocations == [ ] then + null + else + { + file = (lib.head definitionsWithLocations).file; + column = 0; + line = 1; + }; in { options = { @@ -12,7 +26,7 @@ in ''; apply = lib.filterAttrs (k: v: v != null); type = types.submodule ( - { config, ... }: + { options, config, ... }: { options = { maintainers = mkOption { @@ -22,6 +36,25 @@ in The [list of maintainers](https://nixos.org/manual/nixpkgs/stable/#var-meta-maintainers) for this test. ''; }; + maintainersPosition = mkOption { + internal = true; + readOnly = true; + type = types.nullOr types.attrs; + default = getPosition options.maintainers.definitionsWithLocations; + }; + teams = mkOption { + type = types.listOf types.raw; + default = [ ]; + description = '' + The [list of maintainer-teams](https://nixos.org/manual/nixpkgs/stable/#var-meta-teams) for this test. + ''; + }; + teamsPosition = mkOption { + internal = true; + readOnly = true; + type = types.nullOr types.attrs; + default = getPosition options.teams.definitionsWithLocations; + }; timeout = mkOption { type = types.nullOr types.int; default = 3600; # 1 hour diff --git a/nixos/modules/security/account-utils.nix b/nixos/modules/security/account-utils.nix index bd2bf08f55b2..42daaf188ca6 100644 --- a/nixos/modules/security/account-utils.nix +++ b/nixos/modules/security/account-utils.nix @@ -6,6 +6,7 @@ }: let cfg = config.security.account-utils; + format = pkgs.formats.ini { }; in { options.security.account-utils = { @@ -25,6 +26,16 @@ in ::: ''; }; + pwaccessd.settings = lib.mkOption { + description = '' + Options for pwaccessd. + See {manpage}`pwaccessd.conf(5)` for available options. + ''; + type = lib.types.submodule { + freeformType = format.type; + }; + default = { }; + }; }; config = lib.mkIf cfg.enable { @@ -44,6 +55,8 @@ in }; environment.systemPackages = [ cfg.package ]; + environment.etc."account-utils/pwaccessd.conf".source = + format.generate "pwaccessd.conf" cfg.pwaccessd.settings; security.pam.services = { pwupd-passwd = { }; diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index c6d5c9337e10..ea912d70b0af 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -421,7 +421,7 @@ in { name = "unix"; control = "sufficient"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; @@ -567,7 +567,7 @@ in { name = "unix"; control = "sufficient"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; @@ -575,7 +575,7 @@ in { name = "unix"; control = "requisite"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; settings.nullok = true; settings.yescrypt = true; } diff --git a/nixos/modules/services/display-managers/plasma-login-manager.nix b/nixos/modules/services/display-managers/plasma-login-manager.nix index 65a16671bda0..b0d2fb01b76e 100644 --- a/nixos/modules/services/display-managers/plasma-login-manager.nix +++ b/nixos/modules/services/display-managers/plasma-login-manager.nix @@ -201,7 +201,7 @@ in # Setup session name = "unix"; control = "required"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } { name = "systemd"; diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix index 38725bf280f5..11a1089b4598 100644 --- a/nixos/modules/services/display-managers/sddm.nix +++ b/nixos/modules/services/display-managers/sddm.nix @@ -442,7 +442,7 @@ in { name = "unix"; control = "sufficient"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; diff --git a/nixos/modules/services/networking/llama-swap.nix b/nixos/modules/services/networking/llama-swap.nix index 3739e1b3f5de..b1ca322756db 100644 --- a/nixos/modules/services/networking/llama-swap.nix +++ b/nixos/modules/services/networking/llama-swap.nix @@ -42,6 +42,15 @@ in ''; }; + useLlamaCppCacheDir = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to use {file}`/var/cache/llama-cpp` as {env}`LLAMA_CACHE` instead + of {file}`/var/cache/llama-swap` to share models and other cache with {option}`services.llama-cpp`. + ''; + }; + tls = { enable = lib.mkEnableOption "TLS encryption"; @@ -113,6 +122,10 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + environment = { + LLAMA_CACHE = lib.mkDefault "/var/cache/${config.systemd.services.llama-swap.serviceConfig.CacheDirectory}"; + }; + serviceConfig = { Type = "exec"; ExecStart = "${lib.getExe cfg.package} ${ @@ -130,6 +143,12 @@ in Restart = "on-failure"; RestartSec = 3; + CacheDirectory = + if cfg.useLlamaCppCacheDir then + config.systemd.services.llama-cpp.serviceConfig.CacheDirectory + else + "llama-swap"; + # for GPU acceleration PrivateDevices = false; diff --git a/nixos/modules/services/networking/tetrd.nix b/nixos/modules/services/networking/tetrd.nix index 77cf6722e404..18414c92d1dc 100644 --- a/nixos/modules/services/networking/tetrd.nix +++ b/nixos/modules/services/networking/tetrd.nix @@ -5,13 +5,19 @@ ... }: +let + cfg = config.services.tetrd; +in { - options.services.tetrd.enable = lib.mkEnableOption "tetrd"; + options.services.tetrd = { + enable = lib.mkEnableOption "tetrd"; + package = lib.mkPackageOption pkgs "tetrd" { }; + }; - config = lib.mkIf config.services.tetrd.enable { + config = lib.mkIf cfg.enable { environment = { - systemPackages = [ pkgs.tetrd ]; - etc."resolv.conf".source = "/etc/tetrd/resolv.conf"; + systemPackages = [ cfg.package ]; + # etc."resolv.conf".source = "/etc/tetrd/resolv.conf"; # Disabled overwriting of resolve.conf since otherwise tetrd disables your dns when its not connected to a device. }; # Our resolv.conf will override resolvconf's version. @@ -21,11 +27,11 @@ tmpfiles.rules = [ "f /etc/tetrd/resolv.conf - - -" ]; services.tetrd = { - description = pkgs.tetrd.meta.description; + description = cfg.package.meta.description; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.tetrd}/opt/Tetrd/bin/tetrd"; + ExecStart = "${cfg.package}/opt/Tetrd/bin/tetrd"; Restart = "always"; RuntimeDirectory = "tetrd"; RootDirectory = "/run/tetrd"; diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 931fac1123c6..c52434c46a11 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -214,7 +214,7 @@ in { name = "unix"; control = "required"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; session = utils.pam.autoOrderRules [ @@ -230,7 +230,7 @@ in { name = "unix"; control = "required"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } { name = "systemd"; diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index 006520ea9b63..a084de9b7383 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/nixos/modules/services/wayland/cage.nix @@ -113,7 +113,7 @@ in { name = "unix"; control = "required"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; settings.nullok = true; } ]; @@ -121,14 +121,14 @@ in { name = "unix"; control = "required"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; session = utils.pam.autoOrderRules [ { name = "unix"; control = "required"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } { name = "env"; diff --git a/nixos/modules/services/web-apps/bentopdf.nix b/nixos/modules/services/web-apps/bentopdf.nix index bf03beccc938..5281bf4efdcf 100644 --- a/nixos/modules/services/web-apps/bentopdf.nix +++ b/nixos/modules/services/web-apps/bentopdf.nix @@ -60,7 +60,7 @@ in services.nginx = lib.mkIf cfg.nginx.enable { enable = lib.mkDefault true; virtualHosts."${cfg.domain}" = lib.mkMerge [ - cfg.nginx.virtualHost + (lib.mapAttrsRecursive (_: lib.mkDefault) cfg.nginx.virtualHost) { root = lib.mkForce "${cfg.package}"; @@ -82,7 +82,7 @@ in services.caddy = lib.mkIf cfg.caddy.enable { enable = lib.mkDefault true; virtualHosts."${cfg.domain}" = lib.mkMerge [ - cfg.caddy.virtualHost + (lib.mapAttrsRecursive (_: lib.mkDefault) cfg.caddy.virtualHost) { hostName = lib.mkForce cfg.domain; extraConfig = '' diff --git a/nixos/modules/services/web-apps/flarum.nix b/nixos/modules/services/web-apps/flarum.nix index c4c05826d8cd..1c7065c910bc 100644 --- a/nixos/modules/services/web-apps/flarum.nix +++ b/nixos/modules/services/web-apps/flarum.nix @@ -10,16 +10,23 @@ with lib; let cfg = config.services.flarum; + # Only placeholders reach the world-readable Nix store; the install + # script substitutes the real secrets at runtime. flarumInstallConfig = pkgs.writeText "config.json" ( builtins.toJSON { debug = false; offline = false; baseUrl = cfg.baseUrl; - databaseConfiguration = cfg.database; + databaseConfiguration = + cfg.database + // optionalAttrs (cfg.databasePasswordFile != null) { + password = "@databasePassword@"; + }; adminUser = { username = cfg.adminUser; - password = cfg.initialAdminPassword; + password = + if cfg.initialAdminPasswordFile != null then "@adminPassword@" else cfg.initialAdminPassword; email = cfg.adminEmail; }; settings = { @@ -69,7 +76,26 @@ in initialAdminPassword = mkOption { type = types.str; default = "flarum"; - description = "Initial password for the adminUser"; + description = '' + Initial password for the adminUser. + + WARNING: This is stored world-readable in the Nix store. + Use {option}`initialAdminPasswordFile` instead. + ''; + }; + + initialAdminPasswordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/secrets/flarum-admin-password"; + description = '' + File containing the initial password for adminUser. + Must be readable by the flarum user. + Takes precedence over {option}`initialAdminPassword`. + + The password must not contain `"` or `\` characters, as it is + substituted into a JSON installation config verbatim. + ''; }; user = mkOption { @@ -98,7 +124,12 @@ in bool int ]); - description = "MySQL database parameters"; + description = '' + MySQL database parameters. + + WARNING: A `password` set here is stored world-readable in the + Nix store. Use {option}`databasePasswordFile` instead. + ''; default = { # the database driver; i.e. MySQL; MariaDB... driver = "mysql"; @@ -118,6 +149,20 @@ in }; }; + databasePasswordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/secrets/flarum-db-password"; + description = '' + File containing the database password. + Must be readable by the flarum user. + Takes precedence over `database.password`. + + The password must not contain `"` or `\` characters, as it is + substituted into a JSON installation config verbatim. + ''; + }; + createDatabaseLocally = mkOption { type = types.bool; default = false; @@ -210,6 +255,8 @@ in Type = "oneshot"; User = cfg.user; Group = cfg.group; + # The secret-filled install config is staged in /tmp + PrivateTmp = true; }; path = [ config.services.phpfpm.phpPackage ]; script = '' @@ -222,7 +269,18 @@ in '' + optionalString (cfg.createDatabaseLocally && cfg.database.driver == "mysql") '' if [ ! -f config.php ]; then - php flarum install --file=${flarumInstallConfig} + install -m 0600 ${flarumInstallConfig} /tmp/flarum-install.json + ${optionalString (cfg.initialAdminPasswordFile != null) '' + ${pkgs.replace-secret}/bin/replace-secret '@adminPassword@' \ + ${escapeShellArg cfg.initialAdminPasswordFile} /tmp/flarum-install.json + ''} + ${optionalString (cfg.databasePasswordFile != null) '' + ${pkgs.replace-secret}/bin/replace-secret '@databasePassword@' \ + ${escapeShellArg cfg.databasePasswordFile} /tmp/flarum-install.json + ''} + php flarum install --file=/tmp/flarum-install.json + # config.php contains the database password; stateDir is world-readable + chmod 600 config.php fi '' + '' diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 2ff45efd4e43..d707a6c4635c 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -448,8 +448,8 @@ in ''; # https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes - boot.kernel.sysctl."net.core.rmem_max" = mkDefault 2500000; - boot.kernel.sysctl."net.core.wmem_max" = mkDefault 2500000; + boot.kernel.sysctl."net.core.rmem_max" = mkDefault 7500000; + boot.kernel.sysctl."net.core.wmem_max" = mkDefault 7500000; systemd.packages = [ cfg.package ]; systemd.services.caddy = { diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 699a9a9a07f3..3561d4877451 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -362,7 +362,7 @@ in { name = "unix"; control = "sufficient"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; @@ -446,7 +446,7 @@ in { name = "unix"; control = "sufficient"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; @@ -454,7 +454,7 @@ in { name = "unix"; control = "requisite"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; settings.nullok = true; settings.yescrypt = true; } diff --git a/nixos/tests/flarum.nix b/nixos/tests/flarum.nix index 17c7df02f44c..cbebe29c0c3c 100644 --- a/nixos/tests/flarum.nix +++ b/nixos/tests/flarum.nix @@ -10,7 +10,7 @@ }; nodes.machine = - { ... }: + { pkgs, ... }: { # Flarum installs and migrates the database on first boot and runs a # MariaDB server alongside PHP-FPM and nginx, so give the VM some headroom. @@ -28,8 +28,11 @@ adminUser = "admin"; adminEmail = "admin@example.com"; - # Flarum rejects admin passwords shorter than 8 characters. - initialAdminPassword = "flarum-admin-password"; + # The trailing newline matches how secret managers typically write files. + initialAdminPasswordFile = "${pkgs.writeText "admin-pass" "flarum-admin-password\n"}"; + # MariaDB authenticates via unix socket and never checks this password; + # setting it still exercises the substitution path. + databasePasswordFile = "${pkgs.writeText "db-pass" "flarum-db-password\n"}"; }; }; @@ -48,5 +51,23 @@ # The admin API endpoint should respond, confirming the app booted cleanly. machine.succeed("curl -sf http://localhost/api -o /dev/null") + + # Only the placeholders may appear in the install config in the Nix store. + machine.succeed("grep -q '@adminPassword@' /nix/store/*-config.json") + machine.succeed("grep -q '@databasePassword@' /nix/store/*-config.json") + machine.fail("grep -qe 'flarum-admin-password' -e 'flarum-db-password' /nix/store/*-config.json") + + # A successful login proves the admin password was substituted intact. + machine.succeed( + "curl -sf http://localhost/api/token " + + "-H 'Content-Type: application/json' " + + "-d '{\"identification\": \"admin\", \"password\": \"flarum-admin-password\"}' " + + "| grep -F token" + ) + + # The database password must arrive intact in config.php, which must + # not be world-readable. + machine.succeed("grep -q 'flarum-db-password' /var/lib/flarum/config.php") + machine.succeed("[ $(stat -c %a /var/lib/flarum/config.php) = 600 ]") ''; } diff --git a/nixos/tests/login-nosuid.nix b/nixos/tests/login-nosuid.nix index 1f00c37d0886..f5582382891f 100644 --- a/nixos/tests/login-nosuid.nix +++ b/nixos/tests/login-nosuid.nix @@ -11,7 +11,12 @@ { security.enableWrappers = false; systemd.settings.Manager.NoNewPrivileges = true; - security.account-utils.enable = true; + security.account-utils = { + enable = true; + pwaccessd.settings = { + ExpiredCheck.SpMin = true; + }; + }; users.mutableUsers = true; security.account-utils.extraArgs = [ "-v" @@ -46,6 +51,9 @@ print(f"passwd path is: {passwd_path}") assert "account-utils" in passwd_path + with subtest("config file exists"): + machine.succeed("ls /etc/account-utils/pwaccessd.conf") + with subtest("create user"): machine.succeed("useradd -m alice") machine.succeed("(echo foobar; echo foobar) | passwd alice") diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 7778fed0e1c2..d596c8b20be0 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -13,6 +13,7 @@ makeDesktopItem, makeWrapper, p7zip, + gnutar, writeShellScript, }: let @@ -46,9 +47,17 @@ let pname = "pianoteq-${name}"; - unpackPhase = '' - ${p7zip}/bin/7z x $src - ''; + unpackPhase = + if lib.hasSuffix ".7z" src then + '' + ${p7zip}/bin/7z x $src + '' + else if lib.hasSuffix ".tar.xz" src then + '' + ${gnutar}/bin/tar -xf $src + '' + else + throw "unexpected file format"; nativeBuildInputs = [ autoPatchelfHook @@ -243,6 +252,7 @@ let version6 = "6.7.3"; version7 = "7.5.4"; version8 = "8.4.0"; + version9 = "9.1.2"; mkStandard = version: hash: @@ -292,8 +302,35 @@ let inherit hash; }; }; + mkTrial9 = + hash: + mkPianoteq { + name = "trial"; + version = version9; + mainProgram = "Pianoteq 9"; + startupWMClass = "Pianoteq Trial"; + src = fetchPianoteqTrial { + name = "pianoteq_trial_v${versionForFile version9}.tar.xz"; + inherit hash; + }; + }; + mkStage9 = + hash: + mkPianoteq { + name = "stage"; + version = version9; + mainProgram = "Pianoteq 9 STAGE"; + startupWMClass = "Pianoteq STAGE"; + src = fetchPianoteqWithLogin { + name = "pianoteq_setup_v${versionForFile version9}.tar.xz"; + inherit hash; + }; + }; in { + trial_9 = mkTrial9 "sha256-1ofPL6F12Gv+k2rZBadOa5Iyukuji6vdww87ufdKjM8="; + stage_9 = mkStage9 "sha256-Jvm/AhBwgj5INW8U48rJjgDB7j/Z1VnYKczvtrpl/AY="; + standard_8 = mkStandard version8 "sha256-ZDGB/SOOz+sWz7P+sNzyaipEH452n8zq5LleO3ztSXc="; stage_8 = mkStage version8 ""; standard-trial_8 = mkStandardTrial version8 "sha256-K3LbAWxciXt9hVAyRayxSoE/IYJ38Fd03+j0s7ZsMuw="; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index cc8c6e00da6f..fa043d3cdb9e 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -16,9 +16,9 @@ let inherit tiling_wm; }; stableVersion = { - version = "2026.1.1.10"; # "Android Studio Quail 1 | 2026.1.1 Patch 2" - sha256Hash = "sha256-+9PxFtEsrtck6o2g0s2ufnkRcPefKqESc+oPLSKiJNw="; - url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.10/android-studio-quail1-patch2-linux.tar.gz"; + version = "2026.1.2.10"; # "Android Studio Quail 2 | 2026.1.2" + sha256Hash = "sha256-ZERaVAkucFbG638aia0RbQ/uwu9flluOWU1iq9tYWQ8="; + url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.10/android-studio-quail2-linux.tar.gz"; }; betaVersion = { version = "2026.1.3.5"; # "Android Studio Quail 3 | 2026.1.3 RC 1" diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index cbd1d9c429a9..48a9cc723fa3 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -446,12 +446,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "0-unstable-2026-07-07"; + version = "0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "e954496f8ef22904e8a84f5078f4a110fdc7a0d3"; - hash = "sha256-b8HOclkr3FoCNUDJ6f0ULsfyiQB38+9PNxl0CibVL60="; + rev = "e520902f405da5f5ad392d32babad5b5dd5ffa44"; + hash = "sha256-zNXm/0W+Hv562zt6NxHnFuO2nBxjX5dlxS7pRB+KXQY="; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -1050,12 +1050,12 @@ final: prev: { artio-nvim = buildVimPlugin { pname = "artio.nvim"; - version = "0-unstable-2026-06-23"; + version = "0-unstable-2026-07-17"; src = fetchFromGitHub { owner = "comfysage"; repo = "artio.nvim"; - rev = "52a074e6a15780df350c03b5c7ab47f706fe6da8"; - hash = "sha256-8hbFtJXpkH1L2ZI6Rv9HTQcseog77yf78Wc/9WsvzPA="; + rev = "19d71f8d9c721872e97aa0e5f094041c96f3feca"; + hash = "sha256-X1QXSoowhgs+uhO1T9OtaSXhAryzLCzGfHNgCFiO3is="; }; meta.homepage = "https://github.com/comfysage/artio.nvim/"; meta.license = getLicenseFromSpdxId "EUPL-1.2"; @@ -1414,12 +1414,12 @@ final: prev: { autoclose-nvim = buildVimPlugin { pname = "autoclose.nvim"; - version = "0-unstable-2026-03-22"; + version = "0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "bafd0368716216fa6a7bb2a43ecd889b44efdb46"; - hash = "sha256-DOKKyaDmfUPRTcXJvqD+0zAr63+93H0auax6Dse0Igo="; + rev = "27063904b2238ce7867e430885b6abcfb08357ea"; + hash = "sha256-BjNP8Facn3Cy/EHYioUB9mXb19sBzBeSCY1xTpPOWG8="; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -1638,12 +1638,12 @@ final: prev: { base46 = buildVimPlugin { pname = "base46"; - version = "0-unstable-2026-07-11"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "cbb71c6cb56f53b30ab1a95a6d277f7e0524025b"; - hash = "sha256-QG9FcdlCKYXzncvDt47RQQGyJ2ARt1N+ec75qtc7gSk="; + rev = "8d059b82367160cd530253afbbcd20dc4b34129f"; + hash = "sha256-wW6UidkM6avqQVhPEgRtDXgxHsMdD+IM01A5ABebYT4="; }; meta.homepage = "https://github.com/nvchad/base46/"; meta.license = unfree; @@ -1946,12 +1946,12 @@ final: prev: { blink-cmp-tmux = buildVimPlugin { pname = "blink-cmp-tmux"; - version = "0-unstable-2026-02-11"; + version = "0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "mgalliou"; repo = "blink-cmp-tmux"; - rev = "1ef35d8e388475ab8eaeecfc12e196c78bd5de04"; - hash = "sha256-enoPsYF8llGShf+sx6rLYYnLLzrd+jdCdZ4gy9A2lKU="; + rev = "112ddbf2e09d9cb4736de70dd01eb9654cf01d70"; + hash = "sha256-7Wj7bIg7vAOz0OygISORRphsEV6RcsR6m/S2tRyzEpU="; }; meta.homepage = "https://github.com/mgalliou/blink-cmp-tmux/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -2254,12 +2254,12 @@ final: prev: { bullets-vim = buildVimPlugin { pname = "bullets.vim"; - version = "2.0.0-unstable-2026-06-03"; + version = "2.0.0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "bullets-vim"; repo = "bullets.vim"; - rev = "3f667eeca58bd4ba411b41edefef51e7fed1a2b1"; - hash = "sha256-fq3ATtCeXeq3CR97KbEu8mOEF8CtpEt7z8z3OO5IQQY="; + rev = "81570b98ca44b4100b3ddcf8d9ca74b9a9b0c884"; + hash = "sha256-yTxXXnVyk/vbr+tWD9RquJvk2ksa8Okuhg3NnyeBp3o="; }; meta.homepage = "https://github.com/bullets-vim/bullets.vim/"; meta.license = unfree; @@ -3568,12 +3568,12 @@ final: prev: { codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "19.19.0"; + version = "19.20.0"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - tag = "v19.19.0"; - hash = "sha256-1ypjttA0T6wnVrqBaiqGtcJnqiyhxeg2EXh7O9nPBpE="; + tag = "v19.20.0"; + hash = "sha256-vDKbjW9izNruCLiPRQEs+yoOrA+YkuyvmdovFTY4nfw="; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -4185,12 +4185,12 @@ final: prev: { coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "0-unstable-2026-07-12"; + version = "0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "0b2b0db07b0426441ece46988d9ab28088f07cd5"; - hash = "sha256-SjAiNoeAxuu2UFHupUnDtjrPtGqAiFdHoq21Qn35OVA="; + rev = "83580b587f6fc50568ec61ae79e18762fcf35c17"; + hash = "sha256-OKlZh1FKIk4DhyAtc0rSnEOZoa75NQKRtdFYDjkTZPE="; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -4605,12 +4605,12 @@ final: prev: { ddc-source-lsp = buildVimPlugin { pname = "ddc-source-lsp"; - version = "1.2.0-unstable-2026-06-12"; + version = "1.2.0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-source-lsp"; - rev = "7718b6d9539ebddc18e961f90ff1aca7975ffe5c"; - hash = "sha256-2JVCuFXc6mtXUDEB1lVgWC2q38kvwr9tyjKO/Z4iY9k="; + rev = "2f476ae123bea5b3583f9d4ca141f63981e70b06"; + hash = "sha256-2rMdU1FUP4HJP2o2MtL93po/FmloMzZ/sqeQWHPP55g="; }; meta.homepage = "https://github.com/Shougo/ddc-source-lsp/"; meta.license = unfree; @@ -7171,12 +7171,12 @@ final: prev: { hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "1.2.0-unstable-2025-09-13"; + version = "1.2.0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "b4e431934af1fe224a3a801f632c008278cb7628"; - hash = "sha256-Jy9ARUHU1ySpSxxoS3hLRjxp5Lqt7juWN5Jnbdo0rg0="; + rev = "244753782b945def87472d8f4e9e6a9d4ec18689"; + hash = "sha256-Zers7vdGRGy8n520G9uMuHwMAP3STHqU5d5a2Ln9rDQ="; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -8375,12 +8375,12 @@ final: prev: { kitty-scrollback-nvim = buildVimPlugin { pname = "kitty-scrollback.nvim"; - version = "9.2.0"; + version = "9.2.1"; src = fetchFromGitHub { owner = "mikesmithgh"; repo = "kitty-scrollback.nvim"; - tag = "v9.2.0"; - hash = "sha256-M/sd8lUv7leapzI3uD0VNkMAwaFhPmXsktFnHMPJz0U="; + tag = "v9.2.1"; + hash = "sha256-8IkvoJ8nTlP5WCqMpJqUhBsz7OYB/Mlp1lH5TJRpvOE="; }; meta.homepage = "https://github.com/mikesmithgh/kitty-scrollback.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -11034,12 +11034,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "1.4.0-unstable-2026-07-16"; + version = "1.4.0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "50bdc4130d9e30d28d0b209544d49ee472f6bf12"; - hash = "sha256-hsYouOS+ImmA6HnwqFRq3RMBTsn87oHrnijMqvargU4="; + rev = "1246df7a5d1811d84212f11edb43550cd8380ebd"; + hash = "sha256-hlQf+xJ+/9OTqp5VtPsNE7QW6uVjWeUkqQ8r1u6MWkI="; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -11118,12 +11118,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "3.0.0-unstable-2026-07-15"; + version = "3.0.0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "95295edaa26e8e8db5a9bc4119256e602311c6bc"; - hash = "sha256-hAswp9Ba5xfFfBS+NKjLOoSky+SRrLfd8fdFC46Dq2s="; + rev = "f8674ec894315c02449b61c9de9a116c5aafeb90"; + hash = "sha256-ETu9zy2In3M8/3fqYUfTRt0mKiocm3paJFjgQ82Yj3I="; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12142,12 +12142,12 @@ final: prev: { none-ls-extras-nvim = buildVimPlugin { pname = "none-ls-extras.nvim"; - version = "0-unstable-2026-06-06"; + version = "0-unstable-2026-07-17"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls-extras.nvim"; - rev = "27681d797a26f1b4d6119296df42f5204c88a2dc"; - hash = "sha256-GZLT8X1eLeSkiV5EN1nOkCQg5nwNATURi/KMj90i40I="; + rev = "9a8b8a9aeb43382e5aaf49b00b7cfb5d42d32118"; + hash = "sha256-YmDhDUqSJPOllXzkyrVUgnshrI5+Kt5Te8tEmnjOAVQ="; }; meta.homepage = "https://github.com/nvimtools/none-ls-extras.nvim/"; meta.license = getLicenseFromSpdxId "Unlicense"; @@ -12268,12 +12268,12 @@ final: prev: { nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "0-unstable-2026-07-11"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "28019401865beffcedc744bb1506d0201b88f2f9"; - hash = "sha256-QKBDxZzEQKGzHOVJmS9D9i9h2/0HubbgUlAvaA7Erh0="; + rev = "222c8cc1ad66076c05b7c9d0695781ebe3799d88"; + hash = "sha256-SKSRwXi0KdJtWkmak1LLwXIUukwIhMxKHy9HIMnu0DQ="; }; meta.homepage = "https://github.com/nvchad/ui/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -13746,12 +13746,12 @@ final: prev: { nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "0.10.0-unstable-2026-04-03"; + version = "0.10.0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "4916d6592ede8c07973490d9322f187e07dfefac"; - hash = "sha256-PQR6tFt4lCrAZNQG7BLMD1IiCKja9wDS1S4laGJf/HE="; + rev = "7248feaca45e4d944591497964bc19afa89ad1c6"; + hash = "sha256-FQj0+qeaW9rLy3dUbGbUG4UYtnry7UBA1n9SM2qXLdk="; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -13858,12 +13858,12 @@ final: prev: { nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "0-unstable-2026-04-07"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "851e865342e5a4cb1ae23d31caf6e991e1c99f1e"; - hash = "sha256-fOpRElIwvsFWm4AwETx7fpC3RtdH2BpCfX4YHVitqw0="; + rev = "898ee307df58f854d11cd7edd06472574d48014e"; + hash = "sha256-naZ+p5RrC+uUyFRaksmozDfNgJRifff+9TDWx79DCPk="; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -14170,8 +14170,8 @@ final: prev: { src = fetchFromGitHub { owner = "tarides"; repo = "ocaml.nvim"; - rev = "e12ded73f461d392cc2cad579a39733ebe34de61"; - hash = "sha256-3NiRM02g7BU+MzCybSfsyZdODcPA+RbuNU9QOmmoCxo="; + rev = "d74934117fb7a513e64601ad1d1b53a34b00b01f"; + hash = "sha256-zJJZP8jxa7e9Fn0N8JFzfP3d2TElkASFt8ptaWCOYpM="; }; meta.homepage = "https://github.com/tarides/ocaml.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -15148,12 +15148,12 @@ final: prev: { project-nvim = buildVimPlugin { pname = "project.nvim"; - version = "5.1.1-1"; + version = "5.2.0-1"; src = fetchFromGitHub { owner = "DrKJeff16"; repo = "project.nvim"; - tag = "v5.1.1-1"; - hash = "sha256-NmkKA9AH1uOgHSQT9S8RIFQrkrhkDvpKIfDqHGfzoFI="; + tag = "v5.2.0-1"; + hash = "sha256-p/p7VxmuNusgUXtPpiCGa+BSgDDS/yKvtAV93cKmIEg="; }; meta.homepage = "https://github.com/DrKJeff16/project.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -16255,12 +16255,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2.1.0-unstable-2026-07-10"; + version = "2.1.0-unstable-2026-07-18"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "9493405fb8ee683aa6efd50c529f6296ad8f40ad"; - hash = "sha256-cMPRVxFMBVRpIcy7kCQyoXzgsIFJJ1cDgAcvOm9FNnI="; + rev = "de39b4d75695e2377401c7d05f896657637d244b"; + hash = "sha256-Xqnre4RfIID/m8hXUpcMrsLssjfp/cbSpG24cory2BI="; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -16269,12 +16269,12 @@ final: prev: { smartcolumn-nvim = buildVimPlugin { pname = "smartcolumn.nvim"; - version = "1.1.1-unstable-2025-07-21"; + version = "1.1.1-unstable-2026-07-20"; src = fetchFromGitHub { owner = "m4xshen"; repo = "smartcolumn.nvim"; - rev = "b9cdbdf42f7ac5a659204cd5926017c7ff724a19"; - hash = "sha256-QAb0O/ZwTVogRyTK8+Y4ORaN6nVaeYepKgfSCF/fIPU="; + rev = "5351ae24e992a397d2abac48b7774dc8ef0acf40"; + hash = "sha256-+ICVS16n0CFWbTqBzGkvxQohyYiAvr6gIxZqura3PUw="; }; meta.homepage = "https://github.com/m4xshen/smartcolumn.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -21136,12 +21136,12 @@ final: prev: { vim-go = buildVimPlugin { pname = "vim-go"; - version = "1.29-unstable-2026-07-08"; + version = "1.29-unstable-2026-07-18"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "551d423ba27915d96721c8709702edd23bc2bb48"; - hash = "sha256-ps2QQ6xyQpvfCZ+tTUTzBt3kxu7+VtDcvLnH2HS8pRY="; + rev = "d69962d20a2a60e4bdc92a2281e5f0aaaa109635"; + hash = "sha256-tXA45Hhnr9Vv4p6MyNAxj2SOC+P8eGkIEVE8PDnyFx4="; }; meta.homepage = "https://github.com/fatih/vim-go/"; meta.license = unfree; @@ -21922,12 +21922,12 @@ final: prev: { vim-just = buildVimPlugin { pname = "vim-just"; - version = "0-unstable-2026-07-11"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "b3301b091c730061a6da1f9fab670eece6af187c"; - hash = "sha256-ZcrnrD8ZHb76U1SrjEGlDLSr54WbtAyqjeooj8y0tug="; + rev = "d9aa6784fe3a870e78ba82b5d176c0c5745e23f7"; + hash = "sha256-/QrVhax5PTidfSi6WAxJNX4mbBhUGFZLlG3WsqoT2Ro="; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -22230,12 +22230,12 @@ final: prev: { vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "0.0.1-unstable-2026-07-11"; + version = "0.0.1-unstable-2026-07-16"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "1b1803c4ae35ef8fecaaea1e6580ee700278804f"; - hash = "sha256-kGQZWrg6tf5j/iHfTIKiQC/JZJRoKbKxMYzfhERvN+8="; + rev = "22d06c9e4b620d5c2f055aec590dec6d383e5316"; + hash = "sha256-LiWvL9QpZFPUH+Uek19ce6/e8B6uATmje/emUvyLWJk="; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -25267,12 +25267,12 @@ final: prev: { vimtex = buildVimPlugin { pname = "vimtex"; - version = "2.17-unstable-2026-07-05"; + version = "2.17-unstable-2026-07-18"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "a5949d2800c1866c878956d49c51fc8d003c6b99"; - hash = "sha256-P7zDZBNy2WivNbwCURpS3zTNd5nXenYu2PZEbyWnbCY="; + rev = "6368e31fdaf766ff908a2c06e9ee14fc66dec409"; + hash = "sha256-/0DoAJ3Iv8eJlRqNodumYqllY+4c3zv+oY1EpbvC8ak="; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -26025,12 +26025,12 @@ final: prev: { zen-nvim = buildVimPlugin { pname = "zen.nvim"; - version = "0-unstable-2026-04-17"; + version = "0-unstable-2026-07-18"; src = fetchFromGitHub { owner = "sand4rt"; repo = "zen.nvim"; - rev = "8d77a06063d74393ace9a984f32c4c158dcef6ba"; - hash = "sha256-1zLxgs1EqAoGrjIr26awTFZ+NS06Ph/SDQHczBNCsaA="; + rev = "cc7306e9ea479b19e8ef4c5fba35b4efd4b66692"; + hash = "sha256-ZFuhNDVmUU7A02w/rzDn8uze7ivHVu2GI3+6PyIxAgE="; }; meta.homepage = "https://github.com/sand4rt/zen.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 31f159c32118..68cd96848d13 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -49,12 +49,12 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=f0d0685"; + version = "0.0.0+rev=38a8014"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "f0d0685701b70883fa2dfe94ee7dc27965cab841"; - hash = "sha256-rCecCdb/Bi90KsMvStNvldDPI73EDevA+QLXTYRwueg="; + rev = "38a8014ed5452cd6b7cf1399c00177a1f5374256"; + hash = "sha256-BhqeUS3KYL5jf0BfNvOs/hOPC5Thj6cEjYFfOfTbCJc="; }; passthru.requires = [ "html" @@ -63,12 +63,12 @@ }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=3597575"; + version = "0.0.0+rev=27a3091"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d"; - hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80="; + rev = "27a3091a1a444ce19d6099e00cd3788f019d0c2b"; + hash = "sha256-Pg8zZmjGFcLftPNPiASt0uUxYG6CRcsB9qKhTMC5G7U="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -158,12 +158,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=429cff8"; + version = "0.0.0+rev=c8a9780"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "429cff869513cf9e34a2cf604fbfaaedc467e809"; - hash = "sha256-UJ8bswQJB7UYspNKLWaEXMOR4XlKVHfd7rvV5iaA5Tw="; + rev = "c8a9780610dbe8ade4888045b1f2caa7a0a9d8aa"; + hash = "sha256-5gFTocO/io5jg3zJ5U9Z46BgNqqgap0afM4VlpTyaGA="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -202,12 +202,12 @@ }; blade = buildGrammar { language = "blade"; - version = "0.0.0+rev=b9436b7"; + version = "0.0.0+rev=5dbdcb0"; src = fetchFromGitHub { owner = "EmranMR"; repo = "tree-sitter-blade"; - rev = "b9436b7b936907aff730de0dac1b99d7c632cc86"; - hash = "sha256-QBsgHV/7zBF2OJfCVB3B27WVCCoMMzc5bTaubBvn2QI="; + rev = "5dbdcb0ccbe91e64b038b41545d3acc26c74907a"; + hash = "sha256-NOyGw9jhy0r2zCsbkbew+VsHWx92flJOfaCgTjRQdX4="; }; meta.homepage = "https://github.com/EmranMR/tree-sitter-blade"; }; @@ -224,12 +224,12 @@ }; bpftrace = buildGrammar { language = "bpftrace"; - version = "0.0.0+rev=774f445"; + version = "0.0.0+rev=50b27d8"; src = fetchFromGitHub { owner = "sgruszka"; repo = "tree-sitter-bpftrace"; - rev = "774f4458ad39691336ead1ee361b22434c4cdec7"; - hash = "sha256-BIPAnkY9QcW+LSR9w1E7gsCAqpOYSBpG/FF7UQYm5XI="; + rev = "50b27d8b5cae89e77702ab249dcd743a41848e5b"; + hash = "sha256-f1Hfqml59B0sjI1Yry9vnVmcsJj8kpnSlDub4nGLHSM="; }; meta.homepage = "https://github.com/sgruszka/tree-sitter-bpftrace"; }; @@ -246,34 +246,34 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=ae19b67"; + version = "0.0.0+rev=b780e47"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "ae19b676b13bdcc13b7665397e6d9b14975473dd"; - hash = "sha256-i40dlg12UNR3dUWtdlYLZKsusYUWzu+QgC2iedRk968="; + rev = "b780e47fc780ddc8da13afa35a3f4ed5c157823d"; + hash = "sha256-Juuf57GQI7OAP6O03KtSzyKJAoXtGKjyYJ+sTM1A4mU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c3 = buildGrammar { language = "c3"; - version = "0.0.0+rev=78e2ae9"; + version = "0.0.0+rev=1c6a952"; src = fetchFromGitHub { owner = "c3lang"; repo = "tree-sitter-c3"; - rev = "78e2ae9cff29ef8ca6666006abe80f1236d42996"; - hash = "sha256-IM2jmaP6ZeV7iGyPCHP71/wsFvPwel3TxyUr51qgTcc="; + rev = "1c6a95234c62130763ed1c479f958b74fdbfdb2a"; + hash = "sha256-EADHh63Sf4VlffQX3gH/9kodiws4lQsG+cyMwg1dFp8="; }; meta.homepage = "https://github.com/c3lang/tree-sitter-c3"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=8836663"; + version = "0.0.0+rev=v0.23.5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "88366631d598ce6595ec655ce1591b315cffb14c"; - hash = "sha256-x2JQKMCyvqJkVuQPfAmoihSaBxgWaTFadkmZOuc58Bc="; + tag = "v0.23.5"; + hash = "sha256-N5AAlwQFGGi47cj0m7Te08bA486gwY6NBOx4Qcy4lpo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -345,12 +345,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=c7b2a71"; + version = "0.0.0+rev=ca627bb"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "c7b2a71e7f8ecb167fad4c97227c838439280175"; - hash = "sha256-+Lom3xjPmhhZr3G4aV054lbhLjvJsPaQalSqkKUijvU="; + rev = "ca627bb5828616b6246aafdc3c3222789e728e37"; + hash = "sha256-tLC3WHEQS2GqUr+5Q884fc+tDCTxx6Jxg83T9wPlHw4="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -465,12 +465,12 @@ }; cue = buildGrammar { language = "cue"; - version = "0.0.0+rev=20bb919"; + version = "0.0.0+rev=dd7b90e"; src = fetchFromGitHub { owner = "eonpatapon"; repo = "tree-sitter-cue"; - rev = "20bb9195dac00b64c00ee494812abf3bf76f4181"; - hash = "sha256-q41CTw7/+j+hq9ejM0yusObmAVdi1tbUKzRN59M/QVY="; + rev = "dd7b90e0770ff18070c515937ba3c3d6d93db00e"; + hash = "sha256-9PwcWEz8sfJ4v+xeFGGI2JHXq5X1oI5K0mRvCEWDjgA="; }; meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue"; }; @@ -487,23 +487,23 @@ }; d = buildGrammar { language = "d"; - version = "0.0.0+rev=fb028c8"; + version = "0.0.0+rev=64f2793"; src = fetchFromGitHub { owner = "gdamore"; repo = "tree-sitter-d"; - rev = "fb028c8f14f4188286c2eef143f105def6fbf24f"; - hash = "sha256-Xi8out5j4L5pAArA9zmLA7aGhma++G+AaVLgFW+TEAo="; + rev = "64f27931b4e6fdd75af1102c79bacbca68a8dacc"; + hash = "sha256-LNEFFoN9lA3fBgzBDrv3NdADS5UIQYHq851KePl6siE="; }; meta.homepage = "https://github.com/gdamore/tree-sitter-d"; }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=0fc19c3"; + version = "0.0.0+rev=be07cf7"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "0fc19c3a57b1109802af41d2b8f60d8835c5da3a"; - hash = "sha256-yK4XfjVPABFHf8MjoDge6bmapcybhdIF+49rlXFP+pw="; + rev = "be07cf7118d3dba06236a3f19541685a68209934"; + hash = "sha256-BPy4K3mjVBFdAtkVJBa8JCaWwRiO73khO32lh0rlcfw="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -520,12 +520,12 @@ }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=e685f1f"; + version = "0.0.0+rev=e78bf56"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "e685f1f6ac1702b046415efb476444167d63e41a"; - hash = "sha256-iMmr4zSm6B7goevHE03DMj9scW4ldXS7CV74sKeqGD4="; + rev = "e78bf56f206cb47bee28a217423acb651e076848"; + hash = "sha256-avjOWIK+DTyJQq2sgvm3PN4umagNrJ3wCKS8woK56pk="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; @@ -542,12 +542,12 @@ }; diff = buildGrammar { language = "diff"; - version = "0.0.0+rev=2520c3f"; + version = "0.0.0+rev=7d20331"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-diff"; - rev = "2520c3f934b3179bb540d23e0ef45f75304b5fed"; - hash = "sha256-8rYLNGgoZSvvfqO2++nAgFKmvbkKJ3m+9B8bTXp6Us4="; + rev = "7d20331b97a008daf2dd0055da8c609f03424105"; + hash = "sha256-l9KwHqEdwqN5CYZQVCEymhld/m+MArAzqfPz8mV7M8Q="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-diff"; }; @@ -564,12 +564,12 @@ }; djot = buildGrammar { language = "djot"; - version = "0.0.0+rev=74fac1f"; + version = "0.0.0+rev=759a618"; src = fetchFromGitHub { owner = "treeman"; repo = "tree-sitter-djot"; - rev = "74fac1f53c6d52aeac104b6874e5506be6d0cfe6"; - hash = "sha256-HfEZHNhxEbH07gDzLPdl6n2Pf//o8tbJvwE+tesJDC8="; + rev = "759a61896ccb2200a4becec4443e768638a21d58"; + hash = "sha256-QLjTBLWjybrj197oykkH0saED8SPpjOwyL4VFUnKBCw="; }; meta.homepage = "https://github.com/treeman/tree-sitter-djot"; }; @@ -676,23 +676,23 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=7937d3b"; + version = "0.0.0+rev=c4f9f5a"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "7937d3b4d65fa574163cfa59394515d3c1cf16f4"; - hash = "sha256-6V1W/MOx03dPvL8adgE16du7eGemPwwdiZ3NL8FNBkg="; + rev = "c4f9f5a15ddad8635ba59a5b99c2e9124e74ad91"; + hash = "sha256-nQq8ZQUkLWuko6kNQRFtKwTQFuWzpIob9Cgjcn4Jrvk="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=6d9511c"; + version = "0.0.0+rev=6bf1558"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "6d9511c28181db66daee4e883f811f6251220943"; - hash = "sha256-jhI0CRi8rgiwBfwEwNBBZ7QrKXYRQ9gUCO7c37Y/ibc="; + rev = "6bf155821d8d18f1e9d0c951fe77202daa7eb9c2"; + hash = "sha256-A3S7oQSPqP/tya5gK8d6Sr54B9OZ2KDVPZIgZgr2Gz4="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -731,23 +731,23 @@ }; enforce = buildGrammar { language = "enforce"; - version = "0.0.0+rev=eb27968"; + version = "0.0.0+rev=d222ea5"; src = fetchFromGitHub { owner = "simonvic"; repo = "tree-sitter-enforce"; - rev = "eb2796871d966264cdb041b797416ef1757c8b4f"; - hash = "sha256-50yK0MIMFFjUlcE99MEESKdcLnyIurAl16uGXGQyjkI="; + rev = "d222ea5d2f047e67a16234237cfc1c8489aac2fb"; + hash = "sha256-fwcD9Y/4j0S5M0gW9tdMgNZfpkLIV4IMyhQThLij4XY="; }; meta.homepage = "https://github.com/simonvic/tree-sitter-enforce"; }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=1d78195"; + version = "0.0.0+rev=836aa2b"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "1d78195c4fbb1fc027eb3e4220427f1eb8bfc89e"; - hash = "sha256-v/yG3J+f62W3f7jS5/TslepZGHUbFIH8duA+hFVLblU="; + rev = "836aa2b6c3af2c7cef3f84049b0ed6d44485a870"; + hash = "sha256-1bviRDBztC6EplHFS4lqRYt05f0VH6Ofwo9umwSqve4="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -764,12 +764,12 @@ }; faust = buildGrammar { language = "faust"; - version = "0.0.0+rev=122dd10"; + version = "0.0.0+rev=6074204"; src = fetchFromGitHub { owner = "khiner"; repo = "tree-sitter-faust"; - rev = "122dd101919289ea809bad643712fcb483a1bed0"; - hash = "sha256-5T+Om1qdSIal1pMIoaM44FexSqZyhZCZb/Pa0/udzZI="; + rev = "6074204d3511392fd0b9c4fa1cef347ded65b246"; + hash = "sha256-jzedhMP31Q17+UN6qi8k4nyqvoqVeYxflFIZcE8sf4g="; }; meta.homepage = "https://github.com/khiner/tree-sitter-faust"; }; @@ -808,12 +808,12 @@ }; fish = buildGrammar { language = "fish"; - version = "0.0.0+rev=fa2143f"; + version = "0.0.0+rev=f435b0b"; src = fetchFromGitHub { owner = "ram02z"; repo = "tree-sitter-fish"; - rev = "fa2143f5d66a9eb6c007ba9173525ea7aaafe788"; - hash = "sha256-n6eGMdbW1Rsn5XbszLSSSG3F8jh+loYnPEiabNY+jfk="; + rev = "f435b0bd772578c70e5d158b85267bb886316f88"; + hash = "sha256-9an4YAz2QKC3yAJ5/tOfmqOJViGATz7+NhKuZpr4oC4="; }; meta.homepage = "https://github.com/ram02z/tree-sitter-fish"; }; @@ -830,23 +830,23 @@ }; forth = buildGrammar { language = "forth"; - version = "0.0.0+rev=360ef13"; + version = "0.0.0+rev=7190f21"; src = fetchFromGitHub { owner = "AlexanderBrevig"; repo = "tree-sitter-forth"; - rev = "360ef13f8c609ec6d2e80782af69958b84e36cd0"; - hash = "sha256-d7X1Ubd9tKMQgNHlH+sQxmcsgLWB4mxR5CIdyKkLnM8="; + rev = "7190f2173060d19a2174c96bfb5b7c6f9745512b"; + hash = "sha256-BhlENOsBHH8rUU/NDFO4vc7rcjvvQOWLsomO/nr51RQ="; }; meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth"; }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=be30d90"; + version = "0.0.0+rev=7edacd2"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "be30d90dc7dfa4080b9c4abed3f400c9163a88df"; - hash = "sha256-Y+HrMtswSmoFWH6YTBHfC1qQafqePOJB8tyoPRIbjQg="; + rev = "7edacd2b21aa80057d9725384a1304a1c758e0f8"; + hash = "sha256-KWIAKJBV9qrNviLKbGkIyznHEMeO0tC/Pa1maRVINRM="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -863,12 +863,12 @@ }; fsharp = buildGrammar { language = "fsharp"; - version = "0.0.0+rev=1c2d935"; + version = "0.0.0+rev=148ea97"; src = fetchFromGitHub { owner = "ionide"; repo = "tree-sitter-fsharp"; - rev = "1c2d9351d1f731c08cfdc4ed41e63126ae56e462"; - hash = "sha256-MeYYCVO+KXC2pGYebbQzaK8ZyLAjPm5kBUROCQEn9Cw="; + rev = "148ea977d630e2d1c34bf717329141707620226d"; + hash = "sha256-yaVeqC1RXgD7EMU8nRcdgkRQZXBcGw0lztTFvK4uM2I="; }; location = "fsharp"; meta.homepage = "https://github.com/ionide/tree-sitter-fsharp"; @@ -886,12 +886,12 @@ }; gap = buildGrammar { language = "gap"; - version = "0.0.0+rev=ed2480d"; + version = "0.0.0+rev=96fe2e4"; src = fetchFromGitHub { owner = "gap-system"; repo = "tree-sitter-gap"; - rev = "ed2480d42281586932920527823b307bc45052b8"; - hash = "sha256-rLCuVHBT/8DsHiE8Z4PbeAGjFmBT86vnJVvr258MKoA="; + rev = "96fe2e49745ecd62b80cd19dca01fb52b83f93a1"; + hash = "sha256-bHbWHfwzQVnbqNZ65Ls2h3hsnIpQpylzy2Sviw8aTcs="; }; meta.homepage = "https://github.com/gap-system/tree-sitter-gap"; }; @@ -944,12 +944,12 @@ }; git_rebase = buildGrammar { language = "git_rebase"; - version = "0.0.0+rev=760ba8e"; + version = "0.0.0+rev=32686d6"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; - rev = "760ba8e34e7a68294ffb9c495e1388e030366188"; - hash = "sha256-TJ3n3HA51qJPVS40GHqGJ6qK4fE9iFfAYH866uHgdtU="; + rev = "32686d6b72980b36f876ae2d07719c9c3ed154e2"; + hash = "sha256-+aQNbKWZgmWe21Wv1ih6kuiPDrjgY8ghi6dbQbV3PQg="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; @@ -966,12 +966,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=33fe854"; + version = "0.0.0+rev=49715a9"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "33fe8548abcc6e374feaac5724b5a2364bf23090"; - hash = "sha256-ttULjFU9slnPcT4bCjOozGkaKAOxMW5Oa2/caVNeEsA="; + rev = "49715a9e6f19ce3d33b875aacdd6ad8ddaee0ffe"; + hash = "sha256-LMo+NufYbxb8G3ZCKNvtPHafTVHRM4HrZr7kjSkHjrw="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -988,34 +988,34 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=0bb1b0a"; + version = "0.0.0+rev=cefbd68"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "0bb1b0ae1a3555180ae7b0004851da747fc230d1"; - hash = "sha256-x6DGHCCVl6w3na69gTtcsewS18VO1nTq8BE01Te/Ua4="; + rev = "cefbd6863983b4df3214b7934bde5e9ca63d5b7f"; + hash = "sha256-j5FFZ/2HsCfMuJpDHJZ2pfYaFU6Rc3BjUrSeOi/89ZM="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; glimmer = buildGrammar { language = "glimmer"; - version = "0.0.0+rev=88af855"; + version = "0.0.0+rev=c67a736"; src = fetchFromGitHub { owner = "ember-tooling"; repo = "tree-sitter-glimmer"; - rev = "88af85568bde3b91acb5d4c352ed094d0c1f9d84"; - hash = "sha256-AW+jd1Kl3krTgnPc8NoXfSM91fOan/wIB/mo/feWj74="; + rev = "c67a73679db2945a686ca45d3e5318d86138e72a"; + hash = "sha256-rNDLaxio3n4Lura5qxCSFopajm6XkWxwsJ4yfJIsdio="; }; meta.homepage = "https://github.com/ember-tooling/tree-sitter-glimmer"; }; glimmer_javascript = buildGrammar { language = "glimmer_javascript"; - version = "0.0.0+rev=5cc865a"; + version = "0.0.0+rev=d9cf7a2"; src = fetchFromGitHub { owner = "NullVoxPopuli"; repo = "tree-sitter-glimmer-javascript"; - rev = "5cc865a2a0a77cbfaf5062c8fcf2a9919bd54f87"; - hash = "sha256-4MSBaGdX5lvhvz2LyQb+NuQY9Vc5CFL0C6S3sO3Tz2U="; + rev = "d9cf7a2f1dad3c6b660148eaf77e955d418fdb8b"; + hash = "sha256-gvs85PiyNov10Ar0JytOzjmJQVOeVx74ZQSbV+XUKa4="; }; meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript"; }; @@ -1060,12 +1060,12 @@ }; gnuplot = buildGrammar { language = "gnuplot"; - version = "0.0.0+rev=8923c1e"; + version = "0.0.0+rev=20a9829"; src = fetchFromGitHub { owner = "dpezto"; repo = "tree-sitter-gnuplot"; - rev = "8923c1e38b9634a688a6c0dce7c18c8ffb823e79"; - hash = "sha256-fR3lIscfrBqpBH1jZ4RB1Qa8r+hxy6I0OzzoQqAe2aw="; + rev = "20a98295a52caa5f474839838a800d250e8fe1f4"; + hash = "sha256-UHgeM0pQm9DQwZdPByzJvYY4DbzcxE0WDDuqVGcsxts="; }; meta.homepage = "https://github.com/dpezto/tree-sitter-gnuplot"; }; @@ -1170,23 +1170,23 @@ }; gren = buildGrammar { language = "gren"; - version = "0.0.0+rev=c36aac5"; + version = "0.0.0+rev=cecd8ce"; src = fetchFromGitHub { owner = "MaeBrooks"; repo = "tree-sitter-gren"; - rev = "c36aac51a915fdfcaf178128ba1e9c2205b25930"; - hash = "sha256-XtLP2ncpwAiubHug6k4sJCYRZo5f+Nu02tho/4tVD/k="; + rev = "cecd8ce9b18f1803d37682f33b6224978fd04d31"; + hash = "sha256-E96GzFmQDEb3Uq6sEThxqpRwqEH+JwE/hJ0xM1r2VjI="; }; meta.homepage = "https://github.com/MaeBrooks/tree-sitter-gren"; }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=781d9cd"; + version = "0.0.0+rev=deb0dcf"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "781d9cd1b482a70a6b27091e5c9e14bbcab3b768"; - hash = "sha256-KvgVjFLzT1jJ9PieVslJLKXrijYzI/ttny+536famw0="; + rev = "deb0dcf8c4544f07564060f6e9b9f6e4b0bfc27d"; + hash = "sha256-x7PawYYtgsduh60KNnS4LgB7SvoBV9aOJ9cHNsLBBhc="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; @@ -1236,12 +1236,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=7fa19f1"; + version = "0.0.0+rev=98aedbd"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-haskell"; - rev = "7fa19f195803a77855f036ee7f49e4b22856e338"; - hash = "sha256-/cruCFNEyZf5d3TCw+vkJOgJqWvS1Re5F4dMVuXXJBg="; + rev = "98aedbd2d6947a168ba3ba3755d70b0cb6b78395"; + hash = "sha256-eunizglx3nye3LZIAndBX/hf0BvFOWmThQwxvvjqcfU="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-haskell"; }; @@ -1318,17 +1318,6 @@ ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hlsl"; }; - hlsplaylist = buildGrammar { - language = "hlsplaylist"; - version = "0.0.0+rev=3bfda92"; - src = fetchFromGitHub { - owner = "Freed-Wu"; - repo = "tree-sitter-hlsplaylist"; - rev = "3bfda9271e3adb08d35f47a2102fe957009e1c55"; - hash = "sha256-BvLT+BbnJgM14a896p39dywYy/4S45xOBtBukYTbW6E="; - }; - meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist"; - }; hocon = buildGrammar { language = "hocon"; version = "0.0.0+rev=c390f10"; @@ -1364,12 +1353,12 @@ }; htmldjango = buildGrammar { language = "htmldjango"; - version = "0.0.0+rev=3a64316"; + version = "0.0.0+rev=a103188"; src = fetchFromGitHub { owner = "interdependence"; repo = "tree-sitter-htmldjango"; - rev = "3a643167ad9afac5d61e092f08ff5b054576fadf"; - hash = "sha256-sQV7olTaQ68wixzvKV44myVvDUXXjBZh9N3jvDFUSvE="; + rev = "a10318892603d9a0b925df7cc7771a840304b997"; + hash = "sha256-tFcdc2fd+oEVtB2ccKRHppMkxf1bPorKWRgfn5xZoaw="; }; meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango"; }; @@ -1408,12 +1397,12 @@ }; idl = buildGrammar { language = "idl"; - version = "0.0.0+rev=fb65762"; + version = "0.0.0+rev=f319b8b"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "fb65762a13538b397e41a5fc1e9564c9df841410"; - hash = "sha256-CDbE9TxcxZWhyv6DPgw/ygvY5fayNF4usTlZPGp/KjM="; + rev = "f319b8b0b5cb218cf3f63aa821d2ab722524dbe9"; + hash = "sha256-x1XT6iowS2ywp8c8RdQqix/WC/OfR5p8MjIhGljbA/8="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; @@ -1441,23 +1430,23 @@ }; inko = buildGrammar { language = "inko"; - version = "0.0.0+rev=v0.5.1"; + version = "0.0.0+rev=v0.8.0"; src = fetchFromGitHub { owner = "inko-lang"; repo = "tree-sitter-inko"; - tag = "v0.5.1"; - hash = "sha256-bt/T6O/7of8r9DrA6DU8pM4vWlBCgWWzw89GZbDyJnw="; + tag = "v0.8.0"; + hash = "sha256-Jud0/5vgm3hF94lXu2i6rxHHvpMWFH3y5ye9jIrjmZk="; }; meta.homepage = "https://github.com/inko-lang/tree-sitter-inko"; }; ispc = buildGrammar { language = "ispc"; - version = "0.0.0+rev=9b2f9ae"; + version = "0.0.0+rev=ba1bb38"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-ispc"; - rev = "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"; - hash = "sha256-vxe+g7o0gXgB4GjhjkxqLqcLL2+8wqMB3tm1xQFSitI="; + rev = "ba1bb38ac8ddfa6aa7571cbfe9b4d029f7f77447"; + hash = "sha256-biJ30aNRzfiuDdT0Xl4h8cQ7x84ck/no272+mjydne0="; }; passthru.requires = [ "c" @@ -1466,12 +1455,12 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=d183186"; + version = "0.0.0+rev=3c1bdcf"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "d183186995204314700be3e9e0a48053ea16b350"; - hash = "sha256-zETOH+HpHyiCdOiggRy7VVjOv/WVRDb4qQ+kN9r2Frc="; + rev = "3c1bdcfff374138da03a1db25c75efce623910fe"; + hash = "sha256-IiL3vi2i+VVKtfd49hz4T+mztj+o2Hxaeo/PAGFBX8Y="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; @@ -1488,12 +1477,12 @@ }; javadoc = buildGrammar { language = "javadoc"; - version = "0.0.0+rev=e2f56b4"; + version = "0.0.0+rev=51b55fb"; src = fetchFromGitHub { owner = "rmuir"; repo = "tree-sitter-javadoc"; - rev = "e2f56b4d0df08f6ed5df8bae266f9e75b340a9ab"; - hash = "sha256-31HnXUtuimS9gr71r6Rs3VZYmiR8N8iuNNWsbe7Sz48="; + rev = "51b55fbf40e49c5207a3f922c0d4550e743761c5"; + hash = "sha256-18rICYDu/tW5CV/WC8fbr2mwVhg6f9Hn6p9WFMCnxgQ="; }; meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc"; }; @@ -1510,12 +1499,12 @@ }; jinja = buildGrammar { language = "jinja"; - version = "0.0.0+rev=413dba9"; + version = "0.0.0+rev=c213d37"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-jinja"; - rev = "413dba9fea354b62f6adada1815b2f504e32ffb5"; - hash = "sha256-edHxTYvMfBh0OJbEfKgSqumV2JH/48cQ2u0Uq8e4CxM="; + rev = "c213d3745ccdcaaa858869181c7b1bf9557a025f"; + hash = "sha256-DgHJ3pwLG6yLxzIaNSB+wpmt8Wl0CLdYcfOx+MDr39A="; }; location = "tree-sitter-jinja"; passthru.requires = [ @@ -1525,12 +1514,12 @@ }; jinja_inline = buildGrammar { language = "jinja_inline"; - version = "0.0.0+rev=413dba9"; + version = "0.0.0+rev=c213d37"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-jinja"; - rev = "413dba9fea354b62f6adada1815b2f504e32ffb5"; - hash = "sha256-edHxTYvMfBh0OJbEfKgSqumV2JH/48cQ2u0Uq8e4CxM="; + rev = "c213d3745ccdcaaa858869181c7b1bf9557a025f"; + hash = "sha256-DgHJ3pwLG6yLxzIaNSB+wpmt8Wl0CLdYcfOx+MDr39A="; }; location = "tree-sitter-jinja_inline"; meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja"; @@ -1581,12 +1570,12 @@ }; json5 = buildGrammar { language = "json5"; - version = "0.0.0+rev=aa630ef"; + version = "0.0.0+rev=248b856"; src = fetchFromGitHub { owner = "Joakker"; repo = "tree-sitter-json5"; - rev = "aa630ef48903ab99e406a8acd2e2933077cc34e1"; - hash = "sha256-WMGZxt1F2Ca7xoBSCld04LpQr37MhZpARK9mPF8RMUI="; + rev = "248b8564567087d7866be76569b182f6dd7e14e9"; + hash = "sha256-1tzvsId57HV4bKyZ5IRdXqhW2c8sc+0CfcsE9WYxz14="; }; meta.homepage = "https://github.com/Joakker/tree-sitter-json5"; }; @@ -1603,12 +1592,12 @@ }; julia = buildGrammar { language = "julia"; - version = "0.0.0+rev=8454f26"; + version = "0.0.0+rev=60fc237"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-julia"; - rev = "8454f266717232525ed03c7b09164b0404a03150"; - hash = "sha256-o4yep2RJU53lWajxfPgAk/m+DpMIeYCHYAHsR3FZMT8="; + rev = "60fc2370605db09d9b39877c6f754ff345bcb7a5"; + hash = "sha256-6ajPGZqZ96FCvLee1v4SDB61R/aO4ixRgqqU6CT0KHc="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-julia"; }; @@ -1625,12 +1614,12 @@ }; kcl = buildGrammar { language = "kcl"; - version = "0.0.0+rev=b0b2eb3"; + version = "0.0.0+rev=026f40f"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "tree-sitter-kcl"; - rev = "b0b2eb38009e04035a6e266c7e11e541f3caab7c"; - hash = "sha256-Aeu1j77GdsNpo9PU+FcqN3ttT0eLaDKY4n8buftMiDc="; + rev = "026f40fb0a59a35da75b9c8801d52f6c14feda24"; + hash = "sha256-YfD4MpU5c73wNIAEG875cA00OOKs02jeUfn0+iau2E0="; }; meta.homepage = "https://github.com/kcl-lang/tree-sitter-kcl"; }; @@ -1658,45 +1647,45 @@ }; kitty = buildGrammar { language = "kitty"; - version = "0.0.0+rev=fa6ab3f"; + version = "0.0.0+rev=4d93f64"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "tree-sitter-kitty"; - rev = "fa6ab3fd32d890a0217495c96b35761e6d2dcb5b"; - hash = "sha256-hyzwZfnslyxqL+98BWejCyLwwJMcj6O8EGuBYrCKn4o="; + rev = "4d93f6486c6cd81e583bd18f2462f8a6026f2d83"; + hash = "sha256-Uj1ctHB6lWtxWAJbgcB1ydWOoGRF4+YvLQaqcQfP8hE="; }; meta.homepage = "https://github.com/OXY2DEV/tree-sitter-kitty"; }; kos = buildGrammar { language = "kos"; - version = "0.0.0+rev=03b261c"; + version = "0.0.0+rev=a733862"; src = fetchFromGitHub { owner = "kos-lang"; repo = "tree-sitter-kos"; - rev = "03b261c1a78b71c38cf4616497f253c4a4ce118b"; - hash = "sha256-38i2AbPZNQb5EOUoyNvk20HfesLmbkvNxn/oyGx/W3k="; + rev = "a7338629da17c5246dc2129cd2a493a6ee59e922"; + hash = "sha256-CwQQkieDk1YJxYH07V/IoDd4yiOBLLq6ih8szFVabKU="; }; meta.homepage = "https://github.com/kos-lang/tree-sitter-kos"; }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=93bfeee"; + version = "0.0.0+rev=c8ac3d2"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "93bfeee1555d2b1442d68c44b0afde2a3b069e46"; - hash = "sha256-9kNYaT0A9/B5/Vzg2d02XRYORlQpI9zK0e8E26FEEDg="; + rev = "c8ac3d2627240160b999a2c100de3babbdb8f419"; + hash = "sha256-hHiZNuiU05zT2JGG/60wX5XD6CY27QDChe4FlRB4j4E="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; koto = buildGrammar { language = "koto"; - version = "0.0.0+rev=f8b3f62"; + version = "0.0.0+rev=e8d41cb"; src = fetchFromGitHub { owner = "koto-lang"; repo = "tree-sitter-koto"; - rev = "f8b3f62c0eed185dca1559789e78759d4bee60e5"; - hash = "sha256-vv5HMDXMcSi91loIppsx/5Hu6jJ7/cedtTyahOBP780="; + rev = "e8d41cbaca867aa1b0213e1fc1caeaf593da7bf7"; + hash = "sha256-a8Rzt7vuJmV8jyRB1tK3Gy6NV0+lv8+e+q5m1EDoq2U="; }; meta.homepage = "https://github.com/koto-lang/tree-sitter-koto"; }; @@ -1769,12 +1758,12 @@ }; liquid = buildGrammar { language = "liquid"; - version = "0.0.0+rev=9566ca7"; + version = "0.0.0+rev=e45dbac"; src = fetchFromGitHub { owner = "hankthetank27"; repo = "tree-sitter-liquid"; - rev = "9566ca79911052919fce09d26f1f655b5e093857"; - hash = "sha256-KUp/uqTV8C98TLJ4VDtbB9Dygq4DQNv1VInzTtYS/BA="; + rev = "e45dbac8c5fa95b1f0e00e7e0c04bc8855823391"; + hash = "sha256-oTM9YdDVuNlR8aXjeB3oYXQdh+nek+GRLBiestn396U="; }; meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid"; }; @@ -1849,12 +1838,12 @@ }; m68k = buildGrammar { language = "m68k"; - version = "0.0.0+rev=e128454"; + version = "0.0.0+rev=ab9f2ad"; src = fetchFromGitHub { owner = "grahambates"; repo = "tree-sitter-m68k"; - rev = "e128454c2210c0e0c10b68fe45ddb8fee80182a3"; - hash = "sha256-g7SZ/TrTaaeGDNOqId4eom9R/5gOyXcmmhWY4WW0fF4="; + rev = "ab9f2ad96db56619d05a6474a52e3dbdd705a637"; + hash = "sha256-owwsDRqPgjTvdJkPXg+TX65g+deBI6Fui6h40EFzKVo="; }; meta.homepage = "https://github.com/grahambates/tree-sitter-m68k"; }; @@ -1871,12 +1860,12 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=f969cd3"; + version = "0.0.0+rev=c357072"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-markdown"; - rev = "f969cd3ae3f9fbd4e43205431d0ae286014c05b5"; - hash = "sha256-WUVN7+lzDI+VC5PuJjhHiS4JpVr1x0Ic30i2tVrI6W8="; + rev = "c3570720f7f7bbad22fe96603f106276618e0cf5"; + hash = "sha256-wQKcqU0V6gHj84qOkUwdXsBW3f6MNfJMFxuGTucAgh8="; }; location = "tree-sitter-markdown"; passthru.requires = [ @@ -1886,24 +1875,24 @@ }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=f969cd3"; + version = "0.0.0+rev=c357072"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-markdown"; - rev = "f969cd3ae3f9fbd4e43205431d0ae286014c05b5"; - hash = "sha256-WUVN7+lzDI+VC5PuJjhHiS4JpVr1x0Ic30i2tVrI6W8="; + rev = "c3570720f7f7bbad22fe96603f106276618e0cf5"; + hash = "sha256-wQKcqU0V6gHj84qOkUwdXsBW3f6MNfJMFxuGTucAgh8="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown"; }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=c2390a5"; + version = "0.0.0+rev=c9ef947"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "c2390a59016f74e7d5f75ef09510768b4f30217e"; - hash = "sha256-WgyWvItbysSqeD/LdBr233NYlKF1HaxIDtHIr6BQOjw="; + rev = "c9ef947ec67fb6b500d5def4f5e09b56990a9f91"; + hash = "sha256-PjOJSMWQ0z8vVE38OdFgloFDMbKr/SVOYFTy0krtgRQ="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1931,38 +1920,27 @@ }; meson = buildGrammar { language = "meson"; - version = "0.0.0+rev=c84f354"; + version = "0.0.0+rev=aa8d472"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-meson"; - rev = "c84f3540624b81fc44067030afce2ff78d6ede05"; - hash = "sha256-+GMR051L89asgavX2T3zKwWl8xUFHenlCWJYELhMuyA="; + rev = "aa8d472034956f94f51f2ef2cbfec4cc07efbfde"; + hash = "sha256-UJREw7mQqJTKcD2owKJ4GZkkch/KGTIy9/+Fdl3W3ik="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-meson"; }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=96fa0ad"; + version = "0.0.0+rev=a5bcbd0"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "96fa0adc3028cc6a9d281370c9f213a457c4a2d0"; - hash = "sha256-6zXWbcwptKfJxZzx9txteVS1LSTSD9XUs3B4JsJLZlk="; + rev = "a5bcbd07b4bc6103a8ee1536188c42a2059d43ba"; + hash = "sha256-h0ZKsVbZg4i99qsH0xHW/KcStl73HBKX8LtixMzPcf0="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; - muttrc = buildGrammar { - language = "muttrc"; - version = "0.0.0+rev=173b0ab"; - src = fetchFromGitHub { - owner = "neomutt"; - repo = "tree-sitter-muttrc"; - rev = "173b0ab53a9c07962c9777189c4c70e90f1c1837"; - hash = "sha256-zma/oyMFI+r+/616yXV9b4ptC1FNYpHlpqY/Fez++n0="; - }; - meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc"; - }; nasm = buildGrammar { language = "nasm"; version = "0.0.0+rev=d1b3638"; @@ -1987,23 +1965,23 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=b5b6cc3"; + version = "0.0.0+rev=7780a16"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "b5b6cc3bc7b9ea19f78fed264190685419cd17a8"; - hash = "sha256-aPiOtpZJQQmAjCwx2Ssirhe6rqxbrwjxIWK5l3L14EY="; + rev = "7780a16a992d8e68f8fb65cb6828caa01f22fd17"; + hash = "sha256-uUaudpb/t55OPpkE2VaLGiEqP3Lt6485HSkliJ6IH8Y="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; nim = buildGrammar { language = "nim"; - version = "0.0.0+rev=3878440"; + version = "0.0.0+rev=ac72ba3"; src = fetchFromGitHub { owner = "alaviss"; repo = "tree-sitter-nim"; - rev = "3878440d9398515ae053c6f6024986e69868bb74"; - hash = "sha256-mdAT1jTFeVP8TYi4H36sjd826KmxHQ1EZ+8gd37NGfY="; + rev = "ac72ba30d16edf0be021588a9301ede4accd6cf4"; + hash = "sha256-1jr8tKdKvKTKCUSEvC+vRGw+W1Rl3WMbv0ZS3u7H1GA="; }; passthru.requires = [ "nim_format_string" @@ -2034,12 +2012,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=eabf968"; + version = "0.0.0+rev=3d0173d"; src = fetchFromGitHub { owner = "nix-community"; repo = "tree-sitter-nix"; - rev = "eabf96807ea4ab6d6c7f09b671a88cd483542840"; - hash = "sha256-cSiBd0XkSR8l1CF2vkThWUtMxqATwuxCNO5oy2kyOZY="; + rev = "3d0173d903e630b6e14d17f1cf79488791379ded"; + hash = "sha256-DFmFRZ47TPr8mgmRyXuHLfkQRmO58m4QyN9OBISb7IE="; }; meta.homepage = "https://github.com/nix-community/tree-sitter-nix"; }; @@ -2056,12 +2034,12 @@ }; nu = buildGrammar { language = "nu"; - version = "0.0.0+rev=696d257"; + version = "0.0.0+rev=d694570"; src = fetchFromGitHub { owner = "nushell"; repo = "tree-sitter-nu"; - rev = "696d257f6b652edb50878a783b30ad7833dec49e"; - hash = "sha256-G+XuQSqvJ9xRNq4fYiyHK9+AmCNofayPOC6JrFXpcjU="; + rev = "d694570aa26b53d0d642460a0430e8aa07dcbea0"; + hash = "sha256-eWHAcV8bPCnL9y4PtPn6cJRylGQ2KMxCUoUGwDVigkg="; }; meta.homepage = "https://github.com/nushell/tree-sitter-nu"; }; @@ -2092,24 +2070,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=5a979b3"; + version = "0.0.0+rev=527d62e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "5a979b3ec7f1fe990b8e8c4412294a0cf7228e45"; - hash = "sha256-dG9v5/NcYR8J33wEfA8BpJNFd5i4M8Cay+gBxjiRIqw="; + rev = "527d62ef0f24ce0d97fbedf004921d75d0a7e086"; + hash = "sha256-HvnMfxQ0Cxb5atSIyW518AM/Z/5JhjisvbUSYlPnwRw="; }; location = "grammars/ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=5a979b3"; + version = "0.0.0+rev=527d62e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "5a979b3ec7f1fe990b8e8c4412294a0cf7228e45"; - hash = "sha256-dG9v5/NcYR8J33wEfA8BpJNFd5i4M8Cay+gBxjiRIqw="; + rev = "527d62ef0f24ce0d97fbedf004921d75d0a7e086"; + hash = "sha256-HvnMfxQ0Cxb5atSIyW518AM/Z/5JhjisvbUSYlPnwRw="; }; location = "grammars/interface"; passthru.requires = [ @@ -2175,24 +2153,24 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=ea9667d"; + version = "0.0.0+rev=c3e17b3"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "ea9667dc65a816acace002a2b1b099978785ca33"; - hash = "sha256-siyJfN5s63pPxrSpuzKltgXWeNDytc80MDXo4pz3j7Q="; + rev = "c3e17b31179bf8f658c9f37c7a3ea6a202212d5a"; + hash = "sha256-i5T7jT0zi0TSt7eAvjvJRak8kpzxOEoPydU+yEosNgA="; }; generate = true; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=3f2465c"; + version = "0.0.0+rev=3821698"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "3f2465c217d0a966d41e584b42d75522f2a3149e"; - hash = "sha256-RV6wHYVTOFdRYMqXdPw2Ryk3FadJJ4jcJVFjsJG8Ri0="; + rev = "38216983c07bf9e1b56e16acde53b25adaeab61c"; + hash = "sha256-Y02akiL95WGV8J3gd6FXQ0XHPoE59d2zuFQkXh6eyAQ="; }; location = "php"; passthru.requires = [ @@ -2202,12 +2180,12 @@ }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=3f2465c"; + version = "0.0.0+rev=3821698"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "3f2465c217d0a966d41e584b42d75522f2a3149e"; - hash = "sha256-RV6wHYVTOFdRYMqXdPw2Ryk3FadJJ4jcJVFjsJG8Ri0="; + rev = "38216983c07bf9e1b56e16acde53b25adaeab61c"; + hash = "sha256-Y02akiL95WGV8J3gd6FXQ0XHPoE59d2zuFQkXh6eyAQ="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; @@ -2236,12 +2214,12 @@ }; pkl = buildGrammar { language = "pkl"; - version = "0.0.0+rev=f5beed1"; + version = "0.0.0+rev=3486521"; src = fetchFromGitHub { owner = "apple"; repo = "tree-sitter-pkl"; - rev = "f5beed1da8e5fc856a1a11e29a929d0b7cdcfe3c"; - hash = "sha256-q0K+q8GEOiwbgFjA/jiY/Hg6kPlgqMUvH8g+GdEDU3I="; + rev = "3486521eb1c2fcb3c9a5e88300215930ee515693"; + hash = "sha256-bQNSSDVVi0kmsIlpmI+7LWf8/SrXylAyEju/DAahqzg="; }; meta.homepage = "https://github.com/apple/tree-sitter-pkl"; }; @@ -2258,12 +2236,12 @@ }; pod = buildGrammar { language = "pod"; - version = "0.0.0+rev=57c606a"; + version = "0.0.0+rev=ffbd7f3"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-pod"; - rev = "57c606aa3373ba876d44113d13fe7bdc2c060723"; - hash = "sha256-HE4jwqAn4jfyonFkUzA0n+MZxWa7LuV8Cfq5wgrDwjI="; + rev = "ffbd7f3b7b68edaaa0532898953c627355cb1a1a"; + hash = "sha256-5EHA3hPyrfana+g3kxqnKUwT2jUiVNb8fy07RWwp1/A="; }; generate = true; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod"; @@ -2292,12 +2270,12 @@ }; powershell = buildGrammar { language = "powershell"; - version = "0.0.0+rev=73800ec"; + version = "0.0.0+rev=e7bd348"; src = fetchFromGitHub { owner = "airbus-cert"; repo = "tree-sitter-powershell"; - rev = "73800ecc8bddeee8f1079a5a2e0c13c3d00269bb"; - hash = "sha256-76Rjkoh+qtmr4KCbsEEhx1VrVlGfOxywHRFKNA/XYhU="; + rev = "e7bd348c49fdfd5c853a146a670965ba516a6239"; + hash = "sha256-jJq/x0jsXiV5VdYA+vspecTEiEy3vWLCdF0N4v0lZcs="; }; meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell"; }; @@ -2323,33 +2301,6 @@ }; meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; - problog = buildGrammar { - language = "problog"; - version = "0.0.0+rev=d8d415f"; - src = fetchFromGitHub { - owner = "foxyseta"; - repo = "tree-sitter-prolog"; - rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa"; - hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18="; - }; - location = "grammars/problog"; - passthru.requires = [ - "prolog" - ]; - meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; - }; - prolog = buildGrammar { - language = "prolog"; - version = "0.0.0+rev=d8d415f"; - src = fetchFromGitHub { - owner = "foxyseta"; - repo = "tree-sitter-prolog"; - rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa"; - hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18="; - }; - location = "grammars/prolog"; - meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; - }; promql = buildGrammar { language = "promql"; version = "0.0.0+rev=77625d7"; @@ -2374,12 +2325,12 @@ }; proto = buildGrammar { language = "proto"; - version = "0.0.0+rev=d65a18c"; + version = "0.0.0+rev=cf8e4eb"; src = fetchFromGitHub { owner = "coder3101"; repo = "tree-sitter-proto"; - rev = "d65a18ce7c2242801f702770114ad08056c7f8c9"; - hash = "sha256-bgrL4IK9sUB5tGoIBdNLGudbFf2OhQYdw0Ub1gM0NL0="; + rev = "cf8e4eba6e5b4afb9eb16c9178bba3d2504b46c2"; + hash = "sha256-jG7j+uBb92QdI5En/qjxhfKYm9Elf8/+OFvw1makUkY="; }; meta.homepage = "https://github.com/coder3101/tree-sitter-proto"; }; @@ -2466,67 +2417,67 @@ }; ql = buildGrammar { language = "ql"; - version = "0.0.0+rev=1fd627a"; + version = "0.0.0+rev=5b8ee9a"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ql"; - rev = "1fd627a4e8bff8c24c11987474bd33112bead857"; - hash = "sha256-mJ/bj09mT1WTaiKoXiRXDM7dkenf5hv2ArXieeTVe6I="; + rev = "5b8ee9adaa1f2a1ea958064b61f8feb0a5a886c0"; + hash = "sha256-YhT1R0PrOFfqCLIdlAiJB+D2d31xW0iGAn8UwoxHui0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql"; }; qmldir = buildGrammar { language = "qmldir"; - version = "0.0.0+rev=6b2b5e4"; + version = "0.0.0+rev=c57e008"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-qmldir"; - rev = "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"; - hash = "sha256-7ic9Xd+1G0JM25bY0f8N5r6YZx5NV5HrJXXHp6pXvo4="; + rev = "c57e00865a1a6f1cca83340d6dad91f13df55479"; + hash = "sha256-FQpheeuWg66jpIVtp++2MmJmEjlE2SiNcv59vlpNtkc="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-qmldir"; }; qmljs = buildGrammar { language = "qmljs"; - version = "0.0.0+rev=0bec435"; + version = "0.0.0+rev=de96ed6"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "0bec4359a7eb2f6c9220cd57372d87d236f66d59"; - hash = "sha256-tV4lipey+OAQwygRFp9lQAzgCNiZzSu7p3Mr6CCBH1g="; + rev = "de96ed62abded51fcdfcbeaaa120e0dd0d20c697"; + hash = "sha256-Yn3/adOETfPHBVCIVfI5qXUwC2wQr14pbhK2aUtdCiY="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=fc5409c"; + version = "0.0.0+rev=8e9e223"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-query"; - rev = "fc5409c6820dd5e02b0b0a309d3da2bfcde2db17"; - hash = "sha256-51dMHH50zVP/N0ljZs7J2wh0EiNtsr2+UvM/S3LkP10="; + rev = "8e9e223812ff30854fbc912adbec696ba5f0e023"; + hash = "sha256-TxAbPlDeNsF6j5NverXARlcGAtOcRRmjzxsZpyCoPLY="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-query"; }; r = buildGrammar { language = "r"; - version = "0.0.0+rev=0e6ef77"; + version = "0.0.0+rev=58a2279"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; - rev = "0e6ef7741712c09dc3ee6e81c42e919820cc65ef"; - hash = "sha256-9T0wjo8i34rvR1g4WBpDFQXQodyv4kNomayGBZK9hfg="; + rev = "58a22794466c0fc15b0d3b40531db751593721e8"; + hash = "sha256-OHmCctvFOmmL4JmjuvawR45dourXmII7Cx7hLlUCDtI="; }; meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=54649be"; + version = "0.0.0+rev=e2b8064"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "54649be8b939341d2d5410b594ab954fe8814bd0"; - hash = "sha256-+pYy/WzjXqTBBxJRBbyFKGOdBd1WZ+AFr8oUWJWR/qU="; + rev = "e2b8064b32ab1dfa30532aeac1577ae4c1cc3df5"; + hash = "sha256-NuEFNKoP2JaodFfX/8wizLC3xjKPvLwHIgefzI5oXMg="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -2554,12 +2505,12 @@ }; razor = buildGrammar { language = "razor"; - version = "0.0.0+rev=fe46ce5"; + version = "0.0.0+rev=900f53d"; src = fetchFromGitHub { owner = "tris203"; repo = "tree-sitter-razor"; - rev = "fe46ce5ea7d844e53d59bc96f2175d33691c61c5"; - hash = "sha256-E4fgy588g6IP258TS2DvoILc1Aikvpfbtq20VIhBE4U="; + rev = "900f53dc6cc592f6e616adc2f732cb0f66fc9147"; + hash = "sha256-s+evcRfRQcW7HAGRikqF+zEZK4WYFTGWWRcpe9cwxgM="; }; meta.homepage = "https://github.com/tris203/tree-sitter-razor"; }; @@ -2609,34 +2560,34 @@ }; rego = buildGrammar { language = "rego"; - version = "0.0.0+rev=ddd39af"; + version = "0.0.0+rev=7f8a431"; src = fetchFromGitHub { owner = "FallenAngel97"; repo = "tree-sitter-rego"; - rev = "ddd39af81fe8b0288102a7cb97959dfce723e0f3"; - hash = "sha256-I6jZ5jsJUAdjQti/lj4d11+GRSHjbN/hoGYO7ezGKv8="; + rev = "7f8a43138951a13832919312290147bd175180cd"; + hash = "sha256-kBTK6IjEnMnSPIF964GmTv6m+RukfP2TLcPHqHnxyIc="; }; meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego"; }; requirements = buildGrammar { language = "requirements"; - version = "0.0.0+rev=caeb2ba"; + version = "0.0.0+rev=2c3bb29"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-requirements"; - rev = "caeb2ba854dea55931f76034978de1fd79362939"; - hash = "sha256-YszXgZZSMiWBf2vIij8+5GA1FY3Ipeoow8dkrzkLl78="; + rev = "2c3bb291f497258ba417d052faa14a2dfee6d401"; + hash = "sha256-jLG+DcdVfC2Rj8SYL3WTBWreOLJWwtxpPxzyvJl77d4="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-requirements"; }; rescript = buildGrammar { language = "rescript"; - version = "0.0.0+rev=43c2f1f"; + version = "0.0.0+rev=19ed8a8"; src = fetchFromGitHub { owner = "rescript-lang"; repo = "tree-sitter-rescript"; - rev = "43c2f1f35024918d415dc933d4cc534d6419fedf"; - hash = "sha256-QG4LvF/ix7wKHrZ1pUNXzG6ibbITUYAZYb4a39qJF/o="; + rev = "19ed8a8e6bcc844b71c37e9edaffc60c77f74d7c"; + hash = "sha256-mQJSmb9Qy5pFS+nNz4+C7RPs1mpAoxxqbx7seYo8+JI="; }; meta.homepage = "https://github.com/rescript-lang/tree-sitter-rescript"; }; @@ -2708,12 +2659,12 @@ }; rst = buildGrammar { language = "rst"; - version = "0.0.0+rev=4e562e1"; + version = "0.0.0+rev=a60f107"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; - rev = "4e562e1598b95b93db4f3f64fe40ddefbc677a15"; - hash = "sha256-C65FmrEUyMQN+rF3RTN1oNVJtGiTHMZvdRyy/tMjVqY="; + rev = "a60f1070b824cb8bb8409b4b6d7da0d07997c30e"; + hash = "sha256-miULT1wsWvIdgtOfT5claorIjJFbO9xzy0/SbBrmSvU="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-rst"; }; @@ -2752,12 +2703,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=14c5cfd"; + version = "0.0.0+rev=4d081d9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "14c5cfd2b8e0f057ba0f4f72ee4812b0ae6cdce3"; - hash = "sha256-xDp1+i0QLnY18EtiwurW1B4bbeS1qZKNJRxS6Qeb3pw="; + rev = "4d081d98670ff6e98ca42c085294fc75eec15e1d"; + hash = "sha256-arwLfqA/C4w8GQv6GE/H4/tDRWaGDfvEiv7Q7mYRBRI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2799,12 +2750,12 @@ }; sflog = buildGrammar { language = "sflog"; - version = "0.0.0+rev=3597575"; + version = "0.0.0+rev=27a3091"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d"; - hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80="; + rev = "27a3091a1a444ce19d6099e00cd3788f019d0c2b"; + hash = "sha256-Pg8zZmjGFcLftPNPiASt0uUxYG6CRcsB9qKhTMC5G7U="; }; location = "sflog"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2822,23 +2773,23 @@ }; slim = buildGrammar { language = "slim"; - version = "0.0.0+rev=a06113f"; + version = "0.0.0+rev=d4ff7e3"; src = fetchFromGitHub { owner = "theoo"; repo = "tree-sitter-slim"; - rev = "a06113f5175b805a37d20df0a6f9d722e0ab6cfe"; - hash = "sha256-Uk0AltQNhVd3VHQYRN+gJWd7tnVYr7qzBce6yEdtVaw="; + rev = "d4ff7e388eb271c04662f2176c08548c9c51078f"; + hash = "sha256-wl+HTLJoadlSTfDUCDV/juECth5e/FDNa7lPi8+1EEk="; }; meta.homepage = "https://github.com/theoo/tree-sitter-slim"; }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=4d7ad06"; + version = "0.0.0+rev=68b2524"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "4d7ad0617c30f865f051bbac04a9826bea29f987"; - hash = "sha256-u/nVbZEJPMbBzYCgXpE8L1KJyWJmB27uofSkeOMSOnI="; + rev = "68b25244cec6eb9d7f8f790ef781c29c822d8f84"; + hash = "sha256-ugdB7gN3zTAGLm9Jk2hjuuZWxIYxEWYXW72qLpXM+1Q="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; @@ -2899,24 +2850,24 @@ }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=3597575"; + version = "0.0.0+rev=27a3091"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d"; - hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80="; + rev = "27a3091a1a444ce19d6099e00cd3788f019d0c2b"; + hash = "sha256-Pg8zZmjGFcLftPNPiASt0uUxYG6CRcsB9qKhTMC5G7U="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=3597575"; + version = "0.0.0+rev=27a3091"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d"; - hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80="; + rev = "27a3091a1a444ce19d6099e00cd3788f019d0c2b"; + hash = "sha256-Pg8zZmjGFcLftPNPiASt0uUxYG6CRcsB9qKhTMC5G7U="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2978,12 +2929,12 @@ }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=71d2693"; + version = "0.0.0+rev=b7db80e"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-ssh-config"; - rev = "71d2693deadaca8cdc09e38ba41d2f6042da1616"; - hash = "sha256-LvdvnzpqjuVAf5DZmxYfELV3C+U1iJuG9B+UCQD47qo="; + rev = "b7db80ee4c8a29543904f14fb3ae3eb24f047925"; + hash = "sha256-PX5oVRBOUgTnG6UcqVNM3EZyAc1SPE0vbZjyA19FQHc="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ssh-config"; }; @@ -3033,12 +2984,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=8b5bb27"; + version = "0.0.0+rev=d4d81e1"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "8b5bb272b269afdd38cdf641c4a707dd92fbe902"; - hash = "sha256-9RizfSi+ouCcLUL2+gPc8GljNo9KCX57VElLSlha05A="; + rev = "d4d81e1ad35f8f6c060f3cb49b60c5d54a7d012a"; + hash = "sha256-tDRb/TKyj0icKJRuzNn+eNbz1S1BWj8K5eR+reZAbyM="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -3078,12 +3029,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=8abb3e8"; + version = "0.0.0+rev=28fe3a8"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "8abb3e8b33256d89127a35e87480736f74755ff9"; - hash = "sha256-JztVY5/jb532lUV0ziEIW1auDsfKy7gZNDFHvjDIPLk="; + rev = "28fe3a8a85586aa297524fe6164140b9521dcaff"; + hash = "sha256-uotg71UvLWd98jRe3YvQEBcZFJR2VXocjNWrXTNUW8g="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -3112,23 +3063,23 @@ }; systemverilog = buildGrammar { language = "systemverilog"; - version = "0.0.0+rev=2939285"; + version = "0.0.0+rev=aa09b90"; src = fetchFromGitHub { owner = "gmlarumbe"; repo = "tree-sitter-systemverilog"; - rev = "293928578cb27fbd0005fcc5f09c09a1e8628c89"; - hash = "sha256-bvnJlEiaHtcmvNw3yyiysKMvdz919Fvr+/fyH8GcEYs="; + rev = "aa09b9004478cea0f46d877608910dc153b277b6"; + hash = "sha256-ig4mpzN/bvnD5e5MN11a7YkONDeJ3R8kz/AbS0GDreI="; }; meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog"; }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=3bce397"; + version = "0.0.0+rev=acc92b0"; src = fetchFromGitHub { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "3bce3977303c3f88bfa9fcdfcfd1a4f8f6ffa0b0"; - hash = "sha256-ysdKgzF5VFV0BeeXlV8gZ5pW7WzYJtYnyBE+MaxG3Jo="; + rev = "acc92b00d8564421f9c9c05ececfd2c7c942fe47"; + hash = "sha256-7qWKy5ZcAB2VptlVHIGf3qTPmDI7mRdvB8weRvH9mi0="; }; meta.homepage = "https://github.com/xasc/tree-sitter-t32"; }; @@ -3145,12 +3096,12 @@ }; tact = buildGrammar { language = "tact"; - version = "0.0.0+rev=a6267c2"; + version = "0.0.0+rev=1c689f0"; src = fetchFromGitHub { owner = "tact-lang"; repo = "tree-sitter-tact"; - rev = "a6267c2091ed432c248780cec9f8d42c8766d9ad"; - hash = "sha256-2AUN/VYor3K0hkneLYa6+LjE+V8EJogFqBTgdfvOiKM="; + rev = "1c689f0a8bbe5910db628a62bfc26d37f54bf9be"; + hash = "sha256-SA33We0hOBc97iBom7m2tBfcquopJs1hi/QsJFb7XBw="; }; meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; }; @@ -3179,12 +3130,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=1c6db04"; + version = "0.0.0+rev=04bae7c"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "1c6db04effbcd7773c826bded9783cbc3061bd55"; - hash = "sha256-n+TJLNB6AoFOjkqpb8vkxXsXno/vE8M8yRzVflRUVd0="; + rev = "04bae7c82de2fcfec94254fef50f5f1c5924f5f5"; + hash = "sha256-s2hkhES86Idf9vbDqrX6Lh7iUn0dTq8DBqw5qUBAYzE="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -3258,17 +3209,6 @@ }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; - tmux = buildGrammar { - language = "tmux"; - version = "0.0.0+rev=75d1b99"; - src = fetchFromGitHub { - owner = "Freed-Wu"; - repo = "tree-sitter-tmux"; - rev = "75d1b995b0c23400ac8e49db757a2e0386f9fa8f"; - hash = "sha256-LdXPdijcsfPYIrbTMDIy46wqOaJfxwVBVpOVVfXrJIg="; - }; - meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux"; - }; todotxt = buildGrammar { language = "todotxt"; version = "0.0.0+rev=3937c5c"; @@ -3331,12 +3271,12 @@ }; twig = buildGrammar { language = "twig"; - version = "0.0.0+rev=7195ee5"; + version = "0.0.0+rev=0afd9a6"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-twig"; - rev = "7195ee573ab5c3b3bb0e91b042e6f83ac1b11104"; - hash = "sha256-wQ5pHFU35wqT3UxHIZ/cP8RPPX+mpGQCoBr9ilRfc4w="; + rev = "0afd9a6d808944e65a7be393e31868b85345735f"; + hash = "sha256-QXwijdfVay4PH0yKmWuMUnqqInir2yjJZjHxZQTYRxE="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-twig"; }; @@ -3443,12 +3383,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=095865d"; + version = "0.0.0+rev=925d457"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "095865df4b9ddd21e376d635586c663d5a736f71"; - hash = "sha256-ypdtFzQwd5t7/iFthX4hb4zNeFQZKaatF8JA4XutOt4="; + rev = "925d4570d1668746762a2cdf0ecb9a25be704a67"; + hash = "sha256-MRkZTJkpqvdpuyOuk683ko5GPtIa4U7BozzssuAX+0M="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3477,12 +3417,12 @@ }; vhdl = buildGrammar { language = "vhdl"; - version = "0.0.0+rev=c2d9be3"; + version = "0.0.0+rev=e97406d"; src = fetchFromGitHub { owner = "jpt13653903"; repo = "tree-sitter-vhdl"; - rev = "c2d9be3d5ab7fb2cae8ad5ae604cd3606a4af0f2"; - hash = "sha256-/bz7ab0XjLfHYEJDv71uLSbduInjDK06d3UQLdiiJ78="; + rev = "e97406d6ddfbed73dd8cdfcc3cf4c7b200b4211d"; + hash = "sha256-2vSkL8DetMtTRpvujg4tzxW2AbAhz56qBWRmgA8u3qk="; }; meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; }; @@ -3499,23 +3439,23 @@ }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=3092fcd"; + version = "0.0.0+rev=039c8d0"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-vim"; - rev = "3092fcd99eb87bbd0fc434aa03650ba58bd5b43b"; - hash = "sha256-MnLBFuJCJbetcS07fG5fkCwHtf/EcNP+Syf0Gn0K39c="; + rev = "039c8d0aa1deae00ddeb0374dd70bcc0ec56938d"; + hash = "sha256-i+CfSWLRXhR2g98cGlfW4iRhNb3nt8O+WJ1Bjf2tnEM="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vim"; }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=f061895"; + version = "0.0.0+rev=23daa41"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "f061895a0eff1d5b90e4fb60d21d87be3267031a"; - hash = "sha256-K3nzoLlzbgIJc7EnqgYgNDLCBXOg7oy9eV2lI0duwaE="; + rev = "23daa416c1ff5d15f59a1aa648f031d6e3ee15c5"; + hash = "sha256-SG5oz/vXz1rdCjzAo2bE3xz107Hc+qOqfsC5V+j0X1I="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -3576,12 +3516,12 @@ }; wit = buildGrammar { language = "wit"; - version = "0.0.0+rev=v1.3.0"; + version = "0.0.0+rev=v1.4.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "tree-sitter-wit"; - tag = "v1.3.0"; - hash = "sha256-FG73R38Bw60+aT5YB/xpENCnQwoGMVjXRLjP1GdJEn4="; + tag = "v1.4.0"; + hash = "sha256-63xH63s6lgticgRtMz7LCL1ThuXegn7qFCZgeQqIZH4="; }; meta.homepage = "https://github.com/bytecodealliance/tree-sitter-wit"; }; @@ -3635,12 +3575,12 @@ }; yaml = buildGrammar { language = "yaml"; - version = "0.0.0+rev=4463985"; + version = "0.0.0+rev=a1c4812"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; - rev = "4463985dfccc640f3d6991e3396a2047610cf5f8"; - hash = "sha256-nCyGepZg6n2a/Clc0NFxTSt3Pm1z4OHIzJSjrjGudmw="; + rev = "a1c4812a73ec5e089de8e441fdea3a921e8d5079"; + hash = "sha256-I4jI68HNDyV6cqa6S9cLqoKwnw/E2pFHbOimhHJISMY="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml"; }; @@ -3666,17 +3606,6 @@ }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yuck"; }; - zathurarc = buildGrammar { - language = "zathurarc"; - version = "0.0.0+rev=0554b4a"; - src = fetchFromGitHub { - owner = "Freed-Wu"; - repo = "tree-sitter-zathurarc"; - rev = "0554b4a5d313244b7fc000cbb41c04afae4f4e31"; - hash = "sha256-edwLcz1WlcRJOoV2Unpho8wmi7TmcpwysBOAdRKprNw="; - }; - meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc"; - }; zig = buildGrammar { language = "zig"; version = "0.0.0+rev=6479aa1"; @@ -3714,12 +3643,12 @@ }; zsh = buildGrammar { language = "zsh"; - version = "0.0.0+rev=bd344c2"; + version = "0.0.0+rev=7a59340"; src = fetchFromGitHub { owner = "georgeharker"; repo = "tree-sitter-zsh"; - rev = "bd344c23a7683e293d077c6648e88f209782fedb"; - hash = "sha256-91peFWN4vPRRZ4yZCl3Wtp0SzFKT7pBGihDgWX9IeZk="; + rev = "7a593401efb5418ffdedbe3c0e4c61c6d240166d"; + hash = "sha256-KCvuyVWR09jlTk+za0FA/z89O5deToxvJ9zNQoBq/+E="; }; meta.homepage = "https://github.com/georgeharker/tree-sitter-zsh"; }; @@ -4109,9 +4038,6 @@ "cpp" ]; }; - hlsplaylist = buildQueries { - language = "hlsplaylist"; - }; hocon = buildQueries { language = "hocon"; }; @@ -4302,9 +4228,6 @@ mlir = buildQueries { language = "mlir"; }; - muttrc = buildQueries { - language = "muttrc"; - }; nasm = buildQueries { language = "nasm"; }; @@ -4410,15 +4333,6 @@ prisma = buildQueries { language = "prisma"; }; - problog = buildQueries { - language = "problog"; - requires = [ - "prolog" - ]; - }; - prolog = buildQueries { - language = "prolog"; - }; promql = buildQueries { language = "promql"; }; @@ -4677,9 +4591,6 @@ tlaplus = buildQueries { language = "tlaplus"; }; - tmux = buildQueries { - language = "tmux"; - }; todotxt = buildQueries { language = "todotxt"; }; @@ -4799,9 +4710,6 @@ yuck = buildQueries { language = "yuck"; }; - zathurarc = buildQueries { - language = "zathurarc"; - }; zig = buildQueries { language = "zig"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 5ccb9ddd6506..aee1f1aa5955 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3602,7 +3602,6 @@ assertNoAdditions { snacks-nvim telescope-nvim ]; - dependencies = [ self.plenary-nvim ]; nvimSkipModules = [ # Issue reproduction file "minimal" diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index b3bda8fccdde..7e6b1128213b 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-JYg1P0t3YadTxmqeRSky8X9emLnP2cO3BYO9R7PgQfM="; + hash = "sha256-vx8fRGGW9fJYKC1Q1627NrjxqqO/zRkH83aLyc4Rxn0="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-miK4K8THmT+ebjcAl/3Cp9vtVWfMlpIWWIqyAm5+YeQ="; + hash = "sha256-ZWwau/aSMsamcVBrtuSWI2HiKeZHfMqBLj9WQO8IA20="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-ao9yGH9xIBmNrp/sHpwpxKZnR8LjXl1Cegfgw7Nq+2M="; + hash = "sha256-a4yKVABQ0nVzlqS071ae5DYEqv8jgjSwLjxkEAroZvE="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.215"; + version = "2.1.216"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index 47caca24fb58..902cda5b3941 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -68,11 +68,11 @@ vscode-utils.buildVscodeMarketplaceExtension { nativeBuildInputs = [ autoPatchelfHook + jq makeWrapper ]; buildInputs = [ - jq libkrb5 zlib (lib.getLib stdenv.cc.cc) diff --git a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix index 31cf7febe817..6babbd0c2a77 100644 --- a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix +++ b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix @@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "5.36.1"; - hash = "sha256-1yxTjIsyj8o97VlvDlWqPCNIxd6XgbjpqF5qNbVtEwg="; + version = "5.37.0"; + hash = "sha256-remt7+OQnOqSrtUoUN3QCXXR3Bti/lWIMfb7i4j3w84="; }; meta = { description = "Material Design Icons for Visual Studio Code"; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 6bfcf8380051..67cc36a9e06b 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -73,6 +73,9 @@ let # This cannot be removed, it is used by some extensions. installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; + strictDeps = true; + __structuredAttrs = true; + nativeBuildInputs = [ unpackVsixSetupHook ] ++ nativeBuildInputs; installPhase = diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 7c365bee3791..78c0cb0b3d73 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -181,7 +181,6 @@ stdenv.mkDerivation ( buildFHSEnv customizedArgs; in { - inherit pname version @@ -199,8 +198,16 @@ stdenv.mkDerivation ( updateScript vscodeVersion ; - fhs = fhs { }; - fhsWithPackages = f: fhs { additionalPkgs = f; }; + fhs = (fhs { }).overrideAttrs (old: { + strictDeps = true; + __structuredAttrs = true; + }); + fhsWithPackages = + f: + (fhs { additionalPkgs = f; }).overrideAttrs (old: { + strictDeps = true; + __structuredAttrs = true; + }); } // lib.optionalAttrs (vscodeServer != null) { inherit rev vscodeServer; @@ -419,7 +426,11 @@ stdenv.mkDerivation ( let nodeModulesPath = if stdenv.hostPlatform.isDarwin then - if lib.versionAtLeast vscodeVersion "1.94.0" then + # 1.129 moved node_modules back into app.asar, shipping native + # binaries in the asar.unpacked directory like before 1.94 + if lib.versionAtLeast vscodeVersion "1.129.0" then + "Contents/Resources/app/node_modules.asar.unpacked" + else if lib.versionAtLeast vscodeVersion "1.94.0" then "Contents/Resources/app/node_modules" else "Contents/Resources/app/node_modules.asar.unpacked" diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index e42db623c81e..d945a0a3d063 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -435,7 +435,7 @@ let ;; *) # Copy if the symlink resolves to a Mach-O dylib - otool -l "$file" 2>/dev/null | grep -q 'LC_ID_DYLIB' || continue + otool -l "$file" 2>/dev/null | grep -F 'LC_ID_DYLIB' >/dev/null || continue ;; esac diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 2e9ff9ae31d9..f95a2ec08764 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,7 +1,7 @@ { lib, - buildGoModule, buildGo125Module, + buildGo126Module, fetchFromGitHub, nixosTests, installShellFiles, @@ -82,6 +82,19 @@ rec { nomad = nomad_1_11; + nomad_2_0 = generic { + buildGoModule = buildGo126Module; + version = "2.0.0"; + hash = "sha256-5rCAcOXWQ6g2iK1d5wy/a/DZQC2xwwdpI1SscDX98C8="; + vendorHash = "sha256-3/H7QgVOHtaUs6BOF7ATVgrA0cfNBbm940Axrvq2bKU="; + license = lib.licenses.bsl11; + passthru.tests.nomad = nixosTests.nomad; + preCheck = '' + export PATH="$PATH:$NIX_BUILD_TOP/go/bin" + ''; + __structuredAttrs = true; + }; + nomad_1_11 = generic { buildGoModule = buildGo125Module; version = "1.11.3"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cb5ee223836e..5fa7ede1da0e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -119,13 +119,13 @@ "vendorHash": "sha256-kvHI8cd/rl9kVKKzSwjrC0+Qikz3w2P9jgLvYa+T2DE=" }, "brightbox_brightbox": { - "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", + "hash": "sha256-bvwdtiwzXElhsXLmftXZQ567ExcC0E0L/5OeqIdp1SQ=", "homepage": "https://registry.terraform.io/providers/brightbox/brightbox", "owner": "brightbox", "repo": "terraform-provider-brightbox", - "rev": "v3.4.3", + "rev": "v3.4.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" + "vendorHash": "sha256-TLNHhSyMw0rKFtd9EChg7zSGoxe57rh36nAPqu1j8w8=" }, "buildkite_buildkite": { "hash": "sha256-egeZCTQFyhKG0giyjNK9C/W+OGMOGv2l+65Vg3iTi2A=", @@ -589,13 +589,13 @@ "vendorHash": "sha256-moP2fqZnj8J6IFAhb0n6pikVYVg2Is22xd/xuuJ+zIQ=" }, "hashicorp_google-beta": { - "hash": "sha256-pEdNv1MViCsCb3wFoDghCeQ5q2FErtGrQL9noL5B11g=", + "hash": "sha256-wf+pFYuDMqlFYvaTKTpgaeSSBoLgQlUAarobUAotLMo=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v7.39.0", + "rev": "v7.40.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-u4zldvOO/TtNHC8B+c63DWMbk7iEix+S+y/RLExchI8=" + "vendorHash": "sha256-7f0HZQXVsIq7m8CUApTnHIroOjKwT1GaP+GjCf4C6n0=" }, "hashicorp_helm": { "hash": "sha256-Dw6khnp0pronRKbBv2gx8ygtVvRV9uQIHCXj2BblZ6k=", @@ -842,13 +842,13 @@ "vendorHash": "sha256-EAv8EeNn0PJ3BElmg6sKkd/LXNe0lFjEIjHuZRG3CoQ=" }, "launchdarkly_launchdarkly": { - "hash": "sha256-PgAK0BUTSyW4CXssQkENohnhtd2O5GPuFVvSDcHWjQ8=", + "hash": "sha256-xQhWB5gUO10v7KXXHci3gvXlI/hg7JXsn9bYxHVGJwc=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.30.0", + "rev": "v2.30.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM=" + "vendorHash": "sha256-9RisIZUblqqylMW6Bz6ehpwRUXyvTdicuhEGI+n5G3Y=" }, "linode_linode": { "hash": "sha256-N/SVZ1ajNRT53zxdYBT6Hd/wwAuKhEre0QSZUYbkwGA=", @@ -1274,11 +1274,11 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic_sumologic": { - "hash": "sha256-MraUjj18ooGYfOnsEJ0oCPIFQITagNRGMeAqZqEQWU4=", + "hash": "sha256-h4ipmgcEK8Cv9/gQwdOtQqbhfXO/QXJsrHHV6O1HtL8=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.2.9", + "rev": "v3.2.10", "spdx": "MPL-2.0", "vendorHash": "sha256-nbiLH+J051XxTx+z8xGrp/DPYB7g9S4clFSWcZUKnAg=" }, diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 43667f130449..4c9bf0bd6b2b 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -105,11 +105,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { pname = "weechat"; - version = "4.9.3"; + version = "4.9.4"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-XH2VOfqGyZ6nalUaiJqSusIeq3uyeQ29NGRS0AsQw3w="; + hash = "sha256-P8UDWfOjsljJ8DFIsC87nFkZRTXRtGXEgfuFp2wu0AU="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index 042337749148..f6ee4ff81dab 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -13,13 +13,13 @@ let mkHyprlandPlugin, }: let - version = "0.55.0"; + version = "0.56.0"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; tag = "v${version}"; - hash = "sha256-WMUJ7tyw/9QbKUyRzLndEQSqX05fQLmFlRdMAmPD7tI="; + hash = "sha256-piRpwar7VZI3YviYo0a/UMFz9+rLesfv3nRLGKxjVGg="; }; in mkHyprlandPlugin { diff --git a/pkgs/by-name/ac/account-utils/package.nix b/pkgs/by-name/ac/account-utils/package.nix index c0df5e64109d..b1c1595689a9 100644 --- a/pkgs/by-name/ac/account-utils/package.nix +++ b/pkgs/by-name/ac/account-utils/package.nix @@ -20,13 +20,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "account-utils"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "thkukuk"; repo = "account-utils"; tag = "v${finalAttrs.version}"; - hash = "sha256-9l+y7FLb0IZXXp4RstlhNR6yA7b4b831obFuiVtO9+k="; + hash = "sha256-F0jM7qEpUjDjf0FTMfTNbD3WDoBShE0SyhDKzgI2K0k="; }; __structuredAttrs = true; @@ -54,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "c_args" "-ffat-lto-objects") ]; + doCheck = true; + passthru.tests = { inherit (nixosTests) login-nosuid; }; diff --git a/pkgs/by-name/ad/addchain/package.nix b/pkgs/by-name/ad/addchain/package.nix new file mode 100644 index 000000000000..03a03ebe70f2 --- /dev/null +++ b/pkgs/by-name/ad/addchain/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule rec { + pname = "addchain"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "mmcloughlin"; + repo = "addchain"; + tag = "v${version}"; + fetchSubmodules = false; + hash = "sha256-msuZgNYqN1QldrbXJJ4BFXYhUsllAPt8W0KRrr8p6TM="; + }; + + vendorHash = "sha256-qxlVGkbm95WFmH0+48XRXwrF7HRUWFxYHFzmFOaj4GA="; + + ldflags = [ + "-s" + "-w" + "-X github.com/mmcloughlin/addchain/meta.buildversion=${version}" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + subPackages = [ "cmd/addchain" ]; + + __structuredAttrs = true; + + meta = { + description = "addchain generates short addition chains for exponents of cryptographic interest with results rivaling the best hand-optimized chains"; + homepage = "https://github.com/mmcloughlin/addchain"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + ambiso + ]; + mainProgram = "addchain"; + }; +} diff --git a/pkgs/by-name/ae/aerion-creds/package.nix b/pkgs/by-name/ae/aerion-creds/package.nix new file mode 100644 index 000000000000..1a35d0db6abe --- /dev/null +++ b/pkgs/by-name/ae/aerion-creds/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchurl, +}: + +let + version = "0.3.2"; + + archMap = { + "x86_64-linux" = "x86_64"; + "aarch64-linux" = "aarch64"; + }; + sysArch = + archMap.${stdenv.hostPlatform.system} + or (throw "Unsupported architecture: ${stdenv.hostPlatform.system}"); + + shimHashes = { + "x86_64" = "sha256-8WvuQgWTJNe4UpmS6uSYDYm46sIqxJbwVZ/J3CRz0OI="; + "aarch64" = "sha256-4RvFbxJGwM70huziY2ELoCouTrtMasgoqFUncBeBFvU="; + }; +in +stdenv.mkDerivation { + pname = "aerion-creds"; + inherit version; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchurl { + url = "https://github.com/hkdb/aerion/releases/download/v${version}/flathub-build-env-v${version}-linux-${sysArch}"; + hash = shimHashes.${sysArch}; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp $src $out/bin/aerion-creds + chmod +x $out/bin/aerion-creds + + runHook postInstall + ''; + + meta = { + description = "OAuth credentials shim for Aerion"; + homepage = "https://github.com/hkdb/aerion"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ curious ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/ae/aerion/package.nix b/pkgs/by-name/ae/aerion/package.nix new file mode 100644 index 000000000000..d4325f5ce8b6 --- /dev/null +++ b/pkgs/by-name/ae/aerion/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + buildGoModule, + buildNpmPackage, + fetchFromGitHub, + pkg-config, + wrapGAppsHook3, + gtk3, + webkitgtk_4_1, + glib, + + aerion-creds, + withOAuth ? false, +}: + +let + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "hkdb"; + repo = "aerion"; + rev = "v${version}"; + hash = "sha256-elmk4huz4mvc7t+5/ZM5AK2R4pSKrLsZM0HxWFmQldE="; + }; + + frontend = buildNpmPackage { + pname = "aerion-frontend"; + inherit version src; + + sourceRoot = "${src.name}/frontend"; + + npmDepsHash = "sha256-dC+xGwSqdzItIfDipAVIVnbUJHiFkmzanjV/5xFsbkc="; + + buildPhase = '' + npm run build + ''; + + installPhase = '' + mkdir -p $out + cp -r dist/* $out/ + ''; + }; + +in +buildGoModule { + pname = "aerion"; + inherit version src; + + __structuredAttrs = true; + + vendorHash = "sha256-ptsrOpJo3i+yRSCGuHynbzi+C+GD/mBmPuHqWSVV/+4="; + + nativeBuildInputs = [ + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wrapGAppsHook3 + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + gtk3 + webkitgtk_4_1 + glib + ]; + + tags = [ + "production" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "desktop" + "webkit2_41" + ]; + + preBuild = '' + mkdir -p frontend/dist + cp -r ${frontend}/* frontend/dist/ + ''; + + postInstall = lib.optionalString stdenv.hostPlatform.isLinux ( + '' + install -Dm644 build/linux/aerion.png $out/share/pixmaps/io.github.hkdb.Aerion.png + install -Dm644 build/linux/aerion.desktop $out/share/applications/io.github.hkdb.Aerion.desktop + '' + + lib.optionalString withOAuth '' + rm -f $out/bin/aerion-creds + ln -s ${aerion-creds}/bin/aerion-creds $out/bin/aerion-creds + '' + ); + + passthru = { + inherit frontend; + updateScript = ./update.sh; + }; + + meta = { + description = "An Open Source Lightweight E-Mail Client"; + homepage = "https://github.com/hkdb/aerion"; + license = lib.licenses.asl20; + mainProgram = "aerion"; + maintainers = with lib.maintainers; [ curious ]; + }; +} diff --git a/pkgs/by-name/ae/aerion/update.sh b/pkgs/by-name/ae/aerion/update.sh new file mode 100755 index 000000000000..b07f4e73f5ed --- /dev/null +++ b/pkgs/by-name/ae/aerion/update.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix nix-update nix-prefetch-scripts common-updater-scripts + +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" +aerion_creds_file="$nixpkgs/pkgs/by-name/ae/aerion-creds/package.nix" + +version=$(list-git-tags --url=https://github.com/hkdb/aerion \ + | grep -oP '^v\d+\.\d+\.\d+$' \ + | sed 's/^v//' \ + | sort -V \ + | tail -1) + +echo "Updating aerion and aerion-creds to v$version" + +# Update version in creds file +sed -i "s/version = \".*\";/version = \"$version\";/" "$aerion_creds_file" + +# Update creds binary hashes +for arch in x86_64 aarch64; do + url="https://github.com/hkdb/aerion/releases/download/v$version/flathub-build-env-v$version-linux-$arch" + echo " Fetching creds hash for $arch..." + hash=$(nix-prefetch-url --type sha256 "$url") + sri_hash=$(nix-hash --to-sri --type sha256 "$hash") + sed -i "s|\"$arch\" = \"sha256-[^\"]*\";|\"$arch\" = \"$sri_hash\";|" "$aerion_creds_file" +done + +# Update main package (handles version, source hash, npmDepsHash, vendorHash) +cd "$nixpkgs" +nix-update --version="$version" --subpackage frontend aerion + +echo "Done!" diff --git a/pkgs/by-name/af/afew/package.nix b/pkgs/by-name/af/afew/package.nix index aa07786b61df..88fe95b65f27 100644 --- a/pkgs/by-name/af/afew/package.nix +++ b/pkgs/by-name/af/afew/package.nix @@ -9,12 +9,12 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "afew"; - version = "4.0.1"; + version = "4.0.2"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-LPKSD4aMAREtf5Y4A9oa6Sh5lv/uuLpamcP35SBgA/M="; + hash = "sha256-gsfqyoVD6CXXd14MiyA5nq0e7wE6yymW9Ssmxpu6+E4="; }; build-system = [ diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix index db7d52b8fdfe..6db1aab7991b 100644 --- a/pkgs/by-name/ag/ags/package.nix +++ b/pkgs/by-name/ag/ags/package.nix @@ -105,7 +105,6 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/Aylur/ags/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ - PerchunPak johnrtitor ]; mainProgram = "ags"; diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix index 7ecf545ef2a3..67317248a1b0 100644 --- a/pkgs/by-name/ai/air-formatter/package.nix +++ b/pkgs/by-name/ai/air-formatter/package.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "air-formatter"; - version = "0.10.0"; + version = "0.11.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "posit-dev"; repo = "air"; tag = finalAttrs.version; - hash = "sha256-u0icSo6aW6tLgY57RPAoVte5Awn16FLIvZEeeYNr5fk="; + hash = "sha256-BWtQLgNFf/kULGvet33k3T1k2oL1hbDn2VPCj0JxrX4="; }; - cargoHash = "sha256-51xkTVs6j7n0os5wHWxpFC/uLHm3tz+SiWUHsd+bNRw="; + cargoHash = "sha256-xcNVioDbejCLrWMaUA06r9GK5KEIPq6w0W7G7290kOU="; useNextest = true; diff --git a/pkgs/by-name/an/anda/package.nix b/pkgs/by-name/an/anda/package.nix index 71749b894593..fe2e1df29e34 100644 --- a/pkgs/by-name/an/anda/package.nix +++ b/pkgs/by-name/an/anda/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "anda"; - version = "0.7.3"; + version = "0.7.8"; src = fetchFromGitHub { owner = "FyraLabs"; repo = "anda"; tag = finalAttrs.version; - hash = "sha256-2I+4n/RWC8hqztjiKjqJadaajTaiwFrqGDL7166Gvso="; + hash = "sha256-/1N3ivvnlSBK9qYOAiH96tE/k+S3+EBfsycN2QV8o70="; }; - cargoHash = "sha256-v0HnWbLq8zwJZr0uNVj/1c5fg6b//X1szm6eel/8Ls8="; + cargoHash = "sha256-keS3z1Kyx6TKObAneQ/+qCp/1ueYQOdepdnAPiJs9qI="; __structuredAttrs = true; diff --git a/pkgs/by-name/an/android-studio-tools/package.nix b/pkgs/by-name/an/android-studio-tools/package.nix index a461d9b81ec7..ea2d93edd66f 100644 --- a/pkgs/by-name/an/android-studio-tools/package.nix +++ b/pkgs/by-name/an/android-studio-tools/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "android-studio-tools"; - version = "14742923"; + version = "15859902"; src = fetchzip { # The only difference between the Linux and Mac versions is a single comment at the top of all the scripts # Therefore, we will use the Linux version and just patch the comment - url = "https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip"; - hash = "sha256-oimC4ToDFIa8Rlv+5RB+swl8M5PHdX4omlrMZMQEx8M="; + url = "https://dl.google.com/android/repository/commandlinetools-linux-15859902_latest.zip"; + hash = "sha256-tCbccw7qa7ncHGyWPWjwQOpaisN3QMRYXRpK7WtyjWY="; }; postPatch = '' diff --git a/pkgs/by-name/an/antigravity-ide/information.json b/pkgs/by-name/an/antigravity-ide/information.json new file mode 100644 index 000000000000..3b25a0456a2e --- /dev/null +++ b/pkgs/by-name/an/antigravity-ide/information.json @@ -0,0 +1,18 @@ +{ + "version": "2.1.1", + "vscodeVersion": "1.107.0", + "sources": { + "x86_64-linux": { + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/2.1.1-6123990880747520/linux-x64/Antigravity%20IDE.tar.gz", + "sha256": "5b2cebf7d33a68d003fd8f1fa988d1600905ace22504a085e5384214290878bd" + }, + "aarch64-linux": { + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/2.1.1-6123990880747520/linux-arm/Antigravity%20IDE.tar.gz", + "sha256": "c6b6fef97cfc078ae7f92d02f9483a12437b6602c7d322a7d445668c2f0c16a6" + }, + "aarch64-darwin": { + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/2.1.1-6123990880747520/darwin-arm/Antigravity%20IDE.zip", + "sha256": "3491f5bc9faad111e5be6d9126bf5d566a0c591bd159a61ef0dcdd30c58672aa" + } + } +} diff --git a/pkgs/by-name/an/antigravity/package.nix b/pkgs/by-name/an/antigravity-ide/package.nix similarity index 72% rename from pkgs/by-name/an/antigravity/package.nix rename to pkgs/by-name/an/antigravity-ide/package.nix index 165e5a2c4889..e9a3670ad258 100644 --- a/pkgs/by-name/an/antigravity/package.nix +++ b/pkgs/by-name/an/antigravity-ide/package.nix @@ -14,22 +14,22 @@ let information = (lib.importJSON ./information.json); source = information.sources."${hostPlatform.system}" - or (throw "antigravity: unsupported system ${hostPlatform.system}"); + or (throw "antigravity-ide: unsupported system ${hostPlatform.system}"); in buildVscode { inherit commandLineArgs useVSCodeRipgrep; inherit (information) version vscodeVersion; - pname = "antigravity"; + pname = "antigravity-ide"; - executableName = "antigravity"; - longName = "Antigravity"; - shortName = "Antigravity"; - libraryName = "antigravity"; - iconName = "antigravity"; + executableName = "antigravity-ide"; + longName = "Antigravity IDE"; + shortName = "Antigravity IDE"; + libraryName = "antigravity-ide"; + iconName = "antigravity-ide"; src = fetchurl { inherit (source) url sha256; }; - sourceRoot = if hostPlatform.isDarwin then "Antigravity.app" else "Antigravity"; + sourceRoot = if hostPlatform.isDarwin then "Antigravity IDE.app" else "Antigravity IDE"; tests = { }; updateScript = ./update.js; @@ -44,7 +44,7 @@ buildVscode { extraBuildCommands = (args.extraBuildCommands or "") + '' mkdir -p "$out/opt/google/chrome" ''; - runScript = writeShellScript "antigravity-wrapper" '' + runScript = writeShellScript "antigravity-ide-wrapper" '' for candidate in google-chrome-stable google-chrome chromium-browser chromium; do if target=$(command -v "$candidate"); then ${coreutils}/bin/ln -sf "$target" /opt/google/chrome/chrome @@ -56,10 +56,10 @@ buildVscode { }; meta = { - mainProgram = "antigravity"; + mainProgram = "antigravity-ide"; description = "Agentic development platform, evolving the IDE into the agent-first era"; - homepage = "https://antigravity.google"; - downloadPage = "https://antigravity.google/download"; + homepage = "https://antigravity.google/product/antigravity-ide"; + downloadPage = "https://antigravity.google/download#antigravity-ide"; changelog = "https://antigravity.google/changelog"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; @@ -71,6 +71,7 @@ buildVscode { maintainers = with lib.maintainers; [ xiaoxiangmoe Zaczero + schembriaiden ]; }; } diff --git a/pkgs/by-name/an/antigravity/update.js b/pkgs/by-name/an/antigravity-ide/update.js similarity index 84% rename from pkgs/by-name/an/antigravity/update.js rename to pkgs/by-name/an/antigravity-ide/update.js index 38eb4cf7a444..e91132026d11 100755 --- a/pkgs/by-name/an/antigravity/update.js +++ b/pkgs/by-name/an/antigravity-ide/update.js @@ -20,14 +20,15 @@ let version = ""; let vscodeVersion = ""; async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "darwin-arm64"} */ targetSystem) { /** @type {UpdateInfo} */ - const latestInfo = await (await fetch(`https://antigravity-auto-updater-974169037036.us-central1.run.app/api/update/${targetSystem}/stable/latest`)).json(); + const latestInfo = await (await fetch(`https://antigravity-ide-auto-updater-974169037036.us-central1.run.app/api/update/${targetSystem}/stable/latest`)).json(); const newVersion = /\/antigravity\/stable\/([\d.]+)-[\d]+/.exec(latestInfo.url)?.[1] ?? ""; // Current API lack version field now, we need to parse it from the URL temporarily. + assert(newVersion !== "", `Could not parse Antigravity IDE version from ${latestInfo.url}`); assert(version === '' || version === newVersion, `Version mismatch: ${version}(linux-x64) != ${newVersion}(${targetSystem})`); version = newVersion; assert(vscodeVersion === '' || vscodeVersion === latestInfo.productVersion, `VSCode version mismatch: ${vscodeVersion}(linux-x64) != ${latestInfo.productVersion}(${targetSystem})`); vscodeVersion = latestInfo.productVersion; return { - url: latestInfo.url, + url: latestInfo.url.replaceAll(" ", "%20"), sha256: latestInfo.sha256hash, }; } @@ -40,4 +41,4 @@ const sources = { /** @type {Information} */ const information = { version, vscodeVersion, sources }; fs.writeFileSync(path.join(import.meta.dirname, "./information.json"), JSON.stringify(information, null, 2) + "\n", "utf-8"); -console.log(`[update] Updating Antigravity complete, version: ${version}, vscodeVersion: ${vscodeVersion}`); +console.log(`[update] Updating Antigravity IDE complete, version: ${version}, vscodeVersion: ${vscodeVersion}`); diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json deleted file mode 100644 index 2073ecc8798e..000000000000 --- a/pkgs/by-name/an/antigravity/information.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": "1.23.2", - "vscodeVersion": "1.107.0", - "sources": { - "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-x64/Antigravity.tar.gz", - "sha256": "5232a4048ff4fa15685d9a981ba4fba573e297f3efc9b76f638e794baf775725" - }, - "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-arm/Antigravity.tar.gz", - "sha256": "64d11085f17edc691adbe8952d59887f257d58448705dc2a19dfa23890d36df1" - }, - "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-arm/Antigravity.zip", - "sha256": "4a8a90feed7078dae30d1dbcb268a0497c103ba76df7012a4467587aa7cffdf8" - } - } -} diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 69b330717963..310f4f6bb6bf 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -143,6 +143,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { substituteInPlace scripts/generate-protos.sh \ --replace-fail "/usr/bin/env" "${coreutils}/bin/env" + substituteInPlace package.json \ + --replace-fail \ + '"build:nmh": "go build -o dist/nativeMessagingHost ./go/nativeMessagingHost.go"' \ + '"build:nmh": "go build -trimpath -ldflags=-buildid= -o dist/nativeMessagingHost ./go/nativeMessagingHost.go"' + cp -r ${anytype-heart}/lib dist/ cp -r ${anytype-heart}/bin/anytypeHelper dist/ @@ -168,7 +173,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { # remove unnecessary files preInstall = '' chmod u+w -R dist node_modules - find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + + find dist node_modules -type f \( -name '*.ts' -o -name '*.map' \) -delete + rm -f node_modules/keytar/build/{Makefile,binding.Makefile,config.gypi,keytar.target.mk} + rm -rf node_modules/keytar/build/Release/{.deps,obj.target} ''; installPhase = '' diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index a0c4c6ccc057..70eabcf2a3fc 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, cmake, fetchFromGitHub, hwdata, @@ -21,7 +21,7 @@ wayland-protocols, wayland-scanner, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; version = "0.13.0"; diff --git a/pkgs/by-name/ar/arftracksat/package.nix b/pkgs/by-name/ar/arftracksat/package.nix index a4199fc3f5ad..dfcd43bfab62 100644 --- a/pkgs/by-name/ar/arftracksat/package.nix +++ b/pkgs/by-name/ar/arftracksat/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "arftracksat"; - version = "1.0-unstable-2025-09-15"; + version = "1.0-unstable-2026-02-19"; src = fetchFromGitHub { owner = "arf20"; repo = "arftracksat"; - rev = "5c9b3866b6fcd95382ff56c68cdd38f3d08c1372"; - hash = "sha256-inCgsxrJkBNGmdGPd28XnOJYCiatL35TxDcfvZjA2cY="; + rev = "a9b86878e2ee6f332dc1df07685b7d20970c2f7e"; + hash = "sha256-guDgy4H0pnQCihYwG7HoKApOlEcDtcaRaj6fRuVdLlc="; }; nativeBuildInputs = [ @@ -35,11 +35,13 @@ stdenv.mkDerivation { buildInputs = [ curl nlohmann_json + curlpp + glm + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ freeglut libGL libGLU - curlpp - glm ]; meta = { diff --git a/pkgs/by-name/at/at/package.nix b/pkgs/by-name/at/at/package.nix index cd1a7ea6dfcb..7c5014ad90e6 100644 --- a/pkgs/by-name/at/at/package.nix +++ b/pkgs/by-name/at/at/package.nix @@ -32,17 +32,16 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Remove chown commands and setuid bit substituteInPlace Makefile.in \ - --replace ' -o root ' ' ' \ - --replace ' -g root ' ' ' \ - --replace ' -o $(DAEMON_USERNAME) ' ' ' \ - --replace ' -o $(DAEMON_GROUPNAME) ' ' ' \ - --replace ' -g $(DAEMON_GROUPNAME) ' ' ' \ - --replace '$(DESTDIR)$(etcdir)' "$out/etc" \ - --replace '$(DESTDIR)$(ATJOB_DIR)' "$out/var/spool/atjobs" \ - --replace '$(DESTDIR)$(ATSPOOL_DIR)' "$out/var/spool/atspool" \ - --replace '$(DESTDIR)$(LFILE)' "$out/var/spool/atjobs/.SEQ" \ - --replace 'chown' '# skip chown' \ - --replace '6755' '0755' + --replace-fail ' -o root ' ' ' \ + --replace-fail ' -g root ' ' ' \ + --replace-fail ' -o $(DAEMON_USERNAME) ' ' ' \ + --replace-fail ' -g $(DAEMON_GROUPNAME) ' ' ' \ + --replace-fail '$(DESTDIR)$(etcdir)' "$out/etc" \ + --replace-fail '$(DESTDIR)$(ATJOB_DIR)' "$out/var/spool/atjobs" \ + --replace-fail '$(DESTDIR)$(ATSPOOL_DIR)' "$out/var/spool/atspool" \ + --replace-fail '$(DESTDIR)$(LFILE)' "$out/var/spool/atjobs/.SEQ" \ + --replace-fail 'chown' '# skip chown' \ + --replace-fail '6755' '0755' ''; nativeBuildInputs = [ @@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { export SENDMAIL=${sendmailPath} # Purity: force atd.pid to be placed in /var/run regardless of # whether it exists now. - substituteInPlace ./configure --replace "test -d /var/run" "true" + substituteInPlace ./configure --replace-fail "test -d /var/run" "true" ''; configureFlags = [ diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index c21baf1af977..d9943b6f1cf4 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "aws-vault"; - version = "7.12.4"; + version = "7.13.0"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${finalAttrs.version}"; - hash = "sha256-0jPtqViGD0Xfn0yn2Buh4LwVAiSn7YvDMpNZYirHUmk="; + hash = "sha256-afmApbIydrouoXmu3inLE9EvwFqOJxVkNcVSDjZUcXY="; }; proxyVendor = true; - vendorHash = "sha256-pqD3j1I0zENctgM2lBaYiU3DRCqeq9XIX3jWB2p139I="; + vendorHash = "sha256-I+yKJO+MOCd+wZn4uQt+Xg18b/PWYPm6qxzGEOsCACo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index a2e262f622fb..34d47709b99e 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, runCommand, fetchurl, appimageTools, @@ -12,10 +13,22 @@ let pname = "beeper"; version = "4.2.985"; - src = fetchurl { - url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; - hash = "sha256-oWJdpZL+Q8/jaI/WJfgXUisPASuvHkxU6rOeJkedHSM="; + + inherit (stdenv.hostPlatform) system; + + sources = { + x86_64-linux = fetchurl { + url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; + hash = "sha256-oWJdpZL+Q8/jaI/WJfgXUisPASuvHkxU6rOeJkedHSM="; + }; + aarch64-linux = fetchurl { + url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-arm64.AppImage"; + hash = "sha256-rY302fiRG2c6dwZ+a8e43DjDUklfR0j78XTixhPkvwY="; + }; }; + + src = sources.${system} or (throw "beeper is not supported on ${system}"); + # Beeper 4.2.985+ ships AppImages without the type-2 magic bytes # (ASCII "AI" + 0x02 at ELF offset 8) that appimageTools.extract requires. linuxSrc = runCommand "Beeper-${version}-appimage" { inherit src; } '' @@ -23,6 +36,7 @@ let chmod +w $out printf 'AI\x02' | dd of=$out bs=1 seek=8 conv=notrunc status=none ''; + appimageContents = appimageTools.extract { inherit pname version; src = linuxSrc; @@ -67,6 +81,7 @@ appimageTools.wrapAppImage { ''; passthru = { + inherit sources; updateScript = lib.getExe (writeShellApplication { name = "update-beeper"; runtimeInputs = [ @@ -77,12 +92,11 @@ appimageTools.wrapAppImage { set -o errexit latestLinux="$(curl --silent --output /dev/null --write-out "%{redirect_url}\n" https://api.beeper.com/desktop/download/linux/x64/stable/com.automattic.beeper.desktop)" version="$(echo "$latestLinux" | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')" - update-source-version beeper "$version" + for platform in ${lib.escapeShellArgs (lib.attrNames sources)}; do + update-source-version beeper "$version" --ignore-same-version --source-key="passthru.sources.$platform" + done ''; }); - - # needed for nix-update - inherit src; }; meta = { @@ -99,6 +113,8 @@ appimageTools.wrapAppImage { zh4ngx aspauldingcode ]; - platforms = [ "x86_64-linux" ]; + platforms = lib.attrNames sources; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "beeper"; }; } diff --git a/pkgs/by-name/ca/cargo-seek/package.nix b/pkgs/by-name/ca/cargo-seek/package.nix index 40c2fe80f0fe..3528637eed59 100644 --- a/pkgs/by-name/ca/cargo-seek/package.nix +++ b/pkgs/by-name/ca/cargo-seek/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-seek"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "tareqimbasher"; repo = "cargo-seek"; tag = "v${finalAttrs.version}"; - hash = "sha256-SDVAi4h+/ebGX+8M66Oyd0LfQn+J7/QhDW97ZBdoN14="; + hash = "sha256-WL1S2oU3/T9pEI4rgzT2dJ/ZTiwS/BgraW1MmZ5MQl0="; }; - cargoHash = "sha256-DyXRbtvCJte7mCQKusipeikr981vMHPEVYcGSwVI5Kg="; + cargoHash = "sha256-cXZvuMcNGNWU61ll2dAFxPKWujJNzXpC8aP5vxDONkY="; nativeBuildInputs = [ pkg-config ]; @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/tareqimbasher/cargo-seek"; changelog = "https://github.com/tareqimbasher/cargo-seek/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ yvnth ]; mainProgram = "cargo-seek"; }; }) diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index 4724e3565641..ac575aee3562 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -16,16 +16,16 @@ let in buildGoModule (finalAttrs: { pname = "centrifugo"; - version = "6.6.2"; + version = "6.9.1"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${finalAttrs.version}"; - hash = "sha256-V67riIkwBKz4YvCo6PJS3jrVl3Q6DE9ewEzzHPi7YFE="; + hash = "sha256-j5ezw4LOwNK61fk71XFfUtqyXwUyX5QwHPvbH4sOtjE="; }; - vendorHash = "sha256-K/90YrXkwiDt9Zm6h5nVo34WjtQQKBCNigJguwAdW5E="; + vendorHash = "sha256-hmAZ5fo9Hko2w+xwessHGTXlifHDGGAHmtehP1CVdkE="; ldflags = [ "-s" diff --git a/pkgs/by-name/ci/civicrm/package.nix b/pkgs/by-name/ci/civicrm/package.nix new file mode 100644 index 000000000000..5e10dadc8bed --- /dev/null +++ b/pkgs/by-name/ci/civicrm/package.nix @@ -0,0 +1,38 @@ +{ + lib, + php, + fetchFromGitHub, +}: +php.buildComposerProject2 (finalAttrs: { + pname = "civicrm-core"; + version = "6.15.3"; + __structuredAttrs = true; + strictDeps = true; + dontUnpack = false; + + src = fetchFromGitHub { + owner = "civicrm"; + repo = "civicrm-core"; + tag = finalAttrs.version; + hash = "sha256-BKiV2dZSFo5asnTwtnNsJrZKjFd9Ar3a3kaIlpuGDp8="; + }; + + vendorHash = "sha256-z4DyAupfGNxhEuGShZQA8bl6041od0Kx0/BAoz9uc5I="; + + installPhase = '' + runHook preInstall + mkdir -p $out/ + cp -R . $out/ + cp $out/bin/setup.conf.txt $out/bin/setup.conf + runHook postInstall + ''; + + meta = { + homepage = "https://civicrm.org/"; + changelog = "https://download.civicrm.org/release/${finalAttrs.version}"; + description = "Standalone version of CiviCRM, a CRM software for non-profit organizations"; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.sorooris ]; + mainProgram = "civicrm"; + }; +}) diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 78d4a6e64bf7..eb65597248ff 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -13,17 +13,17 @@ let pname = "clash-verge-rev"; # Please keep service version in sync - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "clash-verge-rev"; repo = "clash-verge-rev"; tag = "v${version}"; - hash = "sha256-2X2QlWo12qM7RT0wjf1Xlmh3We2wZR/kJnSxIxVst9Y="; + hash = "sha256-5Txjuzq91D+FfBHaXenES4eprIdIKHUFMOKtrHSdbw4="; }; - pnpm-hash = "sha256-Z0ToQUPyttebDOjpdisAtjIKM026x9ZtIVPOeq4163A="; - vendor-hash = "sha256-nF9d1OWpn3rf4EPhD4vqQbKEp/J5pc7J7XJDgAjd0DA="; + pnpm-hash = "sha256-AS07hD3QqPJDLLUvNgArtXpH54ek14PmEjevP1WxTHs="; + vendor-hash = "sha256-GPqgzOLFPAb8SNgE3vI5Ypx+zJvk+5TgkttRVktxttU="; service = callPackage ./service.nix { inherit diff --git a/pkgs/by-name/cl/clash-verge-rev/patch-service-directory.patch b/pkgs/by-name/cl/clash-verge-rev/patch-service-directory.patch index 186340d9b9cd..8b9aa2962a23 100644 --- a/pkgs/by-name/cl/clash-verge-rev/patch-service-directory.patch +++ b/pkgs/by-name/cl/clash-verge-rev/patch-service-directory.patch @@ -1,26 +1,65 @@ diff --git a/src/core/server.rs b/src/core/server.rs -index 45570ea..d459b3e 100644 +index 0098b20..db189e2 100644 --- a/src/core/server.rs +++ b/src/core/server.rs -@@ -123,7 +123,7 @@ async fn make_ipc_dir() -> Result<()> { - // on macOS or the primary group on Linux) to manage the socket's lifecycle. This prevents - // permission denied errors when the GUI process, running with non-root privileges, - // attempts to recreate the socket during service initialization or sidecar fallbacks. -- fs::set_permissions(dir_path, Permissions::from_mode(0o2770)).await?; -+ fs::set_permissions(dir_path, Permissions::from_mode(0o770)).await?; +@@ -73,7 +73,7 @@ pub async fn run_ipc_server() -> Result>> { + tokio::time::sleep(std::time::Duration::from_millis(25)).await; + } + if socket_ready { +- fs::set_permissions(paths.ipc_path(), Permissions::from_mode(0o777)).await?; ++ fs::set_permissions(paths.ipc_path(), Permissions::from_mode(0o660)).await?; + } else { + warn!( + "IPC socket {:?} did not appear before permission update timeout", +@@ -298,19 +298,9 @@ fn ensure_ipc_dir(dir: &std::path::Path) -> std::io::Result<()> { + return Err(std::io::Error::last_os_error()); } - #[cfg(windows)] - { + +- let gid = resolve_ipc_dir_gid(); +- // 以 root 运行(生产/launchd)时强制属主为 root:若攻击者预置 `/tmp/verge` 为其拥有的 +- // 真实目录,必须夺回属主,否则其以 owner 身份保留对目录(及内部 socket)的管理权。 +- // 非 root(测试/开发)既无权设 root 属主也无攻击面,跳过 chown,仅设权限位。 +- // chown/chmod 失败即 fatal;`&&`/`||` 短路使 `last_os_error()` 为失败 syscall 的 errno。 +- let chown_ok = +- unsafe { platform_lib::geteuid() } != 0 || unsafe { platform_lib::fchown(fd, 0, gid) } == 0; +- let ok = chown_ok && unsafe { platform_lib::fchmod(fd, 0o2770 as platform_lib::mode_t) } == 0; +- let result = if ok { +- Ok(()) +- } else { +- Err(std::io::Error::last_os_error()) +- }; ++ // The NixOS module's RuntimeDirectory owns the directory access policy. ++ // Opening it with O_NOFOLLOW above still validates that it is not a symlink. ++ let result: std::io::Result<()> = Ok(()); + unsafe { + platform_lib::close(fd); + } +@@ -414,14 +404,9 @@ pub fn spawn_socket_dir_watchdog() { + continue; + } + +- // 目录已存在：组属可能过期(开机落 staff、之后控制台用户主组不同)，或被替换为 +- // symlink/文件。用 lstat(no-follow)判断，必要时经 ensure_ipc_dir 安全收敛 +- // (issue #7333 开机竞态尾部 + /tmp symlink 防护)。一致则跳过，避免抖动。 +- use std::os::unix::fs::MetadataExt; +- let needs_fix = match std::fs::symlink_metadata(dir) { +- Ok(meta) if meta.file_type().is_dir() => meta.gid() != resolve_ipc_dir_gid(), +- _ => true, +- }; ++ // RuntimeDirectory owns group and mode; only reject a replaced path. ++ let needs_fix = ++ !matches!(std::fs::symlink_metadata(dir), Ok(meta) if meta.file_type().is_dir()); + if needs_fix && let Err(e) = ensure_ipc_dir(dir) { + warn!("Failed to re-apply ownership on {:?}: {}", dir, e); + } diff --git a/src/lib.rs b/src/lib.rs index a21f89b..81175fc 100644 --- a/src/lib.rs +++ b/src/lib.rs -@@ -12,7 +12,7 @@ pub use core::{run_ipc_server, stop_ipc_server}; - pub use client::*; - +@@ -24,6 +24,6 @@ pub use client::*; + #[cfg(all(unix, not(feature = "test")))] -pub static IPC_PATH: &str = "/tmp/verge/clash-verge-service.sock"; +pub static IPC_PATH: &str = "/run/clash-verge-rev/service.sock"; #[cfg(all(windows, not(feature = "test")))] pub static IPC_PATH: &str = r"\\.\pipe\clash-verge-service"; - diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix index 49dad0962642..bd9c3b776f67 100644 --- a/pkgs/by-name/cl/clash-verge-rev/service.nix +++ b/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -7,25 +7,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "clash-verge-service-ipc"; - version = "2.3.0"; + version = "2.3.3"; src = fetchFromGitHub { owner = "clash-verge-rev"; repo = "clash-verge-service-ipc"; - # upstream uses branch - rev = "21e661fa141e5ad3c705ee4cdb86efff8df6f769"; - hash = "sha256-XavlZWxuZKCTyIYpuXRvXpXCdakWhbLhOMmOrGBgDRo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/kr0C+4bhal7DqKudtZvhPYUyn6xbxQw57g6ieJV64w="; }; patches = [ - # 1. Don't SetGID because the path is managed by systemd in NixOS, and we - # use different IPC path for sidecar mode. We can keep RestrictSUIDSGID - # in systemd serviceConfig. - # 2. Set IPC socket path + # Let the NixOS module's RuntimeDirectory/Group own socket access policy. + # Upstream defaults target installer-managed /tmp paths and broad fallback + # permissions, which do not fit the hardened systemd service. ./patch-service-directory.patch ]; - cargoHash = "sha256-WhH2o5wN5vYW8jZl+hWbnk1xqHu61ibAr4+/CI3YKHg="; + cargoHash = "sha256-2/lFfhP2414iiH+zG2TvNy6uaCzDldoo7sIfhKrQaFg="; buildFeatures = [ "standalone" diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 2a8bd0e7760c..7cf47e1c6e4c 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -13,7 +13,7 @@ moreutils, nodejs, pkg-config, - pnpm_10, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage { version src ; - pnpm = pnpm_10; + pnpm = pnpm_11; fetcherVersion = 4; hash = pnpm-hash; }; @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage { nodejs pkg-config pnpmConfigHook - pnpm_10 + pnpm_11 ]; buildInputs = [ diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index b9f528ffca0d..31f66c6b4229 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,47 @@ { - "version": "2.1.215", - "commit": "316ce99628e89900bf0b1328fed3b8fec0c0c92d", - "buildDate": "2026-07-19T00:11:19Z", + "version": "2.1.216", + "commit": "7fead72f57c595d5a353a2e477bd2608d27ddcc6", + "buildDate": "2026-07-20T18:40:59Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "90608b5c5ab504e96e77365cea6203d046e291d59b2bb42cf28dcb2ccdf9dd58", - "size": 247124336 + "checksum": "d01b49210d72ecbe277a2665d104bacccddf2d22185be99446d2929e0edfc48d", + "size": 249225584 }, "darwin-x64": { "binary": "claude", - "checksum": "1ef5f5e56ede9f7765a9bef654ece6045dba58f48b7f5b699765375953d52b6b", - "size": 256540048 + "checksum": "e17cdc51437bd7a80ce0244d25045f568d67b212eea4ff81b83ee90f8666e42f", + "size": 258670096 }, "linux-arm64": { "binary": "claude", - "checksum": "2b43a3d5b0787217e5d7381fad42c7314292546fe9db9eb8b9b379de90509b30", - "size": 262060960 + "checksum": "9e3a6aecc5164f607e1183aea2092c7d7705d146e504a6207df291776996a8ea", + "size": 264158112 }, "linux-x64": { "binary": "claude", - "checksum": "c1efffaaf370aa187cb6a09dd93d4e511c646899b0078476f83791b664bde7fe", - "size": 265239536 + "checksum": "74deca45220b8080ec75ab099bd5a5980e41a2b5879846a008fb115d436de085", + "size": 267353072 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "95f1bb89dd94ae099c7b5e53832f99624fdf82da8e0f11d81e1632b26e61973e", - "size": 255309160 + "checksum": "70b5dcf81bd13212ab26ec9427fa87527cd44ceb3a2a21ac04308d0f1a418a52", + "size": 257406312 }, "linux-x64-musl": { "binary": "claude", - "checksum": "3a14b862d102d0b6b88650a00b8489b1dfec7f84b367f8192ee62c8bdaeb9220", - "size": 259863120 + "checksum": "54ac63736128b3aa9a73e2d9ba1f35177eb69d7b97d975f63a36d33fe0666652", + "size": 261976656 }, "win32-x64": { "binary": "claude.exe", - "checksum": "f14452d1e199273795f2920c00fd7a7f818178ddf1f3efb4d005a7e3d4ec4eff", - "size": 256247968 + "checksum": "902215367918866f3c36564e115bd5636d60178acf28181713d449275b833540", + "size": 258288288 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "0e976441467cb09e35b52c83e661ce8e148c5a8766e0899a4255d95c4b8110f6", - "size": 250623648 + "checksum": "850ba4969ca49964b418863648131f65f76107be36d6719ff0aaaf3dfc9a422e", + "size": 252663968 } }, "sdkCompat": { @@ -66,7 +66,8 @@ "0.3.205", "0.3.207", "0.3.208", - "0.3.209" + "0.3.209", + "0.3.215" ], "harnessSchema": 1 } diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix index 4b9b9cfaded9..4616222f3363 100644 --- a/pkgs/by-name/cl/clickhouse/generic.nix +++ b/pkgs/by-name/cl/clickhouse/generic.nix @@ -165,8 +165,17 @@ llvmStdenv.mkDerivation (finalAttrs: { gitHash = rev; in '' - cat <<'EOF' > cmake/autogenerated_versions.txt - SET(VERSION_REVISION 0) + # Preserve VERSION_REVISION from the source tree, like ClickHouse CI + # does. It identifies the server release line to clients (exposed via + # the revision() SQL function) + versionRevision=$(sed -n 's/^SET(VERSION_REVISION \([0-9]\{1,\}\))$/\1/p' cmake/autogenerated_versions.txt) + if [[ -z "$versionRevision" ]]; then + echo "Could not extract VERSION_REVISION from cmake/autogenerated_versions.txt" >&2 + exit 1 + fi + + cat < cmake/autogenerated_versions.txt + SET(VERSION_REVISION $versionRevision) SET(VERSION_MAJOR ${major}) SET(VERSION_MINOR ${minor}) SET(VERSION_PATCH ${patch}) diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix index 297d75ea3bd9..aed4568a8329 100644 --- a/pkgs/by-name/cl/clickhouse/lts.nix +++ b/pkgs/by-name/cl/clickhouse/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "26.3.17.4-lts"; - rev = "00f5ad7bc29d8bb65e1f7eb24208da15db3cf642"; - hash = "sha256-RJSqcsn3ZOL145RTUs4QujPm6DHjDSYiL9jI1C1YCVE="; + version = "26.3.17.56-lts"; + rev = "c57540de480d8a501b601163471d3843674378cf"; + hash = "sha256-fcRxZbcp7t28bC9vlmgVAV9gB63cQwFWsc0gyKxGhvQ="; lts = true; } diff --git a/pkgs/by-name/co/cockpit-zfs/package.nix b/pkgs/by-name/co/cockpit-zfs/package.nix index 5ead4c6b4786..23189d2644da 100644 --- a/pkgs/by-name/co/cockpit-zfs/package.nix +++ b/pkgs/by-name/co/cockpit-zfs/package.nix @@ -46,14 +46,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "cockpit-zfs"; - version = "1.2.30"; + version = "1.2.33"; src = fetchFromGitHub { owner = "45Drives"; repo = "cockpit-zfs"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-G24xNoKoBnlXxxyo9IJIoQW3PrktQxsx37/cX6QYfyE="; + hash = "sha256-3KoCp4gcWYuama+7t1oQhif3/Ii/zSlhyeNTH3mvbNg="; }; missingHashes = ./missing-hashes.json; diff --git a/pkgs/by-name/co/commet-chat/fix-hardcoded-flutter-cmd.patch b/pkgs/by-name/co/commet-chat/fix-hardcoded-flutter-cmd.patch new file mode 100644 index 000000000000..7126ebdb6a42 --- /dev/null +++ b/pkgs/by-name/co/commet-chat/fix-hardcoded-flutter-cmd.patch @@ -0,0 +1,111 @@ +--- a/scripts/codegen.dart ++++ b/scripts/codegen.dart +@@ -2,38 +2,7 @@ + + import 'dart:io'; + +-Future getDependencies() async { +- var process = Process.runSync( +- "flutter", +- [ +- "pub", +- "get", +- ], +- runInShell: true, +- ); +- +- print(process.stdout); +- print(process.stderr); +- return process; +-} +- +-Future intlUtilsGenerate() async { +- var process = await Process.run( +- "flutter", +- [ +- "pub", +- "run", +- "intl_utils:generate", +- ], +- runInShell: true, +- ); +- +- print(process.stdout); +- print(process.stderr); +- return process; +-} +- +-Future> generateFileLists() async { ++void main() async { + var dir = Directory("lib/generated/l10n"); + if (!dir.existsSync()) { + dir.create(recursive: true); +@@ -82,68 +51,4 @@ + + await arbFile.create(recursive: true); + arbFile.writeAsStringSync(fileList); +- +- return [sourcesFile, arbFile]; +-} +- +-Future generateFromArb(List files) async { +- var process = await Process.run( +- "flutter", +- [ +- "pub", +- "run", +- "intl_translation:generate_from_arb", +- "--sources-list-file", +- files[0].absolute.path, +- "--translations-list-file", +- files[1].absolute.path, +- "--output-dir=lib/generated/l10n" +- ], +- runInShell: true, +- ); +- +- print(process.stdout); +- print(process.stderr); +- return process; +-} +- +-Future buildRunner() async { +- var process = await Process.run( +- "flutter", +- [ +- "pub", +- "run", +- "build_runner", +- "build", +- "--delete-conflicting-outputs", +- ], +- runInShell: true, +- ); +- +- print(process.stdout); +- print(process.stderr); +- return process; +-} +- +-void main() async { +- var result = await getDependencies(); +- if (result.exitCode != 0) { +- exit(result.exitCode); +- } +- +- result = await intlUtilsGenerate(); +- if (result.exitCode != 0) { +- exit(result.exitCode); +- } +- +- var files = await generateFileLists(); +- result = await generateFromArb(files); +- if (result.exitCode != 0) { +- exit(result.exitCode); +- } +- +- result = await buildRunner(); +- if (result.exitCode != 0) { +- exit(result.exitCode); +- } + } diff --git a/pkgs/by-name/co/commet-chat/package.nix b/pkgs/by-name/co/commet-chat/package.nix new file mode 100644 index 000000000000..9bf90ddf9f95 --- /dev/null +++ b/pkgs/by-name/co/commet-chat/package.nix @@ -0,0 +1,164 @@ +{ + lib, + flutter341, + stdenv, + fetchFromGitHub, + fetchzip, + + webkitgtk_4_1, + mimalloc, + keybinder3, + + mpv-unwrapped, + libdovi, + libdvdcss, + libunwind, + + libgbm, + libdrm, +}: + +let + libwebrtcRpath = lib.makeLibraryPath [ + libgbm + libdrm + ]; + libwebrtc = fetchzip { + url = "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.2.0/libwebrtc.zip"; + hash = "sha256-i4LRG44f//SDIOl072yZavkYoTZdiydPZndeOm6/fBM="; + }; +in +flutter341.buildFlutterApplication (finalAttrs: { + pname = "commet-chat"; + version = "0.4.2+hotfix.2"; + + src = fetchFromGitHub { + owner = "commetchat"; + repo = "commet"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Pf+JeVuTPxpufcx/whn8RVcYp1e69CJBFzyZaQ8I5RQ="; + fetchSubmodules = true; + leaveDotGit = true; + + # For the git hash property in about page + postFetch = '' + cd $out + git rev-parse HEAD | head -c 7 > $out/GIT_HASH + find $out -name .git -print0 | xargs -0 rm -rf + ''; + }; + strictDeps = true; + sourceRoot = "${finalAttrs.src.name}/commet"; + + pubspecLockFilePath = "../pubspec.lock"; + pubspecLock = lib.importJSON ./pubspec.lock.json; + + gitHashes = { + calendar_view = "sha256-tGAMK89VsgqfKQy+t8x5zl6dbQEf5h4HxSUR8crB1oM="; + desktop_webview_window = "sha256-EOh5QoOuAxiYn0IcdxY7taN2Twu8GshY9zAoGCztPnA="; + dynamic_color = "sha256-4zSTiXplkBjtPtzssj3VaHTVo9YlYKNTMLgBIM5MMe4="; + flutter_highlighter = "sha256-Y84Besir3gu1RnQt9YoE0GyIJLLZ6H0Kki/Wf6z6QMg="; + flutter_html = "sha256-576KYoYB4sZeavcAS8V5rjDG9hezYlN2Q4zlyvBOouw="; + flutter_local_notifications = "sha256-AgvvFoJgos/gsTwcLGX/CxbHauWiH3OHksqtF0Dauuw="; + flutter_local_notifications_linux = "sha256-AgvvFoJgos/gsTwcLGX/CxbHauWiH3OHksqtF0Dauuw="; + markdown = "sha256-2rEMNJM9Vy7LrFLt30/Z3pyqERTYJei9D3mgOAAvVPg="; + matrix = "sha256-PB7xjulxmV2jE0WGVG116T50BrT3G5LsdLreR1cJTPI="; + matrix_dart_sdk_drift_db = "sha256-2sSN2TcPAPVdEm3NXpZyWlPvArNn2CWnPph5Vz48KQ8="; + receive_intent = "sha256-wGIOZRH4O3a44I8zG5Q1hCwn4SMuTWB7i9wtGSLZWeQ="; + signal_sticker_api = "sha256-VdEE3Bt8gpfUpxxYSz5319YEL49Eh+loO+ZipI1DoyA="; + starfield = "sha256-ebVRyVkyLfHCC6EBmx5evXL1U71S3tgCMo1yLWlIcw4="; + launcher_entry = "sha256-T/zQRvY6jOKroMrhVwBtsoSm2xCFjOd5jsJC0PA4cpc="; + }; + + buildInputs = [ + webkitgtk_4_1 + mimalloc + keybinder3 + + mpv-unwrapped + libdovi + libdvdcss + libunwind + ] + ++ mpv-unwrapped.buildInputs; + + env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}"; + env.COMMET_PROD = 1; + + targetFlutterPlatform = "linux"; + + customSourceBuilders = { + flutter_webrtc = + { version, src, ... }: + stdenv.mkDerivation { + pname = "flutter_webrtc"; + inherit version src; + inherit (src) passthru; + + postPatch = '' + substituteInPlace third_party/CMakeLists.txt \ + --replace-fail "\''${CMAKE_CURRENT_LIST_DIR}/downloads/libwebrtc.zip" ${libwebrtc} + ln -s ${libwebrtc} third_party/libwebrtc + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r ./* $out/ + + runHook postInstall + ''; + }; + }; + + # The original codegen.dart hardcodes flutter calls inside, so the patch basically rewrites the codegen script forcing nix. + patches = [ + ./fix-hardcoded-flutter-cmd.patch + ]; + + flutterBuildFlags = [ + "--dart-define=BUILD_MODE=release" + "--dart-define=PLATFORM=linux" + "--dart-define=VERSION_TAG=v${finalAttrs.version}" + "--dart-define=BUILD_DETAIL=${stdenv.hostPlatform.system}" + ]; + + preBuild = '' + export flutterBuildFlags="$flutterBuildFlags --dart-define=GIT_HASH=$(cat ../GIT_HASH)" + + packageRun intl_utils -e generate + dart run --packages=.dart_tool/package_config.json scripts/codegen.dart + packageRun intl_translation -e generate_from_arb \ + --sources-list-file /build/source/commet/lib/generated/l10n/sources_list_file.txt \ + --translations-list-file /build/source/commet/lib/generated/l10n/arb_list_file.txt \ + --output-dir=lib/generated/l10n + packageRun build_runner build --delete-conflicting-outputs + ''; + + extraWrapProgramArgs = "--suffix LD_LIBRARY_PATH : $out/app/commet-chat/lib"; + + postInstall = '' + mkdir -p $out/share/applications + install -Dm644 \ + linux/debian/usr/share/applications/chat.commet.commetapp.desktop \ + $out/share/applications/ + substituteInPlace $out/share/applications/chat.commet.commetapp.desktop \ + --replace-fail "/usr/lib/chat.commet.commetapp/commet" "commet" + + mkdir -p $out/share/icons + cp -r linux/debian/usr/share/icons/hicolor $out/share/icons/hicolor + + patchelf --add-rpath ${libwebrtcRpath} $out/app/commet-chat/lib/libwebrtc.so + ''; + + __structuredAttrs = true; + meta = { + homepage = "https://commet.chat"; + description = "Client for Matrix focused on providing a feature rich experience while maintaining a simple interface"; + platforms = lib.platforms.linux; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ckgxrg ]; + mainProgram = "commet"; + }; +}) diff --git a/pkgs/by-name/co/commet-chat/pubspec.lock.json b/pkgs/by-name/co/commet-chat/pubspec.lock.json new file mode 100644 index 000000000000..8b607ce3ff58 --- /dev/null +++ b/pkgs/by-name/co/commet-chat/pubspec.lock.json @@ -0,0 +1,3058 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "85.0.0" + }, + "accessibility_tools": { + "dependency": "transitive", + "description": { + "name": "accessibility_tools", + "sha256": "c29732e423175a51e0a6ace7df1255f5d77812c7c7b7101d8ba0186a43d533aa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.8.0" + }, + "adaptive_number": { + "dependency": "transitive", + "description": { + "name": "adaptive_number", + "sha256": "3a567544e9b5c9c803006f51140ad544aedc79604fd4f3f2c1380003f97c1d77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "analyzer": { + "dependency": "direct overridden", + "description": { + "name": "analyzer", + "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.1" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.0" + }, + "base58check": { + "dependency": "transitive", + "description": { + "name": "base58check", + "sha256": "6c300dfc33e598d2fe26319e13f6243fea81eaf8204cb4c6b69ef20a625319a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "blurhash_dart": { + "dependency": "transitive", + "description": { + "name": "blurhash_dart", + "sha256": "43955b6c2e30a7d440028d1af0fa185852f3534b795cc6eb81fbf397b464409f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_cli_annotations": { + "dependency": "transitive", + "description": { + "name": "build_cli_annotations", + "sha256": "e563c2e01de8974566a1998410d3f6f03521788160a02503b0b1f1a46c7b3d95", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_runner": { + "dependency": "transitive", + "description": { + "name": "build_runner", + "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.2" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.12.3" + }, + "calendar_view": { + "dependency": "direct overridden", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "fbd03769c8715cf43211dfb878640a5fc0133dbc", + "url": "https://github.com/commetchat/flutter_calendar_view.git" + }, + "source": "git", + "version": "2.0.0" + }, + "canonical_json": { + "dependency": "transitive", + "description": { + "name": "canonical_json", + "sha256": "d6be1dd66b420c6ac9f42e3693e09edf4ff6edfee26cb4c28c1c019fdb8c0c15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "charcode": { + "dependency": "transitive", + "description": { + "name": "charcode", + "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "code_assets": { + "dependency": "transitive", + "description": { + "name": "code_assets", + "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.1" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "connectivity_plus": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus", + "sha256": "b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.5" + }, + "connectivity_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus_platform_interface", + "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "console": { + "dependency": "transitive", + "description": { + "name": "console", + "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "crop_image": { + "dependency": "transitive", + "description": { + "name": "crop_image", + "sha256": "27cbce1685a595efee62caab81c98b49b636f765c1da86353f58f5b2bf2775d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.17" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.5+2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "cryptography": { + "dependency": "transitive", + "description": { + "name": "cryptography", + "sha256": "3eda3029d34ec9095a27a198ac9785630fe525c0eb6a49f3d575272f8e792ef0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.9.0" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.17.3" + }, + "cupertino_icons": { + "dependency": "transitive", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "dart_ipc": { + "dependency": "transitive", + "description": { + "name": "dart_ipc", + "sha256": "6cad558cda5304017c1f581df4c96fd4f8e4ee212aae7bfa4357716236faa9ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "dart_jsonwebtoken": { + "dependency": "transitive", + "description": { + "name": "dart_jsonwebtoken", + "sha256": "0de65691c1d736e9459f22f654ddd6fd8368a271d4e41aa07e53e6301eff5075", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.1" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.8" + }, + "dart_webrtc": { + "dependency": "transitive", + "description": { + "name": "dart_webrtc", + "sha256": "4ed7b9fa9924e5a81eb39271e2c2356739dd1039d60a13b86ba6c5f448625086", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.7.0" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.12" + }, + "desktop_drop": { + "dependency": "transitive", + "description": { + "name": "desktop_drop", + "sha256": "d55a010fe46c8e8fcff4ea4b451a9ff84a162217bdb3b2a0aa1479776205e15d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.4" + }, + "desktop_notifications": { + "dependency": "transitive", + "description": { + "name": "desktop_notifications", + "sha256": "6d92694ad6e9297a862c5ff7dd6b8ff64c819972557754769f819d2209612927", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.3" + }, + "desktop_webview_window": { + "dependency": "direct overridden", + "description": { + "path": "packages/desktop_webview_window", + "ref": "webview-patch", + "resolved-ref": "82c19ad6ee5ac2b2acac6001d3e0cbefb90f1e22", + "url": "https://github.com/commetchat/mixin-flutter-plugins.git" + }, + "source": "git", + "version": "0.2.3" + }, + "device_frame_plus": { + "dependency": "transitive", + "description": { + "name": "device_frame_plus", + "sha256": "ccc94abccd4d9f0a9f19ef239001b3a59896e678ad42601371d7065889f2bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "device_info_plus": { + "dependency": "transitive", + "description": { + "name": "device_info_plus", + "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.5.0" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.3" + }, + "drift": { + "dependency": "transitive", + "description": { + "name": "drift", + "sha256": "540cf382a3bfa99b76e51514db5b0ebcd81ce3679b7c1c9cb9478ff3735e47a1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.28.2" + }, + "drift_dev": { + "dependency": "transitive", + "description": { + "name": "drift_dev", + "sha256": "68c138e884527d2bd61df2ade276c3a144df84d1adeb0ab8f3196b5afe021bd4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.28.0" + }, + "dropdown_button2": { + "dependency": "transitive", + "description": { + "name": "dropdown_button2", + "sha256": "b0fe8d49a030315e9eef6c7ac84ca964250155a6224d491c1365061bc974a9e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.9" + }, + "dynamic_color": { + "dependency": "transitive", + "description": { + "path": "packages/dynamic_color", + "ref": "HEAD", + "resolved-ref": "f8a2817197fb68bac47bd1067152c46a4ab56cab", + "url": "https://github.com/Airyzz/material-flutter-packages.git" + }, + "source": "git", + "version": "1.7.0" + }, + "ed25519_edwards": { + "dependency": "transitive", + "description": { + "name": "ed25519_edwards", + "sha256": "6ce0112d131327ec6d42beede1e5dfd526069b18ad45dcf654f15074ad9276cd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.8" + }, + "exif": { + "dependency": "transitive", + "description": { + "name": "exif", + "sha256": "a7980fdb3b7ffcd0b035e5b8a5e1eef7cadfe90ea6a4e85ebb62f87b96c7a172", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.3" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "file_picker": { + "dependency": "transitive", + "description": { + "name": "file_picker", + "sha256": "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.3.10" + }, + "file_selector_linux": { + "dependency": "transitive", + "description": { + "name": "file_selector_linux", + "sha256": "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4" + }, + "file_selector_macos": { + "dependency": "transitive", + "description": { + "name": "file_selector_macos", + "sha256": "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.5" + }, + "file_selector_platform_interface": { + "dependency": "transitive", + "description": { + "name": "file_selector_platform_interface", + "sha256": "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "file_selector_windows": { + "dependency": "transitive", + "description": { + "name": "file_selector_windows", + "sha256": "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+5" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_background": { + "dependency": "transitive", + "description": { + "name": "flutter_background", + "sha256": "8dad66e3102da2b4046cc3adcf70625578809827170bd78e36e5890c074287d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0+1" + }, + "flutter_background_service": { + "dependency": "transitive", + "description": { + "name": "flutter_background_service", + "sha256": "70a1c185b1fa1a44f8f14ecd6c86f6e50366e3562f00b2fa5a54df39b3324d3d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.0" + }, + "flutter_background_service_android": { + "dependency": "transitive", + "description": { + "name": "flutter_background_service_android", + "sha256": "ca0793d4cd19f1e194a130918401a3d0b1076c81236f7273458ae96987944a87", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "flutter_background_service_ios": { + "dependency": "transitive", + "description": { + "name": "flutter_background_service_ios", + "sha256": "6037ffd45c4d019dab0975c7feb1d31012dd697e25edc05505a4a9b0c7dc9fba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.3" + }, + "flutter_background_service_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_background_service_platform_interface", + "sha256": "ca74aa95789a8304f4d3f57f07ba404faa86bed6e415f83e8edea6ad8b904a41", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.2" + }, + "flutter_blurhash": { + "dependency": "transitive", + "description": { + "name": "flutter_blurhash", + "sha256": "5e67678e479ac639069d7af1e133f4a4702311491188ff3e0227486430db0c06", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.2" + }, + "flutter_driver": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_highlighter": { + "dependency": "transitive", + "description": { + "path": "flutter_highlighter", + "ref": "HEAD", + "resolved-ref": "4de60d39c9fe4b828f90a019d0afc89e713c704e", + "url": "https://github.com/commetchat/highlight.git" + }, + "source": "git", + "version": "0.1.1" + }, + "flutter_html": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "1a2539aa10047b557f590abe21e8a5be0a93be70", + "url": "https://github.com/commetchat/flutter_html.git" + }, + "source": "git", + "version": "3.0.0-beta.2" + }, + "flutter_launcher_icons": { + "dependency": "transitive", + "description": { + "name": "flutter_launcher_icons", + "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_local_notifications": { + "dependency": "transitive", + "description": { + "path": "flutter_local_notifications", + "ref": "HEAD", + "resolved-ref": "93f906985388835d24eea13ae6ccd8ee656f2cf1", + "url": "https://github.com/commetchat/flutter_local_notifications.git" + }, + "source": "git", + "version": "19.4.1" + }, + "flutter_local_notifications_linux": { + "dependency": "direct overridden", + "description": { + "path": "flutter_local_notifications_linux", + "ref": "HEAD", + "resolved-ref": "93f906985388835d24eea13ae6ccd8ee656f2cf1", + "url": "https://github.com/commetchat/flutter_local_notifications.git" + }, + "source": "git", + "version": "6.0.0" + }, + "flutter_local_notifications_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_platform_interface", + "sha256": "277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.0" + }, + "flutter_local_notifications_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_windows", + "sha256": "8d658f0d367c48bd420e7cf2d26655e2d1130147bca1eea917e576ca76668aaf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "flutter_localizations": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_markdown": { + "dependency": "transitive", + "description": { + "name": "flutter_markdown", + "sha256": "04c4722cc36ec5af38acc38ece70d22d3c2123c61305d555750a091517bbe504", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.23" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.33" + }, + "flutter_rust_bridge": { + "dependency": "transitive", + "description": { + "name": "flutter_rust_bridge", + "sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.1" + }, + "flutter_shortcuts_new": { + "dependency": "transitive", + "description": { + "name": "flutter_shortcuts_new", + "sha256": "16ee1c8a9bc9586b5117ebb774a8ff6b396f856743e97251eb483c4dc5769d7f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "flutter_staggered_grid_view": { + "dependency": "transitive", + "description": { + "name": "flutter_staggered_grid_view", + "sha256": "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "flutter_svg": { + "dependency": "transitive", + "description": { + "name": "flutter_svg", + "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "flutter_test": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_timezone": { + "dependency": "transitive", + "description": { + "name": "flutter_timezone", + "sha256": "978192f2f9ea6d019a4de4f0211d76a9af955ca24865828fa98ca4e20cf0cb3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.1" + }, + "flutter_vodozemac": { + "dependency": "transitive", + "description": { + "name": "flutter_vodozemac", + "sha256": "ef4c3580a7f2fe8eebb7602c6cba593a42b4a5e5466c372a022f77ccc14914a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "flutter_web_auth_2": { + "dependency": "transitive", + "description": { + "name": "flutter_web_auth_2", + "sha256": "3c14babeaa066c371f3a743f204dd0d348b7d42ffa6fae7a9847a521aff33696", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "flutter_web_auth_2_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_web_auth_2_platform_interface", + "sha256": "c63a472c8070998e4e422f6b34a17070e60782ac442107c70000dd1bed645f4d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_webrtc": { + "dependency": "transitive", + "description": { + "name": "flutter_webrtc", + "sha256": "71a38363a5b50603e405c275f30de2eb90f980b0cc94b0e1e9d8b9d6a6b03bf0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "fuchsia_remote_debug_protocol": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "fuzzy": { + "dependency": "transitive", + "description": { + "name": "fuzzy", + "sha256": "af5fbd36f2f8de0663a5b562ef5ca209aea957e81a2f0e97f97475cfbed044ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "get_it": { + "dependency": "transitive", + "description": { + "name": "get_it", + "sha256": "1d648d2dd2047d7f7450d5727ca24ee435f240385753d90b49650e3cdff32e56", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.2.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "highlighter": { + "dependency": "transitive", + "description": { + "name": "highlighter", + "sha256": "92180c72b9da8758e1acf39a45aa305a97dcfe2fdc8f3d1d2947c23f2772bfbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "hooks": { + "dependency": "transitive", + "description": { + "name": "hooks", + "sha256": "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "hotkey_manager": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager", + "sha256": "06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.3" + }, + "hotkey_manager_linux": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager_linux", + "sha256": "83676bda8210a3377bc6f1977f193bc1dbdd4c46f1bdd02875f44b6eff9a8473", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "hotkey_manager_macos": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager_macos", + "sha256": "03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "hotkey_manager_platform_interface": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager_platform_interface", + "sha256": "98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "hotkey_manager_windows": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager_windows", + "sha256": "0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "html": { + "dependency": "transitive", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "html_unescape": { + "dependency": "transitive", + "description": { + "name": "html_unescape", + "sha256": "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "icalendar_parser": { + "dependency": "transitive", + "description": { + "name": "icalendar_parser", + "sha256": "107f936d286723346660df88191888562fc44c2def46ed8858a301a4777ad821", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "image_picker": { + "dependency": "transitive", + "description": { + "name": "image_picker", + "sha256": "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "image_picker_android": { + "dependency": "transitive", + "description": { + "name": "image_picker_android", + "sha256": "518a16108529fc18657a3e6dde4a043dc465d16596d20ab2abd49a4cac2e703d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.13+13" + }, + "image_picker_for_web": { + "dependency": "transitive", + "description": { + "name": "image_picker_for_web", + "sha256": "66257a3191ab360d23a55c8241c91a6e329d31e94efa7be9cf7a212e65850214", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "image_picker_ios": { + "dependency": "transitive", + "description": { + "name": "image_picker_ios", + "sha256": "b9c4a438a9ff4f60808c9cf0039b93a42bb6c2211ef6ebb647394b2b3fa84588", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.13+6" + }, + "image_picker_linux": { + "dependency": "transitive", + "description": { + "name": "image_picker_linux", + "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "image_picker_macos": { + "dependency": "transitive", + "description": { + "name": "image_picker_macos", + "sha256": "86f0f15a309de7e1a552c12df9ce5b59fe927e71385329355aec4776c6a8ec91", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2+1" + }, + "image_picker_platform_interface": { + "dependency": "transitive", + "description": { + "name": "image_picker_platform_interface", + "sha256": "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.1" + }, + "image_picker_windows": { + "dependency": "transitive", + "description": { + "name": "image_picker_windows", + "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "implicitly_animated_list": { + "dependency": "transitive", + "description": { + "name": "implicitly_animated_list", + "sha256": "0912337ba058609ad8b4db8c1886959a4f82e03ee197ecdacbd8bf906bf1e195", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "inspector": { + "dependency": "transitive", + "description": { + "name": "inspector", + "sha256": "a01ea538b15947a9189835cc910041bab91aea3ad7c421684118aa1040189ded", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "integration_test": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "intl": { + "dependency": "transitive", + "description": { + "name": "intl", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.2" + }, + "intl_translation": { + "dependency": "transitive", + "description": { + "name": "intl_translation", + "sha256": "b3f1ebfab4109d1a946b45c57523628da92a0e2a2df5f2d9981ef4334fd24a26", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.1" + }, + "intl_utils": { + "dependency": "transitive", + "description": { + "name": "intl_utils", + "sha256": "35f9a55004871f241e24b07465cf402914992d8549a60205ee0816576a8ddee7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.8.8" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "iso_duration": { + "dependency": "direct main", + "description": { + "name": "iso_duration", + "sha256": "0233fed5e650c0256c1e37f8427f28cb37bb680b948ee845e2c8f1befb0f899b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "js_interop": { + "dependency": "transitive", + "description": { + "name": "js_interop", + "sha256": "7ec859c296958ccea34dc770504bd3ff4ae52fdd9e7eeb2bacc7081ad476a1f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.1" + }, + "js_interop_utils": { + "dependency": "transitive", + "description": { + "name": "js_interop_utils", + "sha256": "f1e05602f23b0f770e45b663a0873f704b5443c064c3fff4ed8acce317b0bd10", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.9" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_serializable": { + "dependency": "transitive", + "description": { + "name": "json_serializable", + "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.9.5" + }, + "just_the_tooltip": { + "dependency": "transitive", + "description": { + "name": "just_the_tooltip", + "sha256": "7a081133d57285bfb41b331f411006d57b433d7b35772e6155745f6a7a09cb82", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.12" + }, + "launcher_entry": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "0a8a1d13677b531fe271d0457bb79f9e4f55ba9b", + "url": "https://github.com/commetchat/launcher_entry.git" + }, + "source": "git", + "version": "0.1.1" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.0.2" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.10" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "list_counter": { + "dependency": "transitive", + "description": { + "name": "list_counter", + "sha256": "c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "list_diff": { + "dependency": "transitive", + "description": { + "name": "list_diff", + "sha256": "ac2d99c4379d5175f1e4943850808e1bf4d5604fd46c1ec3060e7fb0c0fdab05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "livekit_client": { + "dependency": "transitive", + "description": { + "name": "livekit_client", + "sha256": "4b8ef07d4acbd21e43a1edfd05932c2d71cc0c433607cefe64afdfe87bb53962", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "logger": { + "dependency": "transitive", + "description": { + "name": "logger", + "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "markdown": { + "dependency": "direct overridden", + "description": { + "path": "pkgs/markdown", + "ref": "main", + "resolved-ref": "5978dd83f263574a05db478bc1be6ce705517aac", + "url": "https://github.com/Airyzz/dart-lang-tools" + }, + "source": "git", + "version": "7.3.1-wip" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.18" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.0" + }, + "matrix": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "upstream-v6.1.1", + "resolved-ref": "58e0bd24c6a2d74d727dc92a24dc076144fae43b", + "url": "https://github.com/commetchat/matrix-dart-sdk.git" + }, + "source": "git", + "version": "6.1.1" + }, + "matrix_dart_sdk_drift_db": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "upstream-v6.1.1+patch.1", + "resolved-ref": "bb1abba161bd0e7438aa50e4ba8fb46408b69e67", + "url": "https://github.com/commetchat/matrix-dart-sdk-drift-db.git" + }, + "source": "git", + "version": "0.0.1" + }, + "media_kit": { + "dependency": "transitive", + "description": { + "name": "media_kit", + "sha256": "ae9e79597500c7ad6083a3c7b7b7544ddabfceacce7ae5c9709b0ec16a5d6643", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.6" + }, + "media_kit_libs_android_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_android_video", + "sha256": "3f6274e5ab2de512c286a25c327288601ee445ed8ac319e0ef0b66148bd8f76c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.8" + }, + "media_kit_libs_ios_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_ios_video", + "sha256": "b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "media_kit_libs_linux": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_linux", + "sha256": "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "media_kit_libs_macos_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_macos_video", + "sha256": "f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "media_kit_libs_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_video", + "sha256": "2b235b5dac79c6020e01eef5022c6cc85fedc0df1738aadc6ea489daa12a92a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.7" + }, + "media_kit_libs_windows_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_windows_video", + "sha256": "dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.11" + }, + "media_kit_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_video", + "sha256": "afaa509e7b7e0bf247557a3a740cde903a52c34ace9810f94500e127bd7b043d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.17.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "mime_type": { + "dependency": "transitive", + "description": { + "name": "mime_type", + "sha256": "d652b613e84dac1af28030a9fba82c0999be05b98163f9e18a0849c6e63838bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "msix": { + "dependency": "transitive", + "description": { + "name": "msix", + "sha256": "b6b08e7a7b5d1845f2b1d31216d5b1fb558e98251efefe54eb79ed00d27bc2ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.13" + }, + "native_toolchain_c": { + "dependency": "transitive", + "description": { + "name": "native_toolchain_c", + "sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.17.4" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "objective_c": { + "dependency": "transitive", + "description": { + "name": "objective_c", + "sha256": "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.3.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "package_info_plus": { + "dependency": "transitive", + "description": { + "name": "package_info_plus", + "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "pasteboard": { + "dependency": "transitive", + "description": { + "name": "pasteboard", + "sha256": "1c8b6a8b3f1d12e55d4e9404433cda1b4abe66db6b17bc2d2fb5965772c04674", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "path_provider": { + "dependency": "transitive", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.22" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "permission_handler": { + "dependency": "transitive", + "description": { + "name": "permission_handler", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.4.0" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.1.0" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.7" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3+5" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "permission_handler_windows": { + "dependency": "transitive", + "description": { + "name": "permission_handler_windows", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pointycastle": { + "dependency": "transitive", + "description": { + "name": "pointycastle", + "sha256": "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.2" + }, + "process": { + "dependency": "transitive", + "description": { + "name": "process", + "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.5" + }, + "protobuf": { + "dependency": "transitive", + "description": { + "name": "protobuf", + "sha256": "de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "provider": { + "dependency": "transitive", + "description": { + "name": "provider", + "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.5+1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "pubspec": { + "dependency": "transitive", + "description": { + "name": "pubspec", + "sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "pubspec_dependency_sorter": { + "dependency": "transitive", + "description": { + "name": "pubspec_dependency_sorter", + "sha256": "d2114e92f003195de74a9ed3aeb9c59425ae9b7d637b802bb225b3fe3a4ba605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "random_string": { + "dependency": "transitive", + "description": { + "name": "random_string", + "sha256": "03b52435aae8cbdd1056cf91bfc5bf845e9706724dd35ae2e99fa14a1ef79d02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "recase": { + "dependency": "transitive", + "description": { + "name": "recase", + "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "receive_intent": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "master", + "resolved-ref": "12cb1ef04311ffd7a4ba0f651105a2364c6b2afb", + "url": "https://github.com/daadu/receive_intent" + }, + "source": "git", + "version": "0.2.7" + }, + "resizable_widget": { + "dependency": "transitive", + "description": { + "name": "resizable_widget", + "sha256": "db2919754b93f386b9b3fb15e9f48f6c9d6d41f00a24397629133c99df86606a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "safe_local_storage": { + "dependency": "transitive", + "description": { + "name": "safe_local_storage", + "sha256": "287ea1f667c0b93cdc127dccc707158e2d81ee59fba0459c31a0c7da4d09c755", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "scrollable_positioned_list": { + "dependency": "transitive", + "description": { + "name": "scrollable_positioned_list", + "sha256": "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.8" + }, + "sdp_transform": { + "dependency": "transitive", + "description": { + "name": "sdp_transform", + "sha256": "73e412a5279a5c2de74001535208e20fff88f225c9a4571af0f7146202755e45", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2" + }, + "shared_preferences": { + "dependency": "transitive", + "description": { + "name": "shared_preferences", + "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.20" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.6" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "signal_sticker_api": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "f3295318c27d420f195e00164f104ead9aaa6209", + "resolved-ref": "f3295318c27d420f195e00164f104ead9aaa6209", + "url": "https://github.com/commetchat/signal-sticker-api.git" + }, + "source": "git", + "version": "1.0.0" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "slugify": { + "dependency": "transitive", + "description": { + "name": "slugify", + "sha256": "b272501565cb28050cac2d96b7bf28a2d24c8dae359280361d124f3093d337c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.7" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.2" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sqflite": { + "dependency": "transitive", + "description": { + "name": "sqflite", + "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "sqflite_android": { + "dependency": "transitive", + "description": { + "name": "sqflite_android", + "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2+2" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.6" + }, + "sqflite_common_ffi": { + "dependency": "transitive", + "description": { + "name": "sqflite_common_ffi", + "sha256": "8d7b8749a516cbf6e9057f9b480b716ad14fc4f3d3873ca6938919cc626d9025", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.7+1" + }, + "sqflite_darwin": { + "dependency": "transitive", + "description": { + "name": "sqflite_darwin", + "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "sqflite_platform_interface": { + "dependency": "transitive", + "description": { + "name": "sqflite_platform_interface", + "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "sqlite3": { + "dependency": "transitive", + "description": { + "name": "sqlite3", + "sha256": "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.9.4" + }, + "sqlite3_flutter_libs": { + "dependency": "transitive", + "description": { + "name": "sqlite3_flutter_libs", + "sha256": "1e800ebe7f85a80a66adacaa6febe4d5f4d8b75f244e9838a27cb2ffc7aec08d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.41" + }, + "sqlparser": { + "dependency": "transitive", + "description": { + "name": "sqlparser", + "sha256": "57090342af1ce32bb499aa641f4ecdd2d6231b9403cea537ac059e803cc20d67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.41.2" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "starfield": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "6e3dee6dd4f56c3d8afb180832c27418d101c86f", + "url": "https://github.com/lagmachine-com/starfield.git" + }, + "source": "git", + "version": "0.0.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "stringr": { + "dependency": "transitive", + "description": { + "name": "stringr", + "sha256": "bcc6e5cef07142673ff454b0fe7ca153e433646c52edf729636980e8a47bd7b7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "sync_http": { + "dependency": "transitive", + "description": { + "name": "sync_http", + "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test": { + "dependency": "transitive", + "description": { + "name": "test", + "sha256": "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.29.0" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.9" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.15" + }, + "timezone": { + "dependency": "transitive", + "description": { + "name": "timezone", + "sha256": "dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "uni_platform": { + "dependency": "transitive", + "description": { + "name": "uni_platform", + "sha256": "e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "unifiedpush": { + "dependency": "transitive", + "description": { + "name": "unifiedpush", + "sha256": "6dbed5a6305ca33f1865c7a3d814ae39476b79a2d23ca76a5708f023f405730f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "unifiedpush_android": { + "dependency": "transitive", + "description": { + "name": "unifiedpush_android", + "sha256": "7443dece0a850ae956514f809983eb2b39fc518c2c7d24dbfe817198bec89134", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "unifiedpush_platform_interface": { + "dependency": "transitive", + "description": { + "name": "unifiedpush_platform_interface", + "sha256": "dd588d78a8b2bfc10430e30035526e98caa543d0b7364a6344b5eb4815721c6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "universal_html": { + "dependency": "transitive", + "description": { + "name": "universal_html", + "sha256": "56536254004e24d9d8cfdb7dbbf09b74cf8df96729f38a2f5c238163e3d58971", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.4" + }, + "universal_io": { + "dependency": "transitive", + "description": { + "name": "universal_io", + "sha256": "f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "universal_platform": { + "dependency": "transitive", + "description": { + "name": "universal_platform", + "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "unorm_dart": { + "dependency": "transitive", + "description": { + "name": "unorm_dart", + "sha256": "5b35bff83fce4d76467641438f9e867dc9bcfdb8c1694854f230579d68cd8f4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "uri": { + "dependency": "transitive", + "description": { + "name": "uri", + "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "uri_parser": { + "dependency": "transitive", + "description": { + "name": "uri_parser", + "sha256": "051c62e5f693de98ca9f130ee707f8916e2266945565926be3ff20659f7853ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "url_launcher": { + "dependency": "transitive", + "description": { + "name": "url_launcher", + "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.28" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.5" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.2" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.19" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.13" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.20" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.0.2" + }, + "vodozemac": { + "dependency": "transitive", + "description": { + "name": "vodozemac", + "sha256": "bbe7dd31d7f623e2aeedb92e4b71a8b519e6109ce1e2911b5a220f6752b65cda", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "wakelock_plus": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus", + "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "wakelock_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus_platform_interface", + "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webdriver": { + "dependency": "transitive", + "description": { + "name": "webdriver", + "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "webrtc_interface": { + "dependency": "transitive", + "description": { + "name": "webrtc_interface", + "sha256": "ad0e5786b2acd3be72a3219ef1dde9e1cac071cf4604c685f11b61d63cdd6eb3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "widgetbook": { + "dependency": "transitive", + "description": { + "name": "widgetbook", + "sha256": "1877019a90c514c69be049255801487ef22fe0a86c33f81fd82c80cabe86d886", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.21.0" + }, + "widgetbook_annotation": { + "dependency": "transitive", + "description": { + "name": "widgetbook_annotation", + "sha256": "c074bcb262e32bfd62038557fd5ed51e88f4d14e24447ed60fa5e57854941dbb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.10.0" + }, + "widgetbook_generator": { + "dependency": "transitive", + "description": { + "name": "widgetbook_generator", + "sha256": "361f28ae26a4eb9c74625ff1e53eb6a783c8f0e6032baed80de4489da778f955", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.14.0" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.15.0" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "win_toast": { + "dependency": "transitive", + "description": { + "name": "win_toast", + "sha256": "1e0dc6e1094bc882ed87133e80c12cbe805d72f6faa7ed98795c7ffe7f7ea900", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, + "window_manager": { + "dependency": "transitive", + "description": { + "name": "window_manager", + "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "window_to_front": { + "dependency": "transitive", + "description": { + "name": "window_to_front", + "sha256": "7aef379752b7190c10479e12b5fd7c0b9d92adc96817d9e96c59937929512aee", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "yaml_writer": { + "dependency": "transitive", + "description": { + "name": "yaml_writer", + "sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + + "tiamat": { + "dependency": "direct main", + "description": { + "path": "../tiamat", + "relative": true + }, + "source": "path", + "version": "1.0.0+1" + }, + "matrix_widget_api": { + "dependency": "direct main", + "description": { + "path": "../widgets/matrix_widget_api", + "relative": true + }, + "source": "path", + "version": "1.0.0" + }, + "commet_calendar_widget": { + "dependency": "direct main", + "description": { + "path": "../widgets/calendar", + "relative": true + }, + "source": "path", + "version": "1.0.0+1" + } + }, + "sdks": { + "dart": ">=3.10.3 <4.0.0", + "flutter": ">=3.38.4" + } +} diff --git a/pkgs/by-name/co/concord-tui/package.nix b/pkgs/by-name/co/concord-tui/package.nix index f2ea41311f2e..4b074f9052d5 100644 --- a/pkgs/by-name/co/concord-tui/package.nix +++ b/pkgs/by-name/co/concord-tui/package.nix @@ -7,8 +7,6 @@ opus, lib, stdenv, - # TODO: Clean up on `staging` - lld, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -33,21 +31,12 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config cmake - ] - # TODO: Clean up on `staging` - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - lld ]; __darwinAllowLocalNetworking = true; __structuredAttrs = true; - # TODO: Clean up on `staging` - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' lld "ld64.lld"}"; - }; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/ct/ctypes_sh/package.nix b/pkgs/by-name/ct/ctypes_sh/package.nix index c2885e928179..91f1504af266 100644 --- a/pkgs/by-name/ct/ctypes_sh/package.nix +++ b/pkgs/by-name/ct/ctypes_sh/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ctypes.sh"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "taviso"; repo = "ctypes.sh"; rev = "v${finalAttrs.version}"; - sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4"; + sha256 = "sha256-ZYsjySJaxyLAiyGaNwngA7ef6vA+fUTCh9hi5g55v+g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cv/cv/package.nix b/pkgs/by-name/cv/cv/package.nix new file mode 100644 index 000000000000..d78489b929e8 --- /dev/null +++ b/pkgs/by-name/cv/cv/package.nix @@ -0,0 +1,35 @@ +{ + lib, + php, + fetchFromGitHub, +}: + +php.buildComposerProject2 (finalAttrs: { + pname = "cv"; + version = "0.3.71"; + __structuredAttrs = true; + strictDeps = true; + dontUnpack = false; + + src = fetchFromGitHub { + owner = "civicrm"; + repo = "cv"; + rev = "v${finalAttrs.version}"; + hash = "sha256-1InNm8ayshrACLUJ4MXb6DTnD9vxRVtwnK9oFAxMMho="; + }; + + vendorHash = "sha256-7+roKbgbSx00CrHDOwp7yxcSTdq9YDNgTLIdjLT05oM="; + + installPhase = '' + runHook preInstall + cp -ra $src $out + runHook postInstall + ''; + meta = { + homepage = "https://civicrm.org/"; + changelog = "https://github.com/civicrm/cv/releases/tag/v${finalAttrs.version}"; + description = "CiviCRM CLI Utility"; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.sorooris ]; + }; +}) diff --git a/pkgs/by-name/cy/cyclonedx-cli/deps.json b/pkgs/by-name/cy/cyclonedx-cli/deps.json index d83d3a609d9b..bf9539d0d713 100644 --- a/pkgs/by-name/cy/cyclonedx-cli/deps.json +++ b/pkgs/by-name/cy/cyclonedx-cli/deps.json @@ -16,84 +16,59 @@ }, { "pname": "CycloneDX.Core", - "version": "11.0.0", - "hash": "sha256-i1H/+oH4yljhvXg0PnM87F9qu2RtvPco7adZ2uxzOpY=" + "version": "12.1.1", + "hash": "sha256-iqWYbdfxr1wphhEAtj0ucYCs2+7tzC0HaxCosS+X1nk=" }, { "pname": "CycloneDX.Spdx", - "version": "11.0.0", - "hash": "sha256-JOY+PjDApeXdJlCXhcr91lUiC6DOQEcjoYuQbBaaiog=" + "version": "12.1.1", + "hash": "sha256-BtFGUSrSVPaq0iPXqsOhgiq7Dpw5hnt9EfPqvA5oVwk=" }, { "pname": "CycloneDX.Spdx.Interop", - "version": "11.0.0", - "hash": "sha256-N682Lern6x18EJlRuJDR+T7/n5+2DWXp4Kz1MNuGqEM=" + "version": "12.1.1", + "hash": "sha256-m8RhgvjPcLSlBzVUQbm1s1+gZ8/RKVwxX8y6h9W12t8=" }, { "pname": "CycloneDX.Utils", - "version": "11.0.0", - "hash": "sha256-3rBD3lAzQiv0TghEbfxCVUQoWNOX8tzFew7V0s4NRpE=" + "version": "12.1.1", + "hash": "sha256-TmpfTkh0INlWIH7/HH6S9JgEyFNRvpzzYVuUhNFLVtA=" }, { - "pname": "JetBrains.Annotations", - "version": "2021.2.0", - "hash": "sha256-NtTiowrMQgoTiQQheioseb/eGGLH+qR/NXDFAsWrO08=" + "pname": "Humanizer.Core", + "version": "3.0.1", + "hash": "sha256-Wxqf1FRXtsQulLFtbfsfYu4oZmrCuOZAikMcY2i6Dww=" }, { "pname": "Json.More.Net", - "version": "1.9.0", - "hash": "sha256-ySIEHWZJLk6LeWYdAA9Ci3coKXkRgpu4N79MD4pRXdk=" + "version": "3.0.0", + "hash": "sha256-zlJb9Wi9ErFqN8FYphzog9paPxI3DBVnoTL0c12Bfks=" }, { "pname": "JsonPointer.Net", - "version": "3.0.3", - "hash": "sha256-fWR1aCDWyc6flBLFaGSJmXg9vg2qMlAIN5wnj2RYqLY=" + "version": "7.0.0", + "hash": "sha256-/1GemlLhmYnz/HDQTpEEaGxaofoFkFUMNNPInKhAvM4=" }, { "pname": "JsonSchema.Net", - "version": "5.3.1", - "hash": "sha256-Cs1sh2mPN/pRO5m+5rnrBRoNhdxNoi6p0e9RmeJNQx4=" + "version": "9.1.1", + "hash": "sha256-NiVzn+SF3oe/ucKetzKC527ec5I9rq2BdBg0J0fbZPo=" }, { "pname": "Microsoft.CodeCoverage", "version": "17.3.2", "hash": "sha256-APxmbKMNQKWuFQMJjkVr2zIqv/bLUTMm5NRGVLegBbg=" }, - { - "pname": "Microsoft.CSharp", - "version": "4.0.1", - "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8=" - }, { "pname": "Microsoft.NET.Test.Sdk", "version": "17.3.2", "hash": "sha256-1fZ/rrSbuyYUfvwyA3otFQdL0Y/H48goAVyhiLs1oF4=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.0.1", - "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.0.1", - "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" - }, { "pname": "Microsoft.TestPlatform.ObjectModel", "version": "17.3.2", @@ -104,11 +79,6 @@ "version": "17.3.2", "hash": "sha256-ySBqawHGZ/Dwoj2UnAzk1Ezxt4qR1AuEY73U/buqNiE=" }, - { - "pname": "Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" - }, { "pname": "NETStandard.Library", "version": "1.6.1", @@ -116,13 +86,8 @@ }, { "pname": "Newtonsoft.Json", - "version": "12.0.3", - "hash": "sha256-PSHK+Qn52ytdEySdZyjCUGxV5y4hI/vir2WgVsCgv50=" - }, - { - "pname": "Newtonsoft.Json", - "version": "9.0.1", - "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU=" + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, { "pname": "NuGet.Frameworks", @@ -131,218 +96,13 @@ }, { "pname": "protobuf-net", - "version": "3.2.45", - "hash": "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA=" + "version": "3.2.56", + "hash": "sha256-KjwRHyGwflQDjVaudT+NjRnfGhHb4CpCfn9hHVixI+E=" }, { "pname": "protobuf-net.Core", - "version": "3.2.45", - "hash": "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ=" - }, - { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "hash": "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8=" - }, - { - "pname": "runtime.any.System.Diagnostics.Tools", - "version": "4.3.0", - "hash": "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I=" - }, - { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI=" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "hash": "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU=" - }, - { - "pname": "runtime.any.System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4=" - }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" - }, - { - "pname": "runtime.any.System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8=" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4=" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4=" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA=" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" - }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM=" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" - }, - { - "pname": "runtime.any.System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs=" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps=" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I=" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA=" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" - }, - { - "pname": "runtime.native.System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8=" - }, - { - "pname": "runtime.native.System.Net.Http", - "version": "4.3.0", - "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw=" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I=" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM=" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM=" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0=" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4=" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g=" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc=" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw=" - }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg=" - }, - { - "pname": "runtime.unix.System.Console", - "version": "4.3.0", - "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190=" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI=" - }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I=" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0=" - }, - { - "pname": "runtime.unix.System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4=" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4=" + "version": "3.2.56", + "hash": "sha256-NVvLreCvvvnS/s0syL5/L3mRpXeswP7E71C6WP9f2Dc=" }, { "pname": "Snapshooter", @@ -354,36 +114,6 @@ "version": "0.7.1", "hash": "sha256-fWVTjDrYHOQj2a1F0gynlKgGPhmjj3RWkvI4Za0xG/w=" }, - { - "pname": "System.AppContext", - "version": "4.3.0", - "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" - }, - { - "pname": "System.Buffers", - "version": "4.3.0", - "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" - }, - { - "pname": "System.Collections", - "version": "4.0.11", - "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" - }, - { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" - }, - { - "pname": "System.Collections.Concurrent", - "version": "4.3.0", - "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" - }, - { - "pname": "System.Collections.Immutable", - "version": "7.0.0", - "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" - }, { "pname": "System.CommandLine", "version": "2.0.0-beta4.22272.1", @@ -394,485 +124,25 @@ "version": "2.0.0-beta4.22272.1", "hash": "sha256-Ffzs51XiFraSX1efQRO1IyiNraIgi8aOdkRRzCT6DB4=" }, - { - "pname": "System.Console", - "version": "4.3.0", - "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.0.11", - "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.3.0", - "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" - }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.0.1", - "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" - }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.3.0", - "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y=" - }, - { - "pname": "System.Diagnostics.Tracing", - "version": "4.3.0", - "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q=" - }, - { - "pname": "System.Dynamic.Runtime", - "version": "4.0.11", - "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" - }, - { - "pname": "System.Formats.Asn1", - "version": "6.0.0", - "hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8=" - }, - { - "pname": "System.Globalization", - "version": "4.0.11", - "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" - }, - { - "pname": "System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" - }, - { - "pname": "System.Globalization.Extensions", - "version": "4.3.0", - "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" - }, - { - "pname": "System.IO", - "version": "4.1.0", - "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" - }, - { - "pname": "System.IO", - "version": "4.3.0", - "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" - }, { "pname": "System.IO.Abstractions", "version": "13.2.47", "hash": "sha256-pOzzQDwdHzoTSqycKTTmCh2kR3X6YDFUiszMlDob7mg=" }, - { - "pname": "System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" - }, - { - "pname": "System.IO.Compression.ZipFile", - "version": "4.3.0", - "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" - }, { "pname": "System.IO.FileSystem.AccessControl", "version": "5.0.0", "hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc=" }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.0.1", - "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" - }, - { - "pname": "System.Linq", - "version": "4.1.0", - "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" - }, - { - "pname": "System.Linq", - "version": "4.3.0", - "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.1.0", - "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.3.0", - "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" - }, - { - "pname": "System.Net.Http", - "version": "4.3.0", - "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q=" - }, - { - "pname": "System.Net.NameResolution", - "version": "4.3.0", - "hash": "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c=" - }, - { - "pname": "System.Net.Primitives", - "version": "4.3.0", - "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE=" - }, - { - "pname": "System.Net.Sockets", - "version": "4.3.0", - "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus=" - }, - { - "pname": "System.ObjectModel", - "version": "4.0.12", - "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s=" - }, - { - "pname": "System.ObjectModel", - "version": "4.3.0", - "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" - }, - { - "pname": "System.Reflection", - "version": "4.1.0", - "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.0.1", - "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.0.1", - "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.3.0", - "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.0.1", - "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.3.0", - "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.0.1", - "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ=" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "1.6.0", - "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.0.1", - "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.1.0", - "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.3.0", - "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.0.1", - "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" - }, - { - "pname": "System.Runtime", - "version": "4.1.0", - "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.1.0", - "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.0.1", - "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.1.0", - "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" - }, - { - "pname": "System.Runtime.InteropServices.RuntimeInformation", - "version": "4.3.0", - "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" - }, - { - "pname": "System.Runtime.Numerics", - "version": "4.3.0", - "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" - }, - { - "pname": "System.Runtime.Serialization.Primitives", - "version": "4.1.1", - "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" - }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" - }, - { - "pname": "System.Security.AccessControl", - "version": "6.0.0", - "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" - }, - { - "pname": "System.Security.Claims", - "version": "4.3.0", - "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" - }, - { - "pname": "System.Security.Cryptography.Algorithms", - "version": "4.3.0", - "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.3.0", - "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" - }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.3.0", - "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" - }, - { - "pname": "System.Security.Cryptography.Encoding", - "version": "4.3.0", - "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" - }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" - }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "6.0.1", - "hash": "sha256-OJ4NJ8E/8l86aR+Hsw+k/7II63Y/zPS+MgC+UfeCXHM=" - }, - { - "pname": "System.Security.Cryptography.Primitives", - "version": "4.3.0", - "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" - }, - { - "pname": "System.Security.Cryptography.X509Certificates", - "version": "4.3.0", - "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + "version": "10.0.6", + "hash": "sha256-7T34t/DoxxMWUGRPSnLV1l5ScAxcDnK9iYKstRvLJuA=" }, { "pname": "System.Security.Cryptography.Xml", - "version": "6.0.1", - "hash": "sha256-spXV8cWZu0V3liek1936REtdpvS4fQwc98JvacO1oJU=" - }, - { - "pname": "System.Security.Principal", - "version": "4.3.0", - "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.3.0", - "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.0.11", - "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.0.11", - "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI=" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" - }, - { - "pname": "System.Text.Json", - "version": "8.0.5", - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" - }, - { - "pname": "System.Text.RegularExpressions", - "version": "4.1.0", - "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c=" - }, - { - "pname": "System.Text.RegularExpressions", - "version": "4.3.0", - "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" - }, - { - "pname": "System.Threading", - "version": "4.0.11", - "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.0.11", - "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.3.0", - "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" - }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.3.0", - "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" - }, - { - "pname": "System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" - }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.0.11", - "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA=" - }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.3.0", - "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" - }, - { - "pname": "System.Xml.XDocument", - "version": "4.0.11", - "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg=" - }, - { - "pname": "System.Xml.XDocument", - "version": "4.3.0", - "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" + "version": "10.0.6", + "hash": "sha256-QwcfiHtrRNK5j2vPudws4S0g7I8XYHFstKAI1bOlIFM=" }, { "pname": "xunit", diff --git a/pkgs/by-name/cy/cyclonedx-cli/package.nix b/pkgs/by-name/cy/cyclonedx-cli/package.nix index 7769ef30c367..6018162aca66 100644 --- a/pkgs/by-name/cy/cyclonedx-cli/package.nix +++ b/pkgs/by-name/cy/cyclonedx-cli/package.nix @@ -7,16 +7,16 @@ buildDotnetModule rec { pname = "cyclonedx-cli"; - version = "0.30.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-cli"; tag = "v${version}"; - hash = "sha256-a9jUJqj/h2u2SrIQkQV8aFSzys+RVEI2yNlHTJpll+M="; + hash = "sha256-XP6Zz9JITIw6xUefOkLLjoHUDsnhsOKdtY5S5xbkejU="; }; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; nugetDeps = ./deps.json; preFixup = '' diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index c706a6e4e3e9..3b353bc72db6 100644 --- a/pkgs/by-name/da/dart-sass/package.nix +++ b/pkgs/by-name/da/dart-sass/package.nix @@ -23,13 +23,13 @@ let in buildDartApplication rec { pname = "dart-sass"; - version = "1.101.0"; + version = "1.101.2"; src = fetchFromGitHub { owner = "sass"; repo = "dart-sass"; tag = version; - hash = "sha256-hs028qXBzRGrh9xZAQGaFw7iXtkQm9fixMuBohupjrI="; + hash = "sha256-7q42Dv1HUWxeXa4j306ssKJrBsPKAFezqntx4mZXgw0="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json index 71ef2dcf30c6..b274072bc956 100644 --- a/pkgs/by-name/da/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -4,21 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc", + "sha256": "1b0e6a07425a3e460666e88bf1c949ccc7bb0116ad562ce94a1eca60fe820725", "url": "https://pub.dev" }, "source": "hosted", - "version": "96.0.0" + "version": "103.0.0" }, "analyzer": { "dependency": "direct dev", "description": { "name": "analyzer", - "sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0", + "sha256": "61c04d0c1bfed555c681ea079519933f071a5a026578ff73c4ff0df2d3462e5e", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.2.0" + "version": "13.3.0" }, "archive": { "dependency": "direct dev", @@ -94,11 +94,11 @@ "dependency": "direct main", "description": { "name": "cli_pkg", - "sha256": "8343ec3b11f163ab105687d6bad5432ef49b95d15137ec44a28c8cef918b5150", + "sha256": "1b3915a8924e8a495ec24b8ee076c182211d0bd563699a2c8ed9af33bf296af8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.15.1" + "version": "2.15.2" }, "cli_repl": { "dependency": "direct main", @@ -114,11 +114,11 @@ "dependency": "direct dev", "description": { "name": "cli_util", - "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "sha256": "5909d2c6b66817222779e1eedc19e0e28b76d1df7bd9856a4792ccb9881df358", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.2" + "version": "0.5.1" }, "collection": { "dependency": "direct main", @@ -184,21 +184,21 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2", + "sha256": "3f88fc9c96c568d631356507355a2d1e983ee000c9ac008bdcb39b5bf53ce777", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.7" + "version": "3.1.12" }, "dartdoc": { "dependency": "direct dev", "description": { "name": "dartdoc", - "sha256": "c60c01dc5aeb095a3b7b875150fe0e50b46330aec5d3417e7bae235ccd8a00ab", + "sha256": "deb9e1d80cd0fd66139c5690315a5004150fd5c85a16d97459360531aa9e3702", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.0.4" + "version": "9.0.8" }, "ffi": { "dependency": "transitive", @@ -254,11 +254,11 @@ "dependency": "direct dev", "description": { "name": "grinder", - "sha256": "e1996e485d2b56bb164a8585679758d488fbf567273f51c432c8733fee1f6188", + "sha256": "8c65fc6c0c0748c2d9080c1fb603d7a9640bf5a5eda29f35099bd351cc45093f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.5" + "version": "0.10.0" }, "html": { "dependency": "transitive", @@ -374,11 +374,11 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d", + "sha256": "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.3" + "version": "1.19.0" }, "mime": { "dependency": "transitive", @@ -674,31 +674,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "ca578dc12bb8b2f40b67b7d3bd2fac4f31c01a6ff7130a14e2597b919934507f", + "sha256": "0d5ba5602ec3baa28c8ce365e1efc5575969c765f45c554a3e167dc7945b9c30", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.31.1" + "version": "1.31.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11", + "sha256": "475610b2aa23c19687cce2961e44b0cc57cafe220f67c2b80201231b2a07fbe7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.12" + "version": "0.7.13" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "d2e98ec12998368dc59ddd47ab709f2cd55acd6b66dc7db764455a44082f4bc5", + "sha256": "a39c204a4fc7a7ccb04a2b985e359fda3cc37e45e0b8ac61c3fb1a05aa832132", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.18" + "version": "0.6.19" }, "test_descriptor": { "dependency": "direct dev", @@ -804,11 +804,11 @@ "dependency": "transitive", "description": { "name": "xml", - "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", + "sha256": "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.6.1" + "version": "7.0.1" }, "yaml": { "dependency": "direct dev", @@ -822,6 +822,6 @@ } }, "sdks": { - "dart": ">=3.10.0 <4.0.0" + "dart": ">=3.11.0 <4.0.0" } } diff --git a/pkgs/by-name/di/diff-so-fancy/package.nix b/pkgs/by-name/di/diff-so-fancy/package.nix index 9dce1d9e2438..1d10152ecdc3 100644 --- a/pkgs/by-name/di/diff-so-fancy/package.nix +++ b/pkgs/by-name/di/diff-so-fancy/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "diff-so-fancy"; - version = "1.4.10"; + version = "1.4.12"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-mEVRwkfVK/qmOeU37hSxmO2t0z0TY4MWOjkt6hICQQ4="; + sha256 = "sha256-5laSG8UWsCXAK+Woiz1Opy3VViboCI7J2AsqoDiuq7k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index ab68977f6656..21ca02b2a62d 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "dnscontrol"; - version = "4.42.0"; + version = "4.43.0"; src = fetchFromGitHub { owner = "DNSControl"; repo = "dnscontrol"; tag = "v${finalAttrs.version}"; - hash = "sha256-iB2PFPvcASRwpBkFJQ3Vi2r89H3a9BBbC1moAymWDOI="; + hash = "sha256-7t/j6vLeoYHTf7wMIZ1hns1Uo0udEqTu/0K/96C5aPQ="; }; - vendorHash = "sha256-8rL5v/0Vb+gxmbDaEB57UsQEnKCJtbZh0lFUyKYMZgs="; + vendorHash = "sha256-NEFfYDLo/UiITlUd7XptBmWesJQexvaXH95gyMpgNqA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/dr/drone-runner-exec/package.nix b/pkgs/by-name/dr/drone-runner-exec/package.nix deleted file mode 100644 index 0786230cc586..000000000000 --- a/pkgs/by-name/dr/drone-runner-exec/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule { - pname = "drone-runner-exec"; - version = "unstable-2020-04-19"; - - src = fetchFromGitHub { - owner = "drone-runners"; - repo = "drone-runner-exec"; - rev = "c0a612ef2bdfdc6d261dfbbbb005c887a0c3668d"; - sha256 = "sha256-0UIJwpC5Y2TQqyZf6C6neICYBZdLQBWAZ8/K1l6KVRs="; - }; - - vendorHash = "sha256-ypYuQKxRhRQGX1HtaWt6F6BD9vBpD8AJwx/4esLrJsw="; - - meta = { - description = "Drone pipeline runner that executes builds directly on the host machine"; - homepage = "https://github.com/drone-runners/drone-runner-exec"; - # https://polyformproject.org/licenses/small-business/1.0.0/ - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ mic92 ]; - mainProgram = "drone-runner-exec"; - }; -} diff --git a/pkgs/by-name/dr/drone-runner-ssh/package.nix b/pkgs/by-name/dr/drone-runner-ssh/package.nix index f043415017f3..2ae051c8f476 100644 --- a/pkgs/by-name/dr/drone-runner-ssh/package.nix +++ b/pkgs/by-name/dr/drone-runner-ssh/package.nix @@ -6,7 +6,7 @@ buildGoModule { pname = "drone-runner-ssh"; - version = "unstable-2022-12-22"; + version = "1.0.1-unstable-2022-12-22"; src = fetchFromGitHub { owner = "drone-runners"; diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix index 6cd5364963f4..7663666681f0 100644 --- a/pkgs/by-name/dr/dropbear/package.nix +++ b/pkgs/by-name/dr/dropbear/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dropbear"; - version = "2026.92"; + version = "2026.93"; src = fetchFromGitHub { owner = "mkj"; repo = "dropbear"; tag = "DROPBEAR_${finalAttrs.version}"; - hash = "sha256-xXjKWj6tMW/Qlq4DttxKAqOwsER2QEeb1Qw3Gllu2QQ="; + hash = "sha256-Xs5LTVaNdfRKx0cFTQknaHXka6QhxBS2JNTQ8RoHG80="; }; patches = [ diff --git a/pkgs/by-name/dt/dtach/package.nix b/pkgs/by-name/dt/dtach/package.nix index 552026083c58..f531d7db170c 100644 --- a/pkgs/by-name/dt/dtach/package.nix +++ b/pkgs/by-name/dt/dtach/package.nix @@ -1,29 +1,26 @@ { lib, stdenv, - fetchurl, - fetchpatch2, + fetchFromGitHub, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "dtach"; - version = "0.9"; + version = "0.9-unstable-2025-06-20"; - src = fetchurl { - url = "mirror://sourceforge/project/dtach/dtach/${finalAttrs.version}/dtach-${finalAttrs.version}.tar.gz"; - sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j"; + src = fetchFromGitHub { + owner = "crigler"; + repo = "dtach"; + rev = "b027c27b2439081064d07a86883c8e0b20a183c9"; + hash = "sha256-ilxBbrqwGe+jpFbQ93nfyp3HuDY0D7NgIXkIkw9YXkI="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/crigler/dtach/commit/6d80909a8c0fd19717010a3c76fec560f988ca48.patch?full_index=1"; - hash = "sha256-v3vToJdSwihiPCSjXjEJghiaynHPTEql3F7URXRjCbM="; - }) - ]; - installPhase = '' - mkdir -p $out/bin - cp dtach $out/bin/dtach + runHook preInstall + + install -D dtach $out/bin/dtach + + runHook postInstall ''; meta = { @@ -40,9 +37,8 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = [ lib.maintainers.jmbaur ]; mainProgram = "dtach"; }; -}) +} diff --git a/pkgs/by-name/du/dump_syms/package.nix b/pkgs/by-name/du/dump_syms/package.nix index fde3b759d734..e1e2f06ea2ca 100644 --- a/pkgs/by-name/du/dump_syms/package.nix +++ b/pkgs/by-name/du/dump_syms/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dump_syms"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "mozilla"; repo = "dump_syms"; rev = "v${finalAttrs.version}"; - hash = "sha256-fCplZFp+yONBd2HDDlX/6XcmnQFbsnVmiS5b8fqGOAE="; + hash = "sha256-b+uZC+ss1utfQQOO+P9Nb1KomNcyxwSUcNAzaPh2Bik="; }; - cargoHash = "sha256-guJgkcldcKvi3XWolAqyB5bFzlSMNQQMzri6axGJpLo="; + cargoHash = "sha256-1M5IqcyDrQGhOALTyqSu6ZxZS8YBkxm+K++nOQhOEKI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ev/everforest-gtk-theme/package.nix b/pkgs/by-name/ev/everforest-gtk-theme/package.nix index c2530ce49d5d..8f49570534e1 100644 --- a/pkgs/by-name/ev/everforest-gtk-theme/package.nix +++ b/pkgs/by-name/ev/everforest-gtk-theme/package.nix @@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation { description = "Everforest colour palette for GTK"; homepage = "https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ jn-sena ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index 988e1e4e3d9e..6fd6305e504a 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20260712"; + version = "20260713"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-fCzh9pn+HWL60IvpPieaaZ+JjQZ1bbfYIyLEHDITK4U="; + hash = "sha256-ZmpTcolKTjJBino+zkVK6hBv/+yllAiBiR6Jy4SBdVs="; }; dontUnpack = true; diff --git a/pkgs/by-name/fl/fluux-messenger/package.nix b/pkgs/by-name/fl/fluux-messenger/package.nix index d6cda40b0798..03692b2697ac 100644 --- a/pkgs/by-name/fl/fluux-messenger/package.nix +++ b/pkgs/by-name/fl/fluux-messenger/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fluux-messenger"; - version = "0.17.1"; + version = "0.17.2"; __structuredAttrs = true; strictDeps = true; @@ -27,16 +27,16 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "processone"; repo = "fluux-messenger"; tag = "v${finalAttrs.version}"; - hash = "sha256-aT7X11BOmksEcCLk5hkokfLx7Q8Jk2zTWskoN8aZha0="; + hash = "sha256-APdzwVnDOGnngZJ3LjQMk2Y6KRbGqXaaFEb+NzhfkIo="; }; cargoRoot = "apps/fluux/src-tauri"; - cargoHash = "sha256-fEHe7enJzdEauou1xWfM94WHL1uAP1sfY2JN1ZmZmEE="; + cargoHash = "sha256-pjx4tP89aRx1/m5eYjI2DPhTtSuMnFudongEFhiaigE="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-4Op4jykCtc9oFBIn8vOUqxGr7/OloIhPD1JT+q4dX7Y="; + hash = "sha256-rV5Q8WKcSmL1JSubFefsytOd3qiB5OandcwfZw9DJgE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index a192df6c43b6..3fb1a5e7275b 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "16.0.0"; - hash = "sha256-BZawFbrtcxftX4/Yk32aoVRQ6Kg+k1FhN9IoH6dxvVY="; + version = "16.0.1"; + hash = "sha256-fMAOmYh21nMyd9b8e6cXlh7ArJtIys3N6sbTJNV1oyw="; npmDepsHash = "sha256-UhivpUqNJvc3zHxdRVAWT9x68jG1KnQa8yS4KkL2W5g="; - vendorHash = "sha256-cb6f7ZX3pG95EEZotGXn6+YUJN59SFNVHFTejFJ6y28="; + vendorHash = "sha256-elbuQxUtbuDTJV686ZqiFgxWlIYrWDZ4fUet2QY/sJ8="; lts = false; nixUpdateExtraArgs = [ "--override-filename" diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix index 748f8544ca91..77eabab1fc27 100644 --- a/pkgs/by-name/fr/frr/package.nix +++ b/pkgs/by-name/fr/frr/package.nix @@ -82,13 +82,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "frr"; - version = "10.6.1"; + version = "10.7.0"; src = fetchFromGitHub { owner = "FRRouting"; repo = "frr"; rev = "frr-${finalAttrs.version}"; - hash = "sha256-sSvw9tfVNUyQjEOELoUAIQkEvXg765MsWvVKM0gsYUc="; + hash = "sha256-A98uyOiFH/DvJPMmUvXQ1bG//OCdvuclpHD6xe5BqFU="; }; # Without the std explicitly set, we may run into abseil-cpp diff --git a/pkgs/by-name/fu/fuc/package.nix b/pkgs/by-name/fu/fuc/package.nix index 26a3a512761c..91ba682eda49 100644 --- a/pkgs/by-name/fu/fuc/package.nix +++ b/pkgs/by-name/fu/fuc/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fuc"; - version = "3.1.7"; + version = "3.2.0"; src = fetchFromGitHub { owner = "SUPERCILEX"; repo = "fuc"; tag = finalAttrs.version; - hash = "sha256-LtS2+iqu4+z6K/PZeggLdo4S/F+5AtV5j9Q6hDAcEiQ="; + hash = "sha256-EzT8Rq0vqcHiW6W0yLSzlWNEZzaKXvOL3o9WUj648gU="; }; - cargoHash = "sha256-SSJg/Ns64+NgqrB4mJ5/xa40tZfGZ2VGdvNP7SSKv0E="; + cargoHash = "sha256-sZGAQ+9u/2PpHkp5BcrrTU+48s6PT42+eEs/Cn0RsKk="; env.RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 0ef79c7935f7..2e483464beac 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fzf-make"; - version = "0.69.0"; + version = "0.70.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; tag = "v${finalAttrs.version}"; - hash = "sha256-ezE7plWdPqfENprOWhl5YQnoXk9khXsDtsYf6Lifk3w="; + hash = "sha256-LRLwHCHsXW0SZ8X+7719vaCBQDx9fjiMvF2oma8u41w="; }; - cargoHash = "sha256-uF+oV0ZvGsRy20DkNrVowyb+RoYVtYN4R/gOZ6WzHQw="; + cargoHash = "sha256-bNp4P/Hag4br28rrfeNIUFQqKNKa/Gin79gQR6sg8W8="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/ge/geckodriver/package.nix b/pkgs/by-name/ge/geckodriver/package.nix index 7066f76849da..75fa124c7cb9 100644 --- a/pkgs/by-name/ge/geckodriver/package.nix +++ b/pkgs/by-name/ge/geckodriver/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { - version = "0.37.0"; + version = "0.37.1"; pname = "geckodriver"; src = fetchFromGitHub { owner = "mozilla"; repo = "geckodriver"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-fXaOGdwpBbukphNvu9sONTXPAW+zMLv3roJ6j0iLdHQ="; + sha256 = "sha256-LnfJmiV4SJpFBXDAJmwbHKv6RvO40e7/3Lm6Jc6YA40="; }; - cargoHash = "sha256-AZsNtdUbtly1AN4dbBHRdlJCHkfcYjjKw5EzVqHMeYs="; + cargoHash = "sha256-zNwlQ2CsDHQnFog59jKFAxVaNK0/8hUts6NRkFVKCGk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/by-name/gi/git-gamble/package.nix b/pkgs/by-name/gi/git-gamble/package.nix index 80b21f663197..cccfb68ae07b 100644 --- a/pkgs/by-name/gi/git-gamble/package.nix +++ b/pkgs/by-name/gi/git-gamble/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "git-gamble"; - version = "2.14.4"; + version = "2.14.6"; src = fetchFromGitLab { owner = "pinage404"; repo = "git-gamble"; rev = "v${finalAttrs.version}"; - hash = "sha256-DjwdoM9/W1UeD/XqVMXTyzjdcJLfHiAqRA3r//rkn1U="; + hash = "sha256-+YjAXELI4AnHTZ7PvBWhvu3BQP7kys5VV2EllyABYKo="; }; - cargoHash = "sha256-X3kJT0pscCH9sQxV3NkX0hL2sccTJHgMj0UeIpJOWJ4="; + cargoHash = "sha256-UHj/rhL9/r/UUtlgqTgMr9jFNRwwFDrfltyB5PyZanM="; nativeCheckInputs = [ gitMinimal ]; preCheck = '' diff --git a/pkgs/by-name/gi/git-statuses/package.nix b/pkgs/by-name/gi/git-statuses/package.nix index 29f1c6ea59c1..0c57ed4f0393 100644 --- a/pkgs/by-name/gi/git-statuses/package.nix +++ b/pkgs/by-name/gi/git-statuses/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "git-statuses"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "bircni"; repo = "git-statuses"; tag = finalAttrs.version; - hash = "sha256-p200nv8H/tuO48ZBsTQvM0JBGN4Yu58kXLhYl8AJxfc="; + hash = "sha256-hZ0/lC7Xjv+CDi2uucRa009nTCrKIrBFj3BbZsciJ2o="; }; - cargoHash = "sha256-MJekW/AzVe1dCr5La4+FKBeyGFAjN0fCBUiGnMoAtdI="; + cargoHash = "sha256-RMRATVe6NILxNiNVkcdv5x5BYVL5UUphtrrGRWN18KU="; # Needed to get openssl-sys to use pkg-config. env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix index 300fb5ba4bdf..059625b1bb30 100644 --- a/pkgs/by-name/gi/github-copilot-cli/package.nix +++ b/pkgs/by-name/gi/github-copilot-cli/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "github-copilot-cli"; - version = "1.0.26"; + version = "1.0.61"; # GitHub provide platform-specific SEA binaries as well as a "universal" # package. Use the universal package as it gives us a bit more flexibility @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { # about how paths should be set up which don't reliably hold when using Nix. src = fetchurl { url = "https://github.com/github/copilot-cli/releases/download/v${finalAttrs.version}/github-copilot-${finalAttrs.version}.tgz"; - hash = "sha256-zNO0clQRfgw6CX9K8NaJXsoOhhNjBfK7KAr0AoL7Oqo="; + hash = "sha256-8Lks8lHa5XF9ZrC+fU/9VlzD1W32MbRZ7PZtL5YWLTA="; }; nativeBuildInputs = [ @@ -58,6 +58,10 @@ stdenv.mkDerivation (finalAttrs: { ''; postInstall = '' + # Upstream bundles linuxmusl prebuilds in the universal tarball; they are + # not needed on glibc systems and make autoPatchelf fail on musl libc deps. + find "$out"/lib/github-copilot-cli -depth -path '*/linuxmusl-*' -exec rm -rf '{}' + + makeWrapper ${nodejs}/bin/node "$out"/bin/copilot \ --add-flag "$out"/lib/github-copilot-cli/index.js \ --add-flag --no-auto-update \ @@ -82,6 +86,11 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/github/copilot-cli"; changelog = "https://github.com/github/copilot-cli/releases/tag/v${finalAttrs.version}"; license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ + binaryNativeCode # including contents of the prebuild directory + binaryBytecode # including WASM files + obfuscatedCode # including minified JavaScript + ]; maintainers = with lib.maintainers; [ me-and ]; diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 1a63064b22f6..670056428fc5 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -179,11 +179,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "150.0.7871.128"; + version = "150.0.7871.181"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-g+1ZyFh467j6U5FevnBmyvxY0cBMHJVElIbm+dmaHvs="; + hash = "sha256-/sUJBfexI1pECXeoM0duAWKHT1ynnlBs30C3GvZNkvQ="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -289,11 +289,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "150.0.7871.129"; + version = "150.0.7871.182"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/ggb3e3myl2poiiaqd2bbvqlrqa_150.0.7871.129/GoogleChrome-150.0.7871.129.dmg"; - hash = "sha256-ym9rF6yrGMSibQDM4gKlAbOsIHnV1tPxyNq9KNLnR0I="; + url = "http://dl.google.com/release2/chrome/mb6usb7722qbv5pqtlgpq72utm_150.0.7871.182/GoogleChrome-150.0.7871.182.dmg"; + hash = "sha256-eNrCQqKqd+6cuvGDbQ0VM5JpolHusOZou2elsAh0TD4="; }; dontPatch = true; diff --git a/pkgs/by-name/go/gotip/package.nix b/pkgs/by-name/go/gotip/package.nix index 92a8bc90b03d..e22811e695fa 100644 --- a/pkgs/by-name/go/gotip/package.nix +++ b/pkgs/by-name/go/gotip/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "gotip"; - version = "0.6.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lusingander"; repo = "gotip"; tag = "v${finalAttrs.version}"; - hash = "sha256-CgTznW4SwKrJ4Q7dIo2ebn51G13nP36tv8n2G9T+MZ0="; + hash = "sha256-W4N6O7cAUIFytjHIqbe7qSmuPHIpyhecw7bLyIP/LRU="; }; - vendorHash = "sha256-Sj7JzyWviGxp10O1zGONN49TXtwquXYJ1KoijIVcyj0="; + vendorHash = "sha256-fQ/rx7gyBcQ3nE/eiCJgtjZCa50iZAuodIZjaRG/mjE="; ldflags = [ "-s" diff --git a/pkgs/by-name/gr/graphite/package.nix b/pkgs/by-name/gr/graphite/package.nix index be5f18cb63c2..889a7c71856d 100644 --- a/pkgs/by-name/gr/graphite/package.nix +++ b/pkgs/by-name/gr/graphite/package.nix @@ -29,12 +29,12 @@ }: let - version = "0-unstable-2026-07-09"; - rev = "97f8113fe43d41b15ca3a56c300c48b7c8fda5c4"; + version = "0-unstable-2026-07-18"; + rev = "117da97dd5d6b1e02d7322682669508a4edfde3d"; - srcHash = "sha256-EPZzS3sxHYLi2qaRKvJbjUfS0LWaIWwJW/z4op+/uZM="; - shaderHash = "sha256-iwtT43vnhgZZhtvWdTLDL5xZVStkOUb2D832/wjqsUE="; - cargoHash = "sha256-uwLZFB3+jefE3WihUc3ta8L5G1vdmDdhEDVkDOwAveE="; + srcHash = "sha256-FSyu4aBl4gkn+jCMj9qjzNHl29F+Kxk95++H7pQou2Q="; + shaderHash = "sha256-V34/qlVsRcDH8FLpTMlaNeNxQhJI415Fv+xnhhLsi1Q="; + cargoHash = "sha256-lDf6GWGcqQ1JiETJSJ8A7dbgrZ4OEuifH/wIZZ+c/fY="; npmHash = "sha256-Rb0bLPk54QigNp7TkDkJJy/TEJXAhlXOCruckwvdXks="; brandingRev = "0d004aa61e6b48d316e8e5db6d59ccc4788f192d"; diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index fbed8463a30e..37cd7366e632 100644 --- a/pkgs/by-name/gv/gvm-libs/package.nix +++ b/pkgs/by-name/gv/gvm-libs/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gvm-libs"; - version = "23.8.0"; + version = "23.9.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; tag = "v${finalAttrs.version}"; - hash = "sha256-+fd/f5bYjKaeDGj0cpe4vNqm6TvIcWxJ3pfy90oQkbI="; + hash = "sha256-oGV4Brb+LgxiflzAvv7HqQ0p9+Whe2J6du9wBKAkr5Q="; }; postPatch = '' diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix index 2f9401cb7c7e..b857c4f8d5b3 100644 --- a/pkgs/by-name/ha/handheld-daemon-ui/package.nix +++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix @@ -5,11 +5,11 @@ }: let pname = "handheld-daemon-ui"; - version = "3.4.0"; + version = "3.4.2"; src = fetchurl { url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/hhd-ui.Appimage"; - hash = "sha256-OeZMh3lC3fluwz1pU3JnLRkwFYiIkthGuclYkOJm430="; + hash = "sha256-91Wa50dJAW6Re1MBperHFoftAPagihUP4fv5cMb+pxI="; }; extractedFiles = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/ho/hongdown/package.nix b/pkgs/by-name/ho/hongdown/package.nix index 30f8beb67ae2..f7250d2adf72 100644 --- a/pkgs/by-name/ho/hongdown/package.nix +++ b/pkgs/by-name/ho/hongdown/package.nix @@ -5,15 +5,15 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "hongdown"; - version = "0.3.4"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dahlia"; repo = "hongdown"; tag = finalAttrs.version; - hash = "sha256-Bj0ECrYRnXSjgyblocnVjdYipuzbX2+G3KRWZvdR9Rk="; + hash = "sha256-JnfYBPWnZgZ7149yVsabP3n2+GnxR6ZvK0S+4w6x/c4="; }; - cargoHash = "sha256-q84orbkrcKbO5FeI9dk0E92EtE9eQ8n/yGjXzh9MIgg="; + cargoHash = "sha256-Vn5dEaDnZ2FQ6ZlDKbbQ5lUvjyhIuhT2/xEaZ8KWmRA="; meta = { description = "Markdown formatter that enforces Hong Minhee's Markdown style conventions"; mainProgram = "hongdown"; diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix index e5d88a861a59..8a80d746c340 100644 --- a/pkgs/by-name/hy/hyprcursor/package.nix +++ b/pkgs/by-name/hy/hyprcursor/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -12,7 +12,7 @@ tomlplusplus, nix-update-script, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprcursor"; version = "0.1.13"; diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix index f86e13d8b3fb..334342d67dfc 100644 --- a/pkgs/by-name/hy/hyprgraphics/package.nix +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, nix-update-script, cmake, @@ -20,7 +20,7 @@ pixman, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprgraphics"; version = "0.5.1"; diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index 6ee8b3d9a6b0..ac234335a428 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, pkg-config, cmake, @@ -16,7 +16,7 @@ nix-update-script, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hypridle"; version = "0.1.7"; diff --git a/pkgs/by-name/hy/hyprland-protocols/package.nix b/pkgs/by-name/hy/hyprland-protocols/package.nix index 4f86862e1d81..32080ececc2f 100644 --- a/pkgs/by-name/hy/hyprland-protocols/package.nix +++ b/pkgs/by-name/hy/hyprland-protocols/package.nix @@ -1,11 +1,11 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, meson, ninja, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprland-protocols"; version = "0.7.0"; diff --git a/pkgs/by-name/hy/hyprland-qt-support/package.nix b/pkgs/by-name/hy/hyprland-qt-support/package.nix index 7e57ce1683d1..bc39d8d3b1a7 100644 --- a/pkgs/by-name/hy/hyprland-qt-support/package.nix +++ b/pkgs/by-name/hy/hyprland-qt-support/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, ninja, @@ -8,7 +8,7 @@ pkg-config, hyprlang, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprland-qt-support"; version = "0.1.0"; diff --git a/pkgs/by-name/hy/hyprland-qtutils/package.nix b/pkgs/by-name/hy/hyprland-qtutils/package.nix index d4dc6b4bb4db..6b01abe566c9 100644 --- a/pkgs/by-name/hy/hyprland-qtutils/package.nix +++ b/pkgs/by-name/hy/hyprland-qtutils/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, fetchpatch, cmake, @@ -13,7 +13,7 @@ let inherit (lib.strings) makeBinPath; in -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprland-qtutils"; version = "0.1.5"; diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 4d58cbca04d1..ca344a406950 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.55.4-b", - "commit_hash": "a0136d8c04687bb36eb8a28eb9d1ff92aea99704", - "commit_message": "[gha] Nix: update inputs", - "date": "2026-06-11", - "tag": "v0.55.4" + "branch": "main", + "commit_hash": "36b2e0cfe0c6094dbc47bd42a437431315bb3087", + "commit_message": "version: bump to 0.56.0", + "date": "2026-07-20", + "tag": "v0.56.0" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index d7034ce9cb8e..dc16a98cc29c 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, stdenvAdapters, fetchFromGitHub, pkg-config, @@ -22,6 +22,7 @@ lcms2, libGL, libdrm, + libei, libexecinfo, libgbm, libinput, @@ -34,6 +35,7 @@ pkgconf, python3, re2, + readline, systemd, tomlplusplus, uwsm, @@ -48,7 +50,7 @@ xwayland, debug ? false, enableXWayland ? true, - withSystemd ? lib.meta.availableOn gcc15Stdenv.hostPlatform systemd, + withSystemd ? lib.meta.availableOn gcc16Stdenv.hostPlatform systemd, wrapRuntimeDeps ? true, }: let @@ -75,22 +77,22 @@ let # which would be controlled by the `debug` flag # Condition on darwin to avoid breaking eval for darwin in CI, # even though darwin is not supported anyway. - adapters = lib.optionals (!gcc15Stdenv.targetPlatform.isDarwin) [ + adapters = lib.optionals (!gcc16Stdenv.targetPlatform.isDarwin) [ stdenvAdapters.useMoldLinker ]; - customStdenv = foldl' (acc: adapter: adapter acc) gcc15Stdenv adapters; + customStdenv = foldl' (acc: adapter: adapter acc) gcc16Stdenv adapters; in customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.55.4"; + version = "0.56.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-IuT0HnOr/0rAw+GXr+OwWx89FjA4Og1FqP7vywEwRJM="; + hash = "sha256-TWj51lMAgmEYl5x87wsKbuyWDk6QEG5t1uchw9zdJNE="; }; postPatch = '' @@ -156,6 +158,7 @@ customStdenv.mkDerivation (finalAttrs: { lcms2 libGL libdrm + libei libgbm libinput libuuid @@ -166,6 +169,7 @@ customStdenv.mkDerivation (finalAttrs: { pango pciutils re2 + readline tomlplusplus wayland wayland-protocols diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index 86aaf9d5cc68..673b0b49cdf5 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -1,13 +1,13 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, hyprutils, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprlang"; version = "0.6.8"; diff --git a/pkgs/by-name/hy/hyprlauncher/package.nix b/pkgs/by-name/hy/hyprlauncher/package.nix index f3369ddfb7f0..e148ad41ccb0 100644 --- a/pkgs/by-name/hy/hyprlauncher/package.nix +++ b/pkgs/by-name/hy/hyprlauncher/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -17,7 +17,7 @@ pixman, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprlauncher"; version = "0.1.6"; diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index bb82409fb347..cc06099e8625 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -26,7 +26,7 @@ nix-update-script, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; version = "0.9.6"; diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index 53b68a517dac..3e5d3c75f357 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, hyprwayland-scanner, @@ -34,7 +34,7 @@ versionCheckHook, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprpaper"; version = "0.8.4"; @@ -97,7 +97,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; teams = [ lib.teams.hyprland ]; inherit (wayland.meta) platforms; - broken = gcc15Stdenv.hostPlatform.isDarwin; + broken = gcc16Stdenv.hostPlatform.isDarwin; mainProgram = "hyprpaper"; }; }) diff --git a/pkgs/by-name/hy/hyprpicker/package.nix b/pkgs/by-name/hy/hyprpicker/package.nix index c427bd3cfb20..454b0fd38186 100644 --- a/pkgs/by-name/hy/hyprpicker/package.nix +++ b/pkgs/by-name/hy/hyprpicker/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, nix-update-script, pkg-config, @@ -18,7 +18,7 @@ libxdmcp, debug ? false, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprpicker" + lib.optionalString debug "-debug"; version = "0.4.7"; diff --git a/pkgs/by-name/hy/hyprpolkitagent/package.nix b/pkgs/by-name/hy/hyprpolkitagent/package.nix index 2cbc31de60c0..5c9b8f16b807 100644 --- a/pkgs/by-name/hy/hyprpolkitagent/package.nix +++ b/pkgs/by-name/hy/hyprpolkitagent/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, cmake, pkg-config, fetchFromGitHub, @@ -10,7 +10,7 @@ polkit, qt6, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprpolkitagent"; version = "0.1.3"; diff --git a/pkgs/by-name/hy/hyprpwcenter/package.nix b/pkgs/by-name/hy/hyprpwcenter/package.nix index ecf0d5e2229e..473fb57b5c86 100644 --- a/pkgs/by-name/hy/hyprpwcenter/package.nix +++ b/pkgs/by-name/hy/hyprpwcenter/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -14,7 +14,7 @@ pixman, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprpwcenter"; version = "0.1.2"; diff --git a/pkgs/by-name/hy/hyprshutdown/package.nix b/pkgs/by-name/hy/hyprshutdown/package.nix index 37d2a123203e..b1da70e88410 100644 --- a/pkgs/by-name/hy/hyprshutdown/package.nix +++ b/pkgs/by-name/hy/hyprshutdown/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -16,7 +16,7 @@ versionCheckHook, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprshutdown"; version = "0.1.1"; diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix index 687450a0d4bc..7e677b8d4794 100644 --- a/pkgs/by-name/hy/hyprsunset/package.nix +++ b/pkgs/by-name/hy/hyprsunset/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, cmake, fetchFromGitHub, pkg-config, @@ -13,7 +13,7 @@ wayland-scanner, nix-update-script, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprsunset"; version = "0.3.3"; diff --git a/pkgs/by-name/hy/hyprsysteminfo/package.nix b/pkgs/by-name/hy/hyprsysteminfo/package.nix index a3067b584af9..9f2f505a767f 100644 --- a/pkgs/by-name/hy/hyprsysteminfo/package.nix +++ b/pkgs/by-name/hy/hyprsysteminfo/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, fetchpatch, cmake, @@ -13,7 +13,7 @@ let inherit (lib.strings) makeBinPath; in -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprsysteminfo"; version = "0.1.3"; diff --git a/pkgs/by-name/hy/hyprtoolkit/package.nix b/pkgs/by-name/hy/hyprtoolkit/package.nix index d3575fd8779d..603bcd17b984 100644 --- a/pkgs/by-name/hy/hyprtoolkit/package.nix +++ b/pkgs/by-name/hy/hyprtoolkit/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -23,7 +23,7 @@ wayland-protocols, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprtoolkit"; version = "0.5.4"; diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index f3556668cf4b..0ee825ffbf46 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, cmake, pkg-config, pixman, @@ -8,15 +8,15 @@ nix-update-script, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE="; + hash = "sha256-XnAVV+H4f8Xdv0yZcSwJ5kCjLyE8fHxPeLX6a3HSrAU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index 752e54bb2134..a4b2d66e231f 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -1,13 +1,13 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, pugixml, nix-update-script, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprwayland-scanner"; version = "0.4.6"; diff --git a/pkgs/by-name/hy/hyprwire/package.nix b/pkgs/by-name/hy/hyprwire/package.nix index c90a2f0c1e62..907354ae5c58 100644 --- a/pkgs/by-name/hy/hyprwire/package.nix +++ b/pkgs/by-name/hy/hyprwire/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -9,7 +9,7 @@ pugixml, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprwire"; version = "0.3.1"; diff --git a/pkgs/by-name/in/inngest/package.nix b/pkgs/by-name/in/inngest/package.nix index 29db5cfa0bf7..8a13fb82b684 100644 --- a/pkgs/by-name/in/inngest/package.nix +++ b/pkgs/by-name/in/inngest/package.nix @@ -10,14 +10,14 @@ testers, }: let - version = "1.36.0"; + version = "1.37.0"; websiteRev = "159c0ac611e85ec85ffe0a8c8bf2c4a0330bdb38"; src = fetchFromGitHub { owner = "inngest"; repo = "inngest"; tag = "v${version}"; - hash = "sha256-KyH9Bj3n7RwARDcb3l5nerYGIIk2mgXPZWLhyNMm+f0="; + hash = "sha256-m9VFmplaMFD3+Z0qioehsuKeJaS6fUSb++liUabDEuM="; }; website = fetchFromGitHub { diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index c3a792134167..e2f821f1ddc1 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inputplumber"; - version = "0.77.7"; + version = "0.78.0"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-LECHrL+yopymcdpuEZUFvNX1QI30Z+mOtMYP7fnMpBM="; + hash = "sha256-wa05/gStEbXUZLvokY1N4k4f4/cPm2Kolbf+AF479lU="; }; - cargoHash = "sha256-1g4nHBu9LUMMr0bPkD4LCEFyyIc+GdhIWu+hlyGH3IM="; + cargoHash = "sha256-lScpMua5czwmnz/+fz+UrgZSWHwRNP7zB317xJS+6gs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/jq/jq-lsp/package.nix b/pkgs/by-name/jq/jq-lsp/package.nix index ebb7750c241e..2206ef8598be 100644 --- a/pkgs/by-name/jq/jq-lsp/package.nix +++ b/pkgs/by-name/jq/jq-lsp/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "jq-lsp"; - version = "0.1.17"; + version = "0.1.18"; src = fetchFromGitHub { owner = "wader"; repo = "jq-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-gHBEAKPjCX25bI/+wyhcqHja5hb4d+GXMD3pVFeqrCc="; + hash = "sha256-C32LxOfqCp6rhHKl1JNKq+KSw+TCN7QF6WDMfwfX4zo="; }; vendorHash = "sha256-pGXFuyYJPNcMEd0vPrmbdY/CeOF0AXwrNJEfrBBe4I0="; diff --git a/pkgs/by-name/jt/jtdx/package.nix b/pkgs/by-name/jt/jtdx/package.nix index 018ed5d53c05..7204d9669390 100644 --- a/pkgs/by-name/jt/jtdx/package.nix +++ b/pkgs/by-name/jt/jtdx/package.nix @@ -21,5 +21,7 @@ wsjtx.overrideAttrs (old: { pkharvey ]; homepage = "https://github.com/jtdx-project/jtdx"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ka/kanban/package.nix b/pkgs/by-name/ka/kanban/package.nix index f5e519993705..d3e3b48c9e9b 100644 --- a/pkgs/by-name/ka/kanban/package.nix +++ b/pkgs/by-name/ka/kanban/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { built with Rust. Features include file persistence, keyboard-driven navigation, multi-select capabilities, and sprint management. ''; - homepage = "https://kanban.yoon.se"; + homepage = "https://kanban.rs"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fulsomenko ]; mainProgram = "kanban"; diff --git a/pkgs/by-name/kn/kn/package.nix b/pkgs/by-name/kn/kn/package.nix index 8e683a1220b5..53a76a274d9d 100644 --- a/pkgs/by-name/kn/kn/package.nix +++ b/pkgs/by-name/kn/kn/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "kn"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "knative"; repo = "client"; tag = "knative-v${finalAttrs.version}"; - hash = "sha256-G5kadNskSwKBxSuvs58aJUM7+lraevk2GKH/sncslTo="; + hash = "sha256-/mQvYYMwOvrwrIt8xo3j5qXXmfwDFJByaj1quHc5ebk="; }; - vendorHash = "sha256-+IiDWoT9E4SCkmOwPQMTM7AdrXVA6OJa0Fg9Xjq42gI="; + vendorHash = "sha256-1CTzRMlMsF4AZHYZMq0klmNpfmk4/O6ToitHyA9eEg0="; env.GOWORK = "off"; @@ -48,7 +48,7 @@ buildGoModule (finalAttrs: { description = "Create Knative resources interactively from the command line or from within scripts"; mainProgram = "kn"; homepage = "https://github.com/knative/client"; - changelog = "https://github.com/knative/client/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/knative/client/releases/tag/knative-v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/by-name/le/lesscpy/package.nix b/pkgs/by-name/le/lesscpy/package.nix index 2fbfd11e7664..dc7aea86f6f4 100644 --- a/pkgs/by-name/le/lesscpy/package.nix +++ b/pkgs/by-name/le/lesscpy/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchPypi, + fetchpatch, }: python3Packages.buildPythonPackage rec { @@ -14,6 +15,14 @@ python3Packages.buildPythonPackage rec { hash = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw="; }; + patches = [ + # remove use of pkg_resources (drop on next release) + (fetchpatch { + url = "https://github.com/lesscpy/lesscpy/commit/bd8949579713c9d4ff9e15799a26fcecdf73530e.patch"; + hash = "sha256-U1VDqZqHYaUmND5qCkARyU/eDv2QRhGcCDzuN4+XTbo="; + }) + ]; + build-system = with python3Packages; [ setuptools ]; dependencies = with python3Packages; [ diff --git a/pkgs/by-name/li/libbde/package.nix b/pkgs/by-name/li/libbde/package.nix index acbdb3e1aa30..337e276d271c 100644 --- a/pkgs/by-name/li/libbde/package.nix +++ b/pkgs/by-name/li/libbde/package.nix @@ -2,7 +2,9 @@ lib, stdenv, fetchurl, - fuse, + fuse3, + macfuse-stubs, + pkg-config, ncurses, python3, nix-update-script, @@ -17,10 +19,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-La6rzBOfyBIXDn78vXb8GUt8jgQkzsqM38kRZ7t3Fp0="; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ - fuse ncurses python3 + (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse3) ]; preInstall = '' diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 4769f157fa89..70a5fde765ef 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdeltachat"; - version = "2.53.0"; + version = "2.55.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${finalAttrs.version}"; - hash = "sha256-W2Yh5+6MaJ47GqJioGKge2J3RetGGTcl+0YxPPlSdDo="; + hash = "sha256-Iy0VeWfD0GXdQiGZbn95p9SJ4MUSYBwsYLnI5NvgUl4="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit (finalAttrs) version src; - hash = "sha256-aoPc5XvjwwuA9aOTvIOpTm15wozC9glJGqn3vPqsJF4="; + hash = "sha256-BfvLWldH4gbnB/ehywB40Ho1IZB/Kv5szmtMTVRsvqk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libuvc/package.nix b/pkgs/by-name/li/libuvc/package.nix index b188243b05f8..a47fee9f0b48 100644 --- a/pkgs/by-name/li/libuvc/package.nix +++ b/pkgs/by-name/li/libuvc/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "libuvc"; - version = "unstable-2020-11-29"; + version = "0.0.7-unstable-2024-03-05"; src = fetchFromGitHub { owner = "libuvc"; repo = "libuvc"; - rev = "5cddef71b17d41f7e98875a840c50d9704c3d2b2"; - sha256 = "0kranb0x1k5qad8rwxnn1w9963sbfj2cfzdgpfmlivb04544m2j7"; + rev = "047920bcdfb1dac42424c90de5cc77dfc9fba04d"; + hash = "sha256-Ds4N9ezdO44eBszushQVvK0SUVDwxGkUty386VGqbT0="; }; # Upstream doesn't yet support CMake 4, remove once fixed diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 502904f11810..1b5f6193612a 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "12.5.0"; + version = "12.5.1"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-U9XLJ3LqigBuE37i4yDYTvlP98V/iApkDReH2S55/Oc="; + hash = "sha256-aGdx+IynrVBtI3Z5Zic/e5aVNWQeAFsxXr8xjIV1MTM="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/ll/llama-swap-minimal/package.nix b/pkgs/by-name/ll/llama-swap-minimal/package.nix new file mode 100644 index 000000000000..df9303570750 --- /dev/null +++ b/pkgs/by-name/ll/llama-swap-minimal/package.nix @@ -0,0 +1,5 @@ +{ llama-swap }: + +llama-swap.override { + withUI = false; +} diff --git a/pkgs/by-name/ll/llama-swap/package.nix b/pkgs/by-name/ll/llama-swap/package.nix index 94762b624033..066ef2f14b5d 100644 --- a/pkgs/by-name/ll/llama-swap/package.nix +++ b/pkgs/by-name/ll/llama-swap/package.nix @@ -12,6 +12,8 @@ nixosTests, nix-update-script, + + withUI ? true, }: let @@ -19,7 +21,7 @@ let in buildGoModule (finalAttrs: { pname = "llama-swap"; - version = "224"; + version = "240"; outputs = [ "out" @@ -30,7 +32,7 @@ buildGoModule (finalAttrs: { owner = "mostlygeek"; repo = "llama-swap"; tag = "v${finalAttrs.version}"; - hash = "sha256-IblAaM9FBdI2Y9rg36SWpclQ0jV6Y93RC+N+cXWEO94="; + hash = "sha256-cvxF4J9Qvi522dBGjaNZvwwY/bV3wXSE0oGFATjzD4U="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +45,10 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-b+RreafBMCWT/jbWTlXaiDRzA4DRe76WaCEbrfRxV/4="; + vendorHash = "sha256-jQRnFGqQvk6my7ejnesv1pylCmEXLs9GKbQJEZdsaYg="; + + # Upstream only embeds the UI when this build tag is set. + tags = lib.optionals withUI [ "embed_ui" ]; passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; }; @@ -62,7 +67,7 @@ buildGoModule (finalAttrs: { postPatch = '' substituteInPlace internal/process/process_command_forking_test.go \ - --replace "#!/bin/bash" "#!${lib.getExe bash}" + --replace-fail "#!/bin/bash" "#!${lib.getExe bash}" ''; preBuild = '' @@ -70,8 +75,10 @@ buildGoModule (finalAttrs: { ldflags+=" -X main.commit=$(cat COMMIT)" ldflags+=" -X main.date=$(cat SOURCE_DATE_EPOCH)" - # copy for go:embed in internal/server/ui_embed.go - cp -r ${finalAttrs.passthru.ui}/ui_dist internal/server/ + ${lib.optionalString withUI '' + # copy for go:embed in internal/server/ui_embed.go + cp -r ${finalAttrs.passthru.ui}/ui_dist internal/server/ + ''} ''; excludedPackages = [ @@ -88,7 +95,7 @@ buildGoModule (finalAttrs: { checkFlags = let - skippedTests = lib.optionals (stdenv.hostPlatform.isDarwin) [ + skippedTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Fail only on *-darwin intermittently # https://github.com/mostlygeek/llama-swap/issues/320 "TestProcess_AutomaticallyStartsUpstream" @@ -138,6 +145,8 @@ buildGoModule (finalAttrs: { ]; }; + __structuredAttrs = true; + meta = { homepage = "https://github.com/mostlygeek/llama-swap"; changelog = "https://github.com/mostlygeek/llama-swap/releases/tag/${finalAttrs.src.tag}"; diff --git a/pkgs/by-name/ll/llama-swap/ui.nix b/pkgs/by-name/ll/llama-swap/ui.nix index 9d43a142c60d..4d0f02b6c85b 100644 --- a/pkgs/by-name/ll/llama-swap/ui.nix +++ b/pkgs/by-name/ll/llama-swap/ui.nix @@ -7,7 +7,7 @@ buildNpmPackage (finalAttrs: { pname = "${llama-swap.pname}-ui"; inherit (llama-swap) version src; - npmDepsHash = "sha256-NJqEJ+XTdpPFtJJxP4CGu+JDUW7lKDcFgsixQJ3SXtQ="; + npmDepsHash = "sha256-cAdFKDhmyaYCoKqSYEuAhu29rBxs7i8uTmU2SHwTLnY="; postPatch = '' substituteInPlace vite.config.ts \ diff --git a/pkgs/by-name/ls/lstr/package.nix b/pkgs/by-name/ls/lstr/package.nix index 97cb5094850a..81def2cedee0 100644 --- a/pkgs/by-name/ls/lstr/package.nix +++ b/pkgs/by-name/ls/lstr/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lstr"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "bgreenwell"; repo = "lstr"; tag = "v${finalAttrs.version}"; - hash = "sha256-lJ6BSvlJiyZUOoz0QuahIgZ6GZ9NDcmvvQ7MEd9c/7U="; + hash = "sha256-uDwf6+By4z1TTkuyg0g5J8zzkM/UCsBMLAF9WfSEreE="; }; - cargoHash = "sha256-pRPcJwdhrQ+P70zaiuPCAI53lW+zEulqSrK5w8SCraQ="; + cargoHash = "sha256-CGdQmjgOvcLAE88nocn/iA4qfS98CEsseoNn/0udd0s="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ma/mailspring/package.nix b/pkgs/by-name/ma/mailspring/package.nix index d084abef9230..bf4e3ad2f1bd 100644 --- a/pkgs/by-name/ma/mailspring/package.nix +++ b/pkgs/by-name/ma/mailspring/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildNpmPackage, callPackage, fetchFromGitHub, @@ -29,6 +30,7 @@ let patches = [ # zip extraction fails on newer nodejs versions without this fix ./bump-yauzl.patch + ./remove-rpm-deb-and-macos-package-generation.patch ]; electron = electron_41; @@ -94,8 +96,7 @@ buildNpmPackage (finalAttrs: { substituteInPlace app/build/build.js \ --replace-fail "runWriteCommitHashIntoPackage," "" \ --replace-fail "runUpdateSandboxHelperPermissions," "" \ - --replace-fail "runCopySymlinkedPackages," "" \ - --replace-fail "process.argv.includes('--skip-installers')" "true" + --replace-fail "runCopySymlinkedPackages," "" # Use npm env vars to make node-gyp compile against the electron ABI export npm_config_target="${electron.version}" @@ -124,17 +125,38 @@ buildNpmPackage (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/share/mailspring $out/bin + mkdir -p $out/bin + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' - ASAR_PATH=$(find app/dist -name "app.asar" -print -quit) - cp -R "$(dirname "$ASAR_PATH")" $out/share/mailspring/resources + mkdir -p $out/share/mailspring + cp -r app/dist/*/resources $out/share/mailspring + + install -Dm444 app/dist/Mailspring.desktop $out/share/applications/Mailspring.desktop + install -Dm444 app/dist/mailspring.appdata.xml $out/share/metainfo/mailspring.appdata.xml + + for size in 16 32 64 128 256 512; do + install -Dm444 app/build/resources/linux/icons/$size.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/mailspring.png + done makeWrapper ${lib.getExe electron} "$out/bin/mailspring" \ --add-flags "$out/share/mailspring/resources/app.asar" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ html-tidy ]}" \ --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ - --add-flags ${lib.escapeShellArg commandLineArgs} + --add-flags ${lib.escapeShellArg commandLineArgs} \ + --inherit-argv0 + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + + mkdir -p $out/Applications + cp -r app/dist/*/Mailspring.app $out/Applications + + makeWrapper "$out/Applications/Mailspring.app/Contents/MacOS/Mailspring" "$out/bin/mailspring" \ + --add-flags ${lib.escapeShellArg commandLineArgs} + '' + + '' runHook postInstall ''; diff --git a/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch b/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch new file mode 100644 index 000000000000..6df9c6519084 --- /dev/null +++ b/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch @@ -0,0 +1,54 @@ +From 420f1f58734dbc7305f46b4d8089b461b79321b0 Mon Sep 17 00:00:00 2001 +From: wrench-exile-legacy +Date: Mon, 6 Jul 2026 22:40:30 +0100 +Subject: [PATCH] remove rpm, deb and macos package generation + +--- + app/build/build.js | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git a/app/build/build.js b/app/build/build.js +index 6d90aa5b2..ffec9cf8b 100644 +--- a/app/build/build.js ++++ b/app/build/build.js +@@ -373,12 +373,6 @@ async function createMacZip() { + } + const arch = process.env.OVERRIDE_TO_INTEL ? 'x64' : process.arch; + const cwd = path.join(outputDir, `Mailspring-darwin-${arch}`); +- await spawn({ +- cmd: 'zip', +- args: ['-9', '-y', '-r', '-9', '-X', zipPath, 'Mailspring.app'], +- opts: { cwd }, +- }); +- console.log(`>> Created ${zipPath}`); + } + + function writeFromTemplate(filePath, data) { +@@ -422,11 +416,6 @@ async function createDebInstaller() { + writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.appdata.xml.in'), data); + + const icon = path.join(appDir, 'build', 'resources', 'linux', 'icons', '512.png'); +- await spawn({ +- cmd: path.join(appDir, 'script', 'mkdeb'), +- args: [packageJSON.version, linuxArch, icon, linuxAssetsDir, contentsDir, outputDir], +- }); +- console.log(`Created ${outputDir}/mailspring-${packageJSON.version}-${linuxArch}.deb`); + } + + async function createRpmInstaller() { +@@ -452,12 +441,6 @@ async function createRpmInstaller() { + writeFromTemplate(path.join(linuxAssetsDir, 'redhat', 'mailspring.spec.in'), templateData); + writeFromTemplate(path.join(linuxAssetsDir, 'Mailspring.desktop.in'), templateData); + writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.appdata.xml.in'), templateData); +- +- await spawn({ +- cmd: path.join(appDir, 'script', 'mkrpm'), +- args: [outputDir, contentsDir, linuxAssetsDir], +- }); +- console.log(`Created rpm package in ${rpmDir}`); + } + + async function main() { +-- +2.54.0 + diff --git a/pkgs/by-name/ma/makeBinaryWrapper/package.nix b/pkgs/by-name/ma/makeBinaryWrapper/package.nix index a844a586d800..c369119f16a1 100644 --- a/pkgs/by-name/ma/makeBinaryWrapper/package.nix +++ b/pkgs/by-name/ma/makeBinaryWrapper/package.nix @@ -24,9 +24,13 @@ makeSetupHook { passthru = { # Extract the function call used to create a binary wrapper from its embedded docstring - extractCmd = writeShellScript "extract-binary-wrapper-cmd" '' - ${targetPackages.gnuStdenv.cc.bintools.targetPrefix}strings -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p' - ''; + extractCmd = + let + bintools = targetPackages.gnuStdenv.cc.bintools; + in + writeShellScript "extract-binary-wrapper-cmd" '' + ${lib.getExe' bintools "${bintools.targetPrefix}strings"} -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p' + ''; tests = tests.makeBinaryWrapper; }; diff --git a/pkgs/development/python-modules/maubot/default.nix b/pkgs/by-name/ma/maubot/package.nix similarity index 94% rename from pkgs/development/python-modules/maubot/default.nix rename to pkgs/by-name/ma/maubot/package.nix index b0414455e4a1..acaf6827f826 100644 --- a/pkgs/development/python-modules/maubot/default.nix +++ b/pkgs/by-name/ma/maubot/package.nix @@ -4,13 +4,14 @@ fetchpatch, callPackage, runCommand, - python, + python3, encryptionSupport ? true, - sqliteSupport ? true, }: let - maubot = python.pkgs.buildPythonPackage (finalAttrs: { + python = python3; + + maubot = python.pkgs.buildPythonApplication (finalAttrs: { pname = "maubot"; version = "0.6.0"; pyproject = true; @@ -56,9 +57,6 @@ let python-olm pycryptodome unpaddedbase64 - ] - ++ lib.optionals sqliteSupport [ - sqlalchemy_1_3 ]; # used for plugin tests diff --git a/pkgs/development/python-modules/maubot/plugins/default.nix b/pkgs/by-name/ma/maubot/plugins/default.nix similarity index 100% rename from pkgs/development/python-modules/maubot/plugins/default.nix rename to pkgs/by-name/ma/maubot/plugins/default.nix diff --git a/pkgs/development/python-modules/maubot/plugins/generated.json b/pkgs/by-name/ma/maubot/plugins/generated.json similarity index 100% rename from pkgs/development/python-modules/maubot/plugins/generated.json rename to pkgs/by-name/ma/maubot/plugins/generated.json diff --git a/pkgs/development/python-modules/maubot/plugins/generated.nix b/pkgs/by-name/ma/maubot/plugins/generated.nix similarity index 92% rename from pkgs/development/python-modules/maubot/plugins/generated.nix rename to pkgs/by-name/ma/maubot/plugins/generated.nix index 9e7bf10ac8c3..d463de5e5d48 100644 --- a/pkgs/development/python-modules/maubot/plugins/generated.nix +++ b/pkgs/by-name/ma/maubot/plugins/generated.nix @@ -28,8 +28,11 @@ lib.flip builtins.mapAttrs json ( dash = builtins.replaceStrings [ "_" ] [ "-" ] packageName; lowerDash = builtins.replaceStrings [ "_" ] [ "-" ] lower; in - python3.pkgs.${packageName} or python3.pkgs.${lower} or python3.pkgs.${dash} - or python3.pkgs.${lowerDash} or null + if lower == "maubot" then + null + else + python3.pkgs.${packageName} or python3.pkgs.${lower} or python3.pkgs.${dash} + or python3.pkgs.${lowerDash} or null ) (builtins.filter (x: x != "maubot" && x != null) deps); reqDeps = resolveDeps (lib.toList (manifest.dependencies or null)); diff --git a/pkgs/development/python-modules/maubot/plugins/update.py b/pkgs/by-name/ma/maubot/plugins/update.py similarity index 97% rename from pkgs/development/python-modules/maubot/plugins/update.py rename to pkgs/by-name/ma/maubot/plugins/update.py index cf154d809968..4e177fd5b42e 100755 --- a/pkgs/development/python-modules/maubot/plugins/update.py +++ b/pkgs/by-name/ma/maubot/plugins/update.py @@ -213,8 +213,8 @@ def main(): for plugin_name in os.listdir(directory): process_repo(os.path.join(directory, plugin_name), official) - if os.path.isdir("pkgs/development/python-modules/maubot/plugins"): - generated = "pkgs/development/python-modules/maubot/plugins/generated.json" + if os.path.isdir("pkgs/by-name/ma/maubot/plugins"): + generated = "pkgs/by-name/ma/maubot/plugins/generated.json" else: script_dir = os.path.dirname(os.path.realpath(__file__)) generated = os.path.join(script_dir, "generated.json") diff --git a/pkgs/development/python-modules/maubot/wrapper.nix b/pkgs/by-name/ma/maubot/wrapper.nix similarity index 100% rename from pkgs/development/python-modules/maubot/wrapper.nix rename to pkgs/by-name/ma/maubot/wrapper.nix diff --git a/pkgs/by-name/mc/mcp-gateway/package.nix b/pkgs/by-name/mc/mcp-gateway/package.nix index 9ce89d546bf4..5824cd389793 100644 --- a/pkgs/by-name/mc/mcp-gateway/package.nix +++ b/pkgs/by-name/mc/mcp-gateway/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mcp-gateway"; - version = "3.3.0"; + version = "3.3.2"; src = fetchFromGitHub { owner = "MikkoParkkola"; repo = "mcp-gateway"; tag = "v${finalAttrs.version}"; - hash = "sha256-R+k9NpbYcqu56cALHCU15lp0UCc3aJQGdk6ZJgs02D8="; + hash = "sha256-jSEstrmEdeQ7NzWCHCNZPBgBaroCbQ96oeQbZVxL5p0="; }; - cargoHash = "sha256-quIQXrJ/ANOyh76Q3ZErUamLDfJpqPMYSZe9wUyS0Pg="; + cargoHash = "sha256-KZseznJdv28JbABgg4oV/Gj7y25JGdQ8UWq5KgzxVpk="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/me/me3/package.nix b/pkgs/by-name/me/me3/package.nix index 5cb05222d9bc..d525a1ea6cd6 100644 --- a/pkgs/by-name/me/me3/package.nix +++ b/pkgs/by-name/me/me3/package.nix @@ -10,7 +10,7 @@ }: let - version = "0.11.0"; + version = "0.12.1"; # me3 creates a pipe under /tmp needed by the compat tool subprocess steam-run = @@ -22,10 +22,10 @@ let owner = "garyttierney"; repo = "me3"; tag = "v${version}"; - sha256 = "sha256-XyeMVPGzNF2syipLz9HPtUg7lhxcEq434FnRH3Ax+HM="; + sha256 = "sha256-pGK6A85Xp6NbpYRKJTgi47acv4c8dZgb+Jdmeu8F/uU="; }; - cargoHash = "sha256-T1HeYe9FUC5oy/SDeEd6vV4D9YIGIXMkbzf43gRNyt8="; + cargoHash = "sha256-ss2NkDHfd5NBLGpnZ80UdvO0nn2mGueO0mnlWkog1jc="; me3-cli = rustPlatform.buildRustPackage (final: { inherit cargoHash version src; diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index e257bfba31b3..03aa669ec133 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "meilisearch"; - version = "1.49.0"; + version = "1.50.0"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meilisearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-obUX84KNeJzkuRjOFBtLmCo/lcq0AwsaY/WDgaLhN2k="; + hash = "sha256-CTCfaWtLdRFCPEkcbewjz3zZ6NM1N8MaaeGM73T9QQk="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = "sha256-1UjXuvzT3gN0byKtYs6fv6xyKAi4uPBip9l+r6I1lHU="; + cargoHash = "sha256-mhXRHn+4i9lW81Cc7kzkGWODox2G6mYrmBkrhbcVYS8="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix index 7e1f67e99c3b..c3efe98f1a1e 100644 --- a/pkgs/by-name/me/melonds/package.nix +++ b/pkgs/by-name/me/melonds/package.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonds"; - version = "1.1-unstable-2026-06-07"; + version = "1.1-unstable-2026-07-19"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "10a173b5536fc75cd93f8a3868349dad963542ef"; - hash = "sha256-YsVCU40BZgYoxyuscbD0Ab613eUIgYlXJkm0KJQg+yY="; + rev = "82fdbc78483f43b310e920e21acc47787cb43564"; + hash = "sha256-2T8qzsqbULFw7jsNk0pTpLMIyS1XVnA5ojel8BmTPMw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/middleclick/package.nix b/pkgs/by-name/mi/middleclick/package.nix new file mode 100644 index 000000000000..0ab33594dc9a --- /dev/null +++ b/pkgs/by-name/mi/middleclick/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenvNoCC, + fetchurl, + nix-update-script, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "middleclick"; + version = "3.2.0"; + + __structuredAttrs = true; + + src = fetchurl { + url = "https://github.com/artginzburg/MiddleClick/releases/download/${finalAttrs.version}/MiddleClick.zip"; + hash = "sha256-6T8XYSp3QTxefO+UI/DcnbFm1m841B14OpkOLqa6aYw="; + }; + + strictDeps = true; + + nativeBuildInputs = [ unzip ]; + + dontUnpack = true; + dontBuild = true; + + # Preserve the upstream Developer ID signature and notarized app bundle. + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p unpacked "$out/Applications" + unzip -q "$src" -d unpacked + mv unpacked/MiddleClick.app "$out/Applications/" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Utility for emulating middle clicks with trackpad and Magic Mouse gestures"; + homepage = "https://github.com/artginzburg/MiddleClick"; + downloadPage = "https://github.com/artginzburg/MiddleClick/releases"; + changelog = "https://github.com/artginzburg/MiddleClick/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ akosseres ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff b/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff deleted file mode 100644 index d619219f50fe..000000000000 --- a/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/minigalaxy/launcher.py b/minigalaxy/launcher.py -index aeca3e3..aeb6763 100644 ---- a/minigalaxy/launcher.py -+++ b/minigalaxy/launcher.py -@@ -84,6 +84,7 @@ def get_execute_command(game) -> list: - if game.get_info("use_mangohud") is True: - exe_cmd.insert(0, "mangohud") - exe_cmd.insert(1, "--dlsym") -+ exe_cmd.insert(0, "@steamrun@") - exe_cmd = get_exe_cmd_with_var_command(game, exe_cmd) - logger.info("Launch command for %s: %s", game.name, " ".join(exe_cmd)) - return exe_cmd -diff --git a/tests/test_installer.py b/tests/test_installer.py -index d459b62..dee93cb 100644 ---- a/tests/test_installer.py -+++ b/tests/test_installer.py -@@ -405,13 +405,13 @@ class Test(TestCase): - mock_list_dir.return_value = ["data", "docs", "scummvm", "support", "beneath.ini", "gameinfo", "start.sh"] - - result1 = installer.get_exec_line(game1) -- self.assertEqual("scummvm -c beneath.ini", result1) -+ self.assertEqual("@steamrun@ scummvm -c beneath.ini", result1) - - game2 = Game("Blocks That Matter", install_dir="/home/test/GOG Games/Blocks That Matter", platform="linux") - mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"] - - result2 = installer.get_exec_line(game2) -- self.assertEqual('"/home/test/GOG Games/Blocks That Matter/start.sh"', result2) -+ self.assertEqual('@steamrun@ "/home/test/GOG Games/Blocks That Matter/start.sh"', result2) - - @mock.patch('os.path.getsize') - @mock.patch('os.listdir') diff --git a/pkgs/by-name/mi/minigalaxy/inject-launcher-umu-run.diff b/pkgs/by-name/mi/minigalaxy/inject-launcher-umu-run.diff new file mode 100644 index 000000000000..b965056ab086 --- /dev/null +++ b/pkgs/by-name/mi/minigalaxy/inject-launcher-umu-run.diff @@ -0,0 +1,47 @@ +diff --git a/minigalaxy/installer.py b/minigalaxy/installer.py +index a68c2c8..2a34680 100644 +--- a/minigalaxy/installer.py ++++ b/minigalaxy/installer.py +@@ -477,7 +477,7 @@ def postinstaller(game): + postinst_script = os.path.join(game.install_dir, "support", "postinst.sh") + if os.path.isfile(postinst_script): + os.chmod(postinst_script, 0o775) +- stdout, stderr, exitcode = _exe_cmd([postinst_script]) ++ stdout, stderr, exitcode = _exe_cmd(["env", "PROTONPATH=umu-sniper", "@umurun@", postinst_script]) + if exitcode not in [0]: + err_msg = "Postinstallation script failed: {}".format(postinst_script) + return err_msg +diff --git a/minigalaxy/launch_command.py b/minigalaxy/launch_command.py +index fc27c1a..cf9de5f 100644 +--- a/minigalaxy/launch_command.py ++++ b/minigalaxy/launch_command.py +@@ -11,11 +11,15 @@ class LaunchCommand: + command: list[str] + + def apply_game_launch_config(self, game: Game) -> None: ++ if self.name == "start.sh": ++ self.command.insert(0, "@umurun@") + if game.get_info(InfoKey.GAMEMODE) is True: + self.command.insert(0, "gamemoderun") + if game.get_info(InfoKey.MANGOHUD) is True: + self.command.insert(0, "mangohud") +- self.command.insert(1, "--dlsym") ++ if self.name == "start.sh": ++ self.command.insert(0, "PROTONPATH=umu-sniper") ++ self.command.insert(0, "env") + + var_list = shlex.split(game.get_info(InfoKey.VARIABLES)) + command_list = shlex.split(game.get_info(InfoKey.COMMAND)) +diff --git a/tests/test_installer.py b/tests/test_installer.py +index 4b2fe1e..fd4dfef 100644 +--- a/tests/test_installer.py ++++ b/tests/test_installer.py +@@ -440,7 +440,7 @@ class Test(TestCase): + mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"] + + result2 = installer.get_exec_line(game2) +- self.assertEqual('"/home/test/GOG Games/Blocks That Matter/start.sh"', result2) ++ self.assertEqual('env PROTONPATH=umu-sniper @umurun@ "/home/test/GOG Games/Blocks That Matter/start.sh"', result2) + + @mock.patch('os.path.getsize') + @mock.patch('os.listdir') diff --git a/pkgs/by-name/mi/minigalaxy/package.nix b/pkgs/by-name/mi/minigalaxy/package.nix index 61a041684c5a..24d683eb8888 100644 --- a/pkgs/by-name/mi/minigalaxy/package.nix +++ b/pkgs/by-name/mi/minigalaxy/package.nix @@ -1,15 +1,16 @@ { - lib, fetchFromGitHub, - glibcLocales, glib-networking, + glibcLocales, gobject-introspection, gtk3, + innoextract, + lib, libnotify, nix-update-script, python3Packages, - steam-run, replaceVars, + umu-launcher, unzip, webkitgtk_4_1, wrapGAppsHook3, @@ -18,25 +19,25 @@ python3Packages.buildPythonApplication rec { pname = "minigalaxy"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchFromGitHub { owner = "sharkwouter"; repo = "minigalaxy"; tag = version; - hash = "sha256-YZhgVeWdVaNiTj7hvYuHbaVtoKN6EFoOANWdkrlj4dU="; + hash = "sha256-qq5XLWmQ0x6/hK8beKxJDxHmbu//EuukuyOG+CpF9ug="; }; patches = [ - (replaceVars ./inject-launcher-steam-run.diff { - steamrun = lib.getExe steam-run; + (replaceVars ./inject-launcher-umu-run.diff { + umurun = lib.getExe umu-launcher; }) ]; nativeBuildInputs = [ - wrapGAppsHook3 gobject-introspection + wrapGAppsHook3 ]; buildInputs = [ @@ -72,6 +73,7 @@ python3Packages.buildPythonApplication rec { "''${gappsWrapperArgs[@]}" --suffix PATH : "${ lib.makeBinPath [ + innoextract unzip xdg-utils ] diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 51d6a9def25f..855e36e1ebdf 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -13,8 +13,8 @@ openssl, cmake, cacert, + tzdata, usage, - mise, testers, runCommand, jq, @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mise"; - version = "2026.7.5"; + version = "2026.7.10"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; tag = "v${finalAttrs.version}"; - hash = "sha256-oHZXd9u+FbwOs60yrmg5oSnQoHskVCi29TRgu0RKOpM="; + hash = "sha256-klEexXMGaGM0YkcSDaHa8lD1jdwAfCcms7soRKy3r3w="; }; - cargoHash = "sha256-JXipQn9gN5cJx6PSpDYHuxjYLNRyAwpjSaROxqSvIog="; + cargoHash = "sha256-O32fVQGb8+ECopUPeU9Pm8xKP4Aj494MtyHYwR3wFnM="; nativeBuildInputs = [ installShellFiles @@ -69,8 +69,12 @@ rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.bindgenHook ]; - # disable warnings as errors for aws-lc-sys in checkPhase - env.NIX_CFLAGS_COMPILE = "-Wno-error"; + env = { + # disable warnings as errors for aws-lc-sys in checkPhase + NIX_CFLAGS_COMPILE = "-Wno-error"; + # tera date helper tests look up timezone data via TZDIR. + TZDIR = "${tzdata}/share/zoneinfo"; + }; checkFlags = [ # last_modified will always be different in nix @@ -113,7 +117,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; }; tests = { - version = (testers.testVersion { package = mise; }).overrideAttrs (old: { + version = (testers.testVersion { package = finalAttrs.finalPackage; }).overrideAttrs (old: { nativeBuildInputs = old.nativeBuildInputs ++ [ cacert ]; }); usageCompat = @@ -121,7 +125,7 @@ rustPlatform.buildRustPackage (finalAttrs: { runCommand "mise-usage-compatibility" { nativeBuildInputs = [ - mise + finalAttrs.finalPackage usage jq ]; diff --git a/pkgs/by-name/mo/monkeys-audio/package.nix b/pkgs/by-name/mo/monkeys-audio/package.nix index caf9993a825b..696a05b02521 100644 --- a/pkgs/by-name/mo/monkeys-audio/package.nix +++ b/pkgs/by-name/mo/monkeys-audio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "13.18"; + version = "13.19"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-zNEEJSHdr89lsLGBIL2lXixSCk0Wj1kgT0GKpph5jXY="; + hash = "sha256-i2FNQB6ZMt2ZnWjVr3UDSqxHav/MAKuDwC+h+gXW/Ik="; stripRoot = false; }; diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 241cfe2420bd..439f837374a3 100644 --- a/pkgs/by-name/mu/mullvad-browser/package.nix +++ b/pkgs/by-name/mu/mullvad-browser/package.nix @@ -97,7 +97,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg_7 ] ); - version = "15.0.18"; + version = "15.0.19"; sources = { x86_64-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-hvLft1HDj/5NgAfQb1igYdhJN5H/jZ2+7s/JKKLf4Gs="; + hash = "sha256-9Vbv7A8JarYtT0Ll1bveQmwif7/IViq6geMxMqeF+S4="; }; }; diff --git a/pkgs/by-name/mu/murmure/package.nix b/pkgs/by-name/mu/murmure/package.nix index a73594ade726..ea98f50f26d3 100644 --- a/pkgs/by-name/mu/murmure/package.nix +++ b/pkgs/by-name/mu/murmure/package.nix @@ -45,7 +45,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "murmure"; - version = "1.10.0"; + version = "1.10.1"; __structuredAttrs = true; @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Kieirra"; repo = "murmure"; tag = finalAttrs.version; - hash = "sha256-zJ9OvpAfREyDWDISKYKCUyQSWdkQlVrSzX+wvwKk6Yk="; + hash = "sha256-YTfpIkGHD6GPEfuTV1AahC08y4hJ6GSWQ+9C/6bTsJU="; }; # The libappindicator_sys crate loads these libraries at runtime @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-wV0drkKgn58Yxjy+Mv2QLTQXTDwWk6/uEfk76HaMuow="; + cargoHash = "sha256-6G/ZHGjjv1U5MNLo+LAwXoM/nN2aCPOaSTJer7dUv9w="; env.OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/mu/musescore-evolution/package.nix b/pkgs/by-name/mu/musescore-evolution/package.nix index a544f3ec94f1..67848ea1c03e 100644 --- a/pkgs/by-name/mu/musescore-evolution/package.nix +++ b/pkgs/by-name/mu/musescore-evolution/package.nix @@ -50,17 +50,22 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs = [ # MuseScore JACK backend loads libjack at runtime. - "--prefix ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ libjack2 ] - }" + "--prefix" + "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH" + ":" + (lib.makeLibraryPath [ libjack2 ]) ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib" + "--set" + "ALSA_PLUGIN_DIR" + "${alsa-plugins}/lib/alsa-lib" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # There are some issues with using the wayland backend, see: # https://musescore.org/en/node/321936 - "--set-default QT_QPA_PLATFORM xcb" + "--set-default" + "QT_QPA_PLATFORM" + "xcb" ]; preFixup = '' diff --git a/pkgs/by-name/mx/mxt-app/package.nix b/pkgs/by-name/mx/mxt-app/package.nix index b2eea816e245..adaf1bda2bd9 100644 --- a/pkgs/by-name/mx/mxt-app/package.nix +++ b/pkgs/by-name/mx/mxt-app/package.nix @@ -7,14 +7,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.46"; + version = "1.52"; pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-SeP48xdZ43dL28tg7mo8SmObUt3R+8oyETst6yKkhnU="; + sha256 = "sha256-CW2iWkYuI0joTQJXt271XLO70Qq/Yg8eX9f56XnJht8="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/ne/nerva/package.nix b/pkgs/by-name/ne/nerva/package.nix index d9ba85e22c02..c661088f72a9 100644 --- a/pkgs/by-name/ne/nerva/package.nix +++ b/pkgs/by-name/ne/nerva/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "nerva"; - version = "1.40.2"; + version = "1.42.6"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "nerva"; tag = "v${finalAttrs.version}"; - hash = "sha256-znkY0R3g8ueazxx+ljCAdsBMkY1FmKn8R9GLYYIY2cA="; + hash = "sha256-TNl+/ikQWsS4hBU5m+zkfVg+KF5YwsZ6Ge3YNarbvmE="; }; vendorHash = "sha256-Z0MSD+1/1VzrJ+pz5x0JvxrCxtJe59ckaTqHK/+TVN8="; diff --git a/pkgs/by-name/ni/ninjabrain-bot/package.nix b/pkgs/by-name/ni/ninjabrain-bot/package.nix new file mode 100644 index 000000000000..655bedd3eb0b --- /dev/null +++ b/pkgs/by-name/ni/ninjabrain-bot/package.nix @@ -0,0 +1,122 @@ +{ + lib, + stdenv, + fetchFromGitHub, + maven, + makeWrapper, + copyDesktopItems, + makeDesktopItem, + jre, + libxkbcommon, + libx11, + libxcb, + libxinerama, + libxt, + libxtst, + nix-update-script, +}: +let + linuxNativeLibraries = [ + libxkbcommon + libx11 + libxcb + libxinerama + libxt + libxtst + ]; +in +maven.buildMavenPackage (finalAttrs: { + pname = "ninjabrain-bot"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "Ninjabrain1"; + repo = "Ninjabrain-Bot"; + tag = finalAttrs.version; + hash = "sha256-uOUPho4UCZxeTtCU4XHJsTR6HuXAnKXd3jk/tSRd4Yc="; + }; + strictDeps = true; + __structuredAttrs = true; + + # CI=true skips upstream display-dependent tests; the rest of the suite still runs. + env.CI = "true"; + + mvnFetchExtraArgs = { + env.CI = "true"; + }; + + mvnParameters = "assembly:single"; + mvnHash = "sha256-EZqijVMLPsZJUZA6pLL1Z5HqSeXSFo82XYRIazVweYw="; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + + install -Dm444 target/ninjabrainbot-${finalAttrs.version}-jar-with-dependencies.jar $out/share/java/ninjabrain-bot.jar + + install -Dm644 src/main/resources/icon.png $out/share/icons/hicolor/640x640/apps/ninjabrain-bot.png + + # Swing text rendering varies outside full desktop environments. + makeWrapperArgs=( + --add-flags "-Dawt.useSystemAAFontSettings=on" + --add-flags "-Dswing.aatext=true" + --add-flags "-jar $out/share/java/ninjabrain-bot.jar" + ) + + ${lib.optionalString stdenv.hostPlatform.isLinux '' + makeWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath linuxNativeLibraries} + ) + ''} + + makeWrapper ${lib.getExe jre} $out/bin/ninjabrain-bot "''${makeWrapperArgs[@]}" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ninjabrain-bot"; + desktopName = "Ninjabrain Bot"; + comment = "Stronghold calculator for Minecraft speedrunning"; + type = "Application"; + exec = "ninjabrain-bot"; + icon = "ninjabrain-bot"; + categories = [ + "Game" + "Utility" + ]; + keywords = [ + "minecraft" + "speedrun" + "stronghold" + "mcsr" + ]; + }) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Stronghold calculator for Minecraft speedrunning"; + homepage = "https://github.com/Ninjabrain1/Ninjabrain-Bot"; + changelog = "https://github.com/Ninjabrain1/Ninjabrain-Bot/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + nyxar77 + Misaka13514 + ]; + mainProgram = "ninjabrain-bot"; + # Match platforms with bundled JNativeHook libraries and JRE support + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + }; +}) diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py index 4ef5d68f2d88..c6c2e087cd0d 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py @@ -375,6 +375,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): # Without this the popover can still be closed by clicking outside of it # It handles auto-closing when the user clicks a href. close_menu_js = """ + // { const nav = document.getElementById("manual-toc"); nav?.addEventListener("click", (e) => { @@ -383,6 +384,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): } }); }); + //]]> """ intersection_observer_js = """ function createObserver() { diff --git a/pkgs/by-name/ni/nixpkgs-hammering/package.nix b/pkgs/by-name/ni/nixpkgs-hammering/package.nix index 783c07bb247c..c86b6cc2727b 100644 --- a/pkgs/by-name/ni/nixpkgs-hammering/package.nix +++ b/pkgs/by-name/ni/nixpkgs-hammering/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "nixpkgs-hammering"; - version = "0-unstable-2026-04-21"; + version = "0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "jtojnar"; repo = "nixpkgs-hammering"; - rev = "0ca8e718c6809e0c2b640b954bfe000b915634dc"; - hash = "sha256-j/jqwdM466jE2Rf6aW3DfI6wQa44eN8W8/ii1aX8HDs="; + rev = "d131eb5c4d92c9b12001f8ff6ee79fcad4dc4f32"; + hash = "sha256-rzmyA5s+7vlDazKCJSVy3bJH0ql/ekc7B2zsG+8YXLk="; }; - cargoHash = "sha256-Lmj9XWUUavlmZn/IK+CcXQhKUYfz3dKF6S2U3BMhoIc="; + cargoHash = "sha256-0xk/HIK9urjhjotQaNzEJ5CRj50jZlsNOsTCHbfCdy8="; nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix index 057f38aeb3b2..8b66c70997fb 100644 --- a/pkgs/by-name/ni/nixtamal/package.nix +++ b/pkgs/by-name/ni/nixtamal/package.nix @@ -21,7 +21,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { pname = "nixtamal"; - version = "1.9.1"; + version = "1.9.2"; release_year = 2026; minimalOCamlVersion = "5.3"; @@ -30,7 +30,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { url = "https://darcs.toastal.in.th/nixtamal/stable/"; mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ]; rev = finalAttrs.version; - hash = "sha256-Fadyi8BbGnQe/r84ZHXtuOEs+aZVwuQ/eTVlqLVN/KE="; + hash = "sha256-Df5I5zibVGNLJtJi2j4pWD+x5yu2rO9KSWyVhcus/HU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix index 9e11f3d97c1d..eb23aef23a08 100644 --- a/pkgs/by-name/ob/obs-cmd/package.nix +++ b/pkgs/by-name/ob/obs-cmd/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "obs-cmd"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "grigio"; repo = "obs-cmd"; tag = "v${finalAttrs.version}"; - hash = "sha256-8lCqUN5FacDARZylR+s74l/mSP3Jy0GT5u03/WrUALM="; + hash = "sha256-yIS9P2ljyiT8tiJmieQXWQcSkKmP7p0/XErujQRxDCE="; }; - cargoHash = "sha256-Fyyr2oMHsIb9/jiqnzb94H5eknoy/WmwU7sL1cOxuPQ="; + cargoHash = "sha256-jEGgTyqGprvtDkoWc5qihdeN91/4is3i7JBeqlm9KDw="; meta = { description = "Minimal CLI to control OBS Studio via obs-websocket"; diff --git a/pkgs/by-name/oh/oh-my-fish/package.nix b/pkgs/by-name/oh/oh-my-fish/package.nix index b93eb00d7862..2034665a5507 100644 --- a/pkgs/by-name/oh/oh-my-fish/package.nix +++ b/pkgs/by-name/oh/oh-my-fish/package.nix @@ -5,17 +5,18 @@ fish, runtimeShell, replaceVars, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "oh-my-fish"; - version = "unstable-2022-03-27"; + version = "8"; src = fetchFromGitHub { owner = "oh-my-fish"; repo = "oh-my-fish"; - rev = "d428b723c8c18fef3b2a00b8b8b731177f483ad8"; - hash = "sha256-msItKEPe7uSUpDAfCfdYZjt5NyfM3KtOrLUTO9NGqlg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-2IDXRQUMuPHKHYsB+2kNWBc2WxgA6732oJbrPDjRdp0="; }; patches = [ @@ -54,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/oh-my-fish/oh-my-fish"; description = "Fish Shell Framework"; diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index b99f25ba4cbd..60bb5bda4325 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "oh-my-posh"; - version = "29.28.0"; + version = "29.34.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = "oh-my-posh"; tag = "v${finalAttrs.version}"; - hash = "sha256-8V1Wu3wqakwSVNb/WPlxRy9KL33frb8nqWeorHuIuzI="; + hash = "sha256-phT2Bupc340jq9nm36UC2eNUYyu6L/K4f38qnKgsqKI="; }; vendorHash = "sha256-6DX/x9uWUbwXy9ccB6NIVRKsOc1nJXtctItONAI7zPQ="; diff --git a/pkgs/by-name/oi/oidcwarden/package.nix b/pkgs/by-name/oi/oidcwarden/package.nix new file mode 100644 index 000000000000..f621dc918500 --- /dev/null +++ b/pkgs/by-name/oi/oidcwarden/package.nix @@ -0,0 +1,47 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + libiconv, + stdenv, + dbBackend ? "sqlite", + libmysqlclient, + libpq, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "oidcwarden"; + version = "2026.4.2-1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Timshel"; + repo = "OIDCWarden"; + tag = "v${finalAttrs.version}"; + hash = "sha256-tHacn9RtoByWpqnWX2/gWwODDSeXJa4mk4MfxHiiJ8A="; + }; + + cargoHash = "sha256-eGsYNaLYRCrTRaoyfhxnoeA2ytYeyGGvHnAbpEIayzs="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ] + ++ lib.optional (dbBackend == "mysql") libmysqlclient + ++ lib.optional (dbBackend == "postgresql") libpq; + + buildFeatures = dbBackend; + + meta = { + description = "Unofficial Bitwarden-compatible server with OpenID Connect support"; + homepage = "https://github.com/Timshel/OIDCWarden"; + changelog = "https://github.com/Timshel/OIDCWarden/releases/tag/v${finalAttrs.src.tag}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ DerGrumpf ]; + mainProgram = "oidcwarden"; + }; +}) diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index 90b784d2904a..6849c8b01866 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "omnictl"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-xL1kZafjDQ9UkaBBs9n2u5t8jcL3CONv41hg3oA8x7s="; + hash = "sha256-k2z0QBkMJkLFtrr9ckWyS1a4jzGYkikREf8+aaMW3d0="; }; - vendorHash = "sha256-D88+xYpZgawfMLa7qJOL+5MAtSswat4ITY7sjCrJMVg="; + vendorHash = "sha256-ja+j9KSeNEHVTBjgSWYRMuB1qqbp8g3e32rDzlyzO1E="; ldflags = [ "-s" diff --git a/pkgs/by-name/on/onednn/package.nix b/pkgs/by-name/on/onednn/package.nix index 2e75c5727ce4..29d7e18b3e74 100644 --- a/pkgs/by-name/on/onednn/package.nix +++ b/pkgs/by-name/on/onednn/package.nix @@ -11,13 +11,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "onednn"; - version = "3.11.2"; + version = "3.12.2"; src = fetchFromGitHub { owner = "uxlfoundation"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-xJTllrKs6mPNM85ZqyHTHWKpVOtOghmg4ZRFAvQZ4WU="; + hash = "sha256-LrxXRe2La5SZudikqMeGggklLrY2S0okrBX6QXGD+Tc="; }; outputs = [ diff --git a/pkgs/by-name/op/openfx/package.nix b/pkgs/by-name/op/openfx/package.nix index 16aab8c28382..286f2adee795 100644 --- a/pkgs/by-name/op/openfx/package.nix +++ b/pkgs/by-name/op/openfx/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "openfx"; - version = "1.4"; + version = "1.5.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openfx"; - rev = "OFX_Release_1_4_TAG"; - sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; + rev = "OFX_Release_1.5.1"; + hash = "sha256-qiY5klmGDiU9cqjfNdFsCcNqSBwV0dVZB2ZIsElRBD4="; }; outputs = [ diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix index 3c3b4df8e31c..b963b6e55ae9 100644 --- a/pkgs/by-name/op/opengamepadui/package.nix +++ b/pkgs/by-name/op/opengamepadui/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "opengamepadui"; - version = "0.45.0"; + version = "0.45.1"; buildType = if withDebug then "debug" else "release"; @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ShadowBlip"; repo = "OpenGamepadUI"; tag = "v${finalAttrs.version}"; - hash = "sha256-B3s9fJzOUNKqvdz1CuJQKJTcQKBUsn8cEV0F6e9Pjr0="; + hash = "sha256-4pLorBNCKX9gq9uE7uqi05r6eBwerZJpThzbiK6FOXo="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/op/openttd-jgrpp/package.nix b/pkgs/by-name/op/openttd-jgrpp/package.nix index 310571619822..61783b73c081 100644 --- a/pkgs/by-name/op/openttd-jgrpp/package.nix +++ b/pkgs/by-name/op/openttd-jgrpp/package.nix @@ -7,13 +7,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.72.4"; + version = "0.73.0"; src = fetchFromGitHub { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-qiTKoaCUdcm7dJKfxwTtYU8f5C8RYxj7XZL/TtOygtg="; + hash = "sha256-eFUKJSpHLhyGXvKo/uSB01+5nGv5Y7yUTIU3U81Qx5U="; }; patches = [ ]; diff --git a/pkgs/by-name/os/osslsigncode/package.nix b/pkgs/by-name/os/osslsigncode/package.nix index c55685efdae0..06afc90d5f06 100644 --- a/pkgs/by-name/os/osslsigncode/package.nix +++ b/pkgs/by-name/os/osslsigncode/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osslsigncode"; - version = "2.13"; + version = "2.14"; src = fetchFromGitHub { owner = "mtrojnar"; repo = "osslsigncode"; rev = finalAttrs.version; - sha256 = "sha256-63SIyjG91i6ldA3NpOG5X5fT8vTRqNaXDtOE/ZStqFA="; + sha256 = "sha256-jAiGW6B3wxasESvpMRYxh0sWIPkV7L37owpwlNNlyxs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix index 3c542e1af043..f6c5f1fa21cf 100644 --- a/pkgs/by-name/pg/pgdog/package.nix +++ b/pkgs/by-name/pg/pgdog/package.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: { pname = "pgdog"; - version = "0.1.48"; + version = "0.1.49"; src = fetchFromGitHub { owner = "pgdogdev"; repo = "pgdog"; tag = "v${finalAttrs.version}"; - hash = "sha256-0lun9HmJvpSWguckUtudDcNlBc/KgpHk/fBJnj4HSuo="; + hash = "sha256-zfVNF/y1wzkvPjJ64HSzez0pOR/AEZHWc/S+cUYgat0="; }; - cargoHash = "sha256-cNIjTNuxHPofkTYpEb3+8Jhqz5AMAeXj7avNAAOG5D8="; + cargoHash = "sha256-B4jigKyK19IhCygF9ZMvO6rHDrEquLLpTVeptaFBuX0="; # Hardcoded paths for C compiler and linker postPatch = '' diff --git a/pkgs/by-name/ph/photoprism/backend.nix b/pkgs/by-name/ph/photoprism/backend.nix index 199b59c61614..02632ec2fdb3 100644 --- a/pkgs/by-name/ph/photoprism/backend.nix +++ b/pkgs/by-name/ph/photoprism/backend.nix @@ -48,7 +48,7 @@ buildGoModule { substituteInPlace internal/commands/passwd.go --replace-fail '/bin/stty' "${coreutils}/bin/stty" ''; - vendorHash = "sha256-nOytOKceVuRryixDxx791my0JkdLPfyYdK6dAUG4CQc="; + vendorHash = "sha256-mF07Lz61IIvUi4SLIMkMlKMH9zm6Zrp/KAdutl+mUzI="; subPackages = [ "cmd/photoprism" ]; diff --git a/pkgs/by-name/ph/photoprism/frontend.nix b/pkgs/by-name/ph/photoprism/frontend.nix index f62a6cf3c792..14592d00d3d5 100644 --- a/pkgs/by-name/ph/photoprism/frontend.nix +++ b/pkgs/by-name/ph/photoprism/frontend.nix @@ -9,21 +9,15 @@ buildNpmPackage { inherit src version; pname = "photoprism-frontend"; - postPatch = '' - cd frontend - ''; + npmDepsHash = "sha256-HBzul2fyISwOqf8w92yt0friMnLhMmvKPm8yI2I3ngE="; - npmDepsHash = "sha256-RjPTtIm1BhyeQLUN9mWI+sXakNju4up0FbrdwZzkTS0="; - - # Some dependencies are fetched from git repositories - forceGitDeps = true; - makeCacheWritable = true; + npmWorkspace = "frontend"; installPhase = '' runHook preInstall mkdir $out - cp -r ../assets $out/ + cp -r assets $out/ runHook postInstall ''; diff --git a/pkgs/by-name/ph/photoprism/package.nix b/pkgs/by-name/ph/photoprism/package.nix index 646062501c4e..7b63054de7d6 100644 --- a/pkgs/by-name/ph/photoprism/package.nix +++ b/pkgs/by-name/ph/photoprism/package.nix @@ -17,14 +17,14 @@ }: let - version = "251130-b3068414c"; + version = "260601-a7d098548"; pname = "photoprism"; src = fetchFromGitHub { owner = "photoprism"; repo = "photoprism"; rev = version; - hash = "sha256-8yg5CtvBtSKRaOUj9f+Db7rruXIVuF2cR50vZ+WUU6A="; + hash = "sha256-6zE9bqHFF9ifcqbvA0yjSF69+BA/M2U6ABnPta4dpl4="; }; backend = callPackage ./backend.nix { inherit src version; }; diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 54c32945edd5..3fcd55f39122 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "13.2.1"; + version = "13.2.4"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-bwedO6b4gL3FiddxmOnPn0czIV2UwCiV5iM1Cu7kFR0="; + hash = "sha256-TL6KYumNXUQ2nvkw3s/0UtT3CVw1YZfAmaCn8FHznrg="; }; - vendorHash = "sha256-u89MpsCKwYn44/69evX+a+SJtqMctx6uCXnhKEdqhTE="; + vendorHash = "sha256-Vlpjra9pcqhEy6fe6he6gsivQEmaHRgspy14DwCEOW4="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/pl/playball/package.nix b/pkgs/by-name/pl/playball/package.nix index 79decdc94a41..5c15dafb0046 100644 --- a/pkgs/by-name/pl/playball/package.nix +++ b/pkgs/by-name/pl/playball/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "playball"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "paaatrick"; repo = "playball"; tag = "v${version}"; - hash = "sha256-ldxYKLRtdNKU1xORT5HxgEMiMajUY7OwnkQ+jlsOIxY="; + hash = "sha256-kahotL2cF2j8DHB1HkSyKwcmOUMcoDO/yS9DXwGcZc0="; }; - npmDepsHash = "sha256-9sbTK7nV8m4uaUZy6DL/0r+JUlBoTkIpgYy7sacf130="; + npmDepsHash = "sha256-joHk2xYSoipxd4IVgiwinYMacw8jlvtn4K03J8AdzY0="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/by-name/po/pop/package.nix b/pkgs/by-name/po/pop/package.nix index 8e01b0cf022f..3f13356c8a81 100644 --- a/pkgs/by-name/po/pop/package.nix +++ b/pkgs/by-name/po/pop/package.nix @@ -4,6 +4,8 @@ buildGoModule, installShellFiles, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: buildGoModule (finalAttrs: { @@ -40,6 +42,13 @@ buildGoModule (finalAttrs: { --zsh <($out/bin/pop completion zsh) ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Send emails from your terminal"; homepage = "https://github.com/charmbracelet/pop"; diff --git a/pkgs/by-name/po/postman/package.nix b/pkgs/by-name/po/postman/package.nix index 5f62e19b473f..f6cc6f17d9d5 100644 --- a/pkgs/by-name/po/postman/package.nix +++ b/pkgs/by-name/po/postman/package.nix @@ -59,7 +59,6 @@ let Crafter evanjs johnrichardrinehart - tricktron ]; platforms = [ "aarch64-darwin" diff --git a/pkgs/by-name/pr/prometheus-postfix-exporter/package.nix b/pkgs/by-name/pr/prometheus-postfix-exporter/package.nix index cb70fb6958fe..4495b8c30878 100644 --- a/pkgs/by-name/pr/prometheus-postfix-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-postfix-exporter/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "postfix_exporter"; - version = "0.20.0"; + version = "0.20.4"; src = fetchFromGitHub { owner = "Hsn723"; repo = "postfix_exporter"; tag = "v${version}"; - sha256 = "sha256-tW86lnSLQdyZwvRiqTU1oExZ/zDIrZUraeoAOjs35yY="; + sha256 = "sha256-LCjTw5nL8xP6ODwVJxj4Zg99CiFvqbzjb931fmhtk0M="; }; - vendorHash = "sha256-T8fTvrpBKm+wDqf+iBeBJh9H1HEebAf0lOnnuF0W5fI="; + vendorHash = "sha256-6lqUygsV1pPGKN9SOZIouPVSZWuSOlPhqFbm16HfzGk="; ldflags = [ "-s" diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index e0a50c92611f..cbd1e9d19fb4 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -10,17 +10,17 @@ }: let pname = "proton-pass"; - version = "1.38.0"; + version = "1.38.1"; passthru = { sources = { "x86_64-linux" = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${version}_amd64.deb"; - hash = "sha256-6WYiqEJquq64b1fNv8HcQcT4/VCwtEkK4YrfAXDC6nY="; + hash = "sha256-0DQy8ITOlR88aJiR4zLCIukd5KZ2U4PVSjNBvU/A9L8="; }; "aarch64-darwin" = fetchurl { url = "https://proton.me/download/pass/macos/ProtonPass_${version}.dmg"; - hash = "sha256-CwdiHEqKnk+ELoavs1p6ND48e2rvEFBqbXQs79ihQ4M="; + hash = "sha256-lEc/tP84QU+WDTqLbUe5dMmYBLXaZZg8wmXSNgAOn7g="; }; }; updateScript = writeShellScript "update-proton-pass" '' diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index cfffd10d0302..37dedda8d1f3 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "prow"; - version = "0-unstable-2026-07-09"; - rev = "bcf4297e528a75b2aa580c5dce3e7b97e38f4553"; + version = "0-unstable-2026-07-14"; + rev = "0633879af8026d056e1a5dbe1e29f5a98f6acec3"; src = fetchFromGitHub { inherit rev; owner = "kubernetes-sigs"; repo = "prow"; - hash = "sha256-pPmkWcnEPWyWWCIlujvDvoAlZ67SrM1X8lP/WJFomyI="; + hash = "sha256-tpIxZSqftGgA501zh4MyjTrBUvLOaLjkBO8nK/IDwhU="; }; vendorHash = "sha256-iLJ2atYyHNMvflyuETpPnuhKD293k25vfZQU68Y7oN8="; diff --git a/pkgs/by-name/pr/prst/package.nix b/pkgs/by-name/pr/prst/package.nix index 865387dcfe3e..261abf5b0d91 100644 --- a/pkgs/by-name/pr/prst/package.nix +++ b/pkgs/by-name/pr/prst/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "prst"; - version = "13.3"; + version = "14.0"; src = fetchFromGitHub { owner = "patnashev"; repo = "prst"; tag = "v${finalAttrs.version}"; - hash = "sha256-J+45JwkA/z3HmzO9J6RVVXutUAVSzOXDMkyUR3zSh9E="; + hash = "sha256-41yUbSpUwV2jh8jSZjGb8X9YNc+UaS3jRaKtbaEVamA="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pu/pugixml/package.nix b/pkgs/by-name/pu/pugixml/package.nix index 1fe799dbb7fa..c4e1727cd56c 100644 --- a/pkgs/by-name/pu/pugixml/package.nix +++ b/pkgs/by-name/pu/pugixml/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pugixml"; - version = "1.15"; + version = "1.16"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; tag = "v${finalAttrs.version}"; - hash = "sha256-t/57lg32KgKPc7qRGQtO/GOwHRqoj78lllSaE/A8Z9Q="; + hash = "sha256-gdfVktqG4Adcq1QvLyvx7EFV336gnNWXL+X/NOFJ0gs="; }; outputs = [ "out" ] ++ lib.optionals shared [ "dev" ]; diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix index 57743980dedf..9a3c24fca2dc 100644 --- a/pkgs/by-name/ra/ramalama/package.nix +++ b/pkgs/by-name/ra/ramalama/package.nix @@ -50,21 +50,21 @@ python3Packages.buildPythonApplication (finalAttrs: { make docs ''; - postInstall = lib.optionalString withPodman '' - wrapProgram $out/bin/ramalama \ - --prefix PATH : ${ - lib.makeBinPath ( - [ - llama-cpp-vulkan - podman - ] - ++ (with python3Packages; [ - huggingface-hub - mlx-lm - ]) - ) - } - ''; + postInstall = + let + binPackages = [ + llama-cpp-vulkan + ] + ++ (with python3Packages; [ + huggingface-hub + mlx-lm + ]) + ++ lib.optional withPodman podman; + in + '' + wrapProgram $out/bin/ramalama \ + --prefix PATH : ${lib.makeBinPath binPackages} + ''; pythonImportsCheck = [ "ramalama" diff --git a/pkgs/by-name/re/reader/package.nix b/pkgs/by-name/re/reader/package.nix index 4dfe73781199..872633225492 100644 --- a/pkgs/by-name/re/reader/package.nix +++ b/pkgs/by-name/re/reader/package.nix @@ -5,16 +5,16 @@ }: buildGoModule (finalAttrs: { pname = "reader"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mrusme"; repo = "reader"; tag = "v${finalAttrs.version}"; - hash = "sha256-qu48ikqm4EmoeL9j67tGkX3EFBd1JdrLWhhmoElCoJY="; + hash = "sha256-R7U+atLrpx7ppdyMR381JUSOM7KAfDr8P9oEAzuZbCY="; }; - vendorHash = "sha256-8IjN7hm5Rg9ItkxE9pbnkVr5t+tG95W9vvXyGaWmEIA="; + vendorHash = "sha256-XOcqyUGfE7tq1OY6h7WV33nBNgn+oLmKRSJfVKmXIz4="; meta = { description = "Lightweight tool offering better readability of web pages on the CLI"; diff --git a/pkgs/by-name/re/reframe/package.nix b/pkgs/by-name/re/reframe/package.nix index 2269454b9d5f..72050b356e07 100644 --- a/pkgs/by-name/re/reframe/package.nix +++ b/pkgs/by-name/re/reframe/package.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "reframe"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "AlynxZhou"; repo = "reframe"; tag = "v${finalAttrs.version}"; - hash = "sha256-DXWW1QXgHnfsnH6O3qnVZoioIn+UOePNy1ZPNzVK1ks="; + hash = "sha256-WbF52bXRYKj3q4SqTrICrZgWKFg+YnJt0hXjz4S6aRo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/rg/rgp/package.nix b/pkgs/by-name/rg/rgp/package.nix index e88d88f234ce..1d77069e359f 100644 --- a/pkgs/by-name/rg/rgp/package.nix +++ b/pkgs/by-name/rg/rgp/package.nix @@ -28,15 +28,15 @@ }: let - buildNum = "2025-12-08-1746"; + buildNum = "2026-05-28-1806"; in stdenv.mkDerivation { pname = "rgp"; - version = "2.6.1"; + version = "2.7"; src = fetchurl { url = "https://gpuopen.com/download/RadeonDeveloperToolSuite-${buildNum}.tgz"; - hash = "sha256-rfFZPA8DzgP5axSHToEBvhRTgWAejn/z0WlLMectya0="; + hash = "sha256-hMUAo72JVfDEv8Rp0/0YZDXX7p8ioVH40WtK/PQnRb8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ri/rime-moegirl/package.nix b/pkgs/by-name/ri/rime-moegirl/package.nix index b21c9a9f334b..7ba321506998 100644 --- a/pkgs/by-name/ri/rime-moegirl/package.nix +++ b/pkgs/by-name/ri/rime-moegirl/package.nix @@ -5,10 +5,10 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-moegirl"; - version = "20260712"; + version = "20260713"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml"; - hash = "sha256-d4I2xyyWh9vry7vMkE1E19G55w/uenqbTspymdy0dqw="; + hash = "sha256-Fca5vWdmqaRnP6id4TqVGFsTxnynAoQTMgAWntF5eY0="; }; dontUnpack = true; diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix index 6249e96438c3..a6e1e9748658 100644 --- a/pkgs/by-name/ri/ripgrep/package.nix +++ b/pkgs/by-name/ri/ripgrep/package.nix @@ -50,15 +50,17 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; doInstallCheck = true; - installCheckPhase = '' - file="$(mktemp)" - echo "abc\nbcd\ncde" > "$file" - ${rg} -N 'bcd' "$file" - ${rg} -N 'cd' "$file" - '' - + lib.optionalString withPCRE2 '' - echo '(a(aa)aa)' | ${rg} -P '\((a*|(?R))*\)' - ''; + installCheckPhase = lib.optionalString canRunRg ( + '' + file="$(mktemp)" + echo "abc\nbcd\ncde" > "$file" + ${rg} -N 'bcd' "$file" + ${rg} -N 'cd' "$file" + '' + + lib.optionalString withPCRE2 '' + echo '(a(aa)aa)' | ${rg} -P '\((a*|(?R))*\)' + '' + ); meta = { description = "Utility that combines the usability of The Silver Searcher with the raw speed of grep"; diff --git a/pkgs/by-name/rk/rkmon/package.nix b/pkgs/by-name/rk/rkmon/package.nix new file mode 100644 index 000000000000..99f3f4609b4a --- /dev/null +++ b/pkgs/by-name/rk/rkmon/package.nix @@ -0,0 +1,41 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "rkmon"; + version = "0.3.1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "isac322"; + repo = "rkmon"; + tag = "v${finalAttrs.version}"; + hash = "sha256-LFvv/CvZxtulGQdFVU7XVDitzgQwkOIFF9mfZBAUe1Y="; + }; + + vendorHash = "sha256-f9+5iVGvkLuFHqDdeSvx4Vu6paVsRS0EZxKB9a3sr/I="; + + ldflags = [ + "-s" + "-w" + "-extldflags" + "-static" + "-X=main.Version=${finalAttrs.version}" + "-X=main.GitSHA=${finalAttrs.src.rev}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Real-time hardware monitor TUI for Rockchip RK3588 SBCs. Like htop, but for the GPU, NPU, VPU, RGA, and thermal zones of your Rock 5B+ / RK3588 board"; + homepage = "https://github.com/isac322/rkmon"; + changelog = "https://github.com/isac322/rkmon/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ matthewcroughan ]; + mainProgram = "rkmon"; + }; +}) diff --git a/pkgs/by-name/rm/rmtfs/package.nix b/pkgs/by-name/rm/rmtfs/package.nix index b19d2fc4ffb7..f930836ce598 100644 --- a/pkgs/by-name/rm/rmtfs/package.nix +++ b/pkgs/by-name/rm/rmtfs/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rmtfs"; - version = "1.1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "linux-msm"; repo = "rmtfs"; tag = "v${finalAttrs.version}"; - hash = "sha256-ehd8SbKNOpyVoF9oc7e5uYmJOHI+Q6woLyvwO8hhKEc="; + hash = "sha256-j92qz4x5KTYXjcvFGPp4YbmcM0pz2pUlV2tCsT8FV0I="; }; buildInputs = [ diff --git a/pkgs/by-name/sa/sabiql/package.nix b/pkgs/by-name/sa/sabiql/package.nix index aca5cc3f8fc4..dbee31ee9e33 100644 --- a/pkgs/by-name/sa/sabiql/package.nix +++ b/pkgs/by-name/sa/sabiql/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sabiql"; - version = "1.14.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "riii111"; repo = "sabiql"; rev = "v${finalAttrs.version}"; - hash = "sha256-Fm9AINbCoazT2OHPJUO7YHpLt1KpQ8jDfXAkX3Karl0="; + hash = "sha256-vxkuYBakLzfZJyOPFD92kYB0QapfaLfwvw/La6kVQXY="; }; - cargoHash = "sha256-915W5zpavggfPN7artvgxkErWsx9eZ6953RX/eLQagg="; + cargoHash = "sha256-UN/3VFGZdjZjBGqCxgdiWUCuDS3p+3z/WqQ9CCwwQAA="; # Upstream use latest rust version need to patch use nixpkgs version postPatch = '' diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix index f2bb851b72e0..098467a8afb0 100644 --- a/pkgs/by-name/sa/samrewritten/package.nix +++ b/pkgs/by-name/sa/samrewritten/package.nix @@ -15,16 +15,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "samrewritten"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "PaulCombal"; repo = "SamRewritten"; tag = "v${finalAttrs.version}"; - hash = "sha256-WYwuYNbapD0cIifQALtfgMNqXs5KMvaCsQqUdifJwf8="; + hash = "sha256-sSZC7yN/WuMYkdcPmHyvasaWRFzppSxmlS1bYLZGvyM="; }; - cargoHash = "sha256-dh4WPk6rU/HsUVJTMrMPsqKXpOmb/0LUAsGTbmdI6Ts="; + cargoHash = "sha256-YKiICPP6z9lZWqdoPOYRq+0mmz7jY3/eJd7XzN8Vmnk="; # Tests require network access and a running Steam client. Skipping. doCheck = false; diff --git a/pkgs/by-name/sa/sandbox-runtime/package.nix b/pkgs/by-name/sa/sandbox-runtime/package.nix index a4f76cb342f0..830679f453ed 100644 --- a/pkgs/by-name/sa/sandbox-runtime/package.nix +++ b/pkgs/by-name/sa/sandbox-runtime/package.nix @@ -17,7 +17,7 @@ buildNpmPackage (finalAttrs: { pname = "sandbox-runtime"; - version = "0.0.64"; + version = "0.0.66"; __structuredAttrs = true; @@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: { owner = "anthropic-experimental"; repo = "sandbox-runtime"; tag = "v${finalAttrs.version}"; - hash = "sha256-kKXGZcK3hx3ugud+DxLrBC+IwnUzEe0Gae2lq7DU8hA="; + hash = "sha256-fwu5rVXd3xlpn++CXvT+jjcLWtZ2/ZDb1humrXwr+D0="; }; postPatch = @@ -37,7 +37,7 @@ buildNpmPackage (finalAttrs: { strictDeps = true; - npmDepsHash = "sha256-3HOGoIG9syQJ407C8Bg7J7mtPpoIjVtUoFCdbSmT8BU="; + npmDepsHash = "sha256-ERIKGZstnixcrdoyWkZtkEq5eDQFxrZmeWTPteOgXgU="; postFixup = let diff --git a/pkgs/by-name/sc/sc-controller/package.nix b/pkgs/by-name/sc/sc-controller/package.nix index c4a4abb114a2..0e0432205bf8 100644 --- a/pkgs/by-name/sc/sc-controller/package.nix +++ b/pkgs/by-name/sc/sc-controller/package.nix @@ -1,5 +1,6 @@ { lib, + python3, python3Packages, fetchFromGitHub, wrapGAppsHook3, @@ -20,14 +21,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "sc-controller"; - version = "0.5.5"; + version = "0.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "C0rn3j"; repo = "sc-controller"; tag = "v${finalAttrs.version}"; - hash = "sha256-IQxHa0bR8FWad9v5DfvXHskwayCgzbJm5ekzf1sjfiQ="; + hash = "sha256-jQcp3c3S6G6GrU6j0m5Re9S28eLGJxmvD81dOuHFCz8="; }; nativeBuildInputs = [ @@ -92,6 +93,11 @@ python3Packages.buildPythonApplication (finalAttrs: { ) ''; + preCheck = '' + # Fix for tests not finding native libraries + ln -s build/lib.*/*.so -t . + ''; + doInstallCheck = true; meta = { diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix index 16a2765d4214..f83a315e25a0 100644 --- a/pkgs/by-name/sc/scipopt-soplex/package.nix +++ b/pkgs/by-name/sc/scipopt-soplex/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "scipopt-soplex"; - version = "8.0.2"; + version = "8.0.3"; src = fetchFromGitHub { owner = "scipopt"; repo = "soplex"; tag = "v${finalAttrs.version}"; - hash = "sha256-TW3OSBw8ok64kZedsXYjkO2eFqr0LH8uvrOsi3bwQC4="; + hash = "sha256-5UTlSfnNPVCkAE2oMVukVbbs2drbSh0HfiDqXUktBHQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/se/search-vulns/package.nix b/pkgs/by-name/se/search-vulns/package.nix index 5e4919ee1ce8..6b1e1943be61 100644 --- a/pkgs/by-name/se/search-vulns/package.nix +++ b/pkgs/by-name/se/search-vulns/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "search-vulns"; - version = "1.2.1"; + version = "1.2.3"; pyproject = true; src = fetchFromGitHub { owner = "ra1nb0rn"; repo = "search_vulns"; tag = "v${finalAttrs.version}"; - hash = "sha256-w4kK0/bAbWPHK6Nllhb8vCReJwiBUL6EpX/Cnt3aplg="; + hash = "sha256-YSnBM0nTjQSNh7eDqAeu58J1DuyG7tRjOX+6zlUVH+I="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index 46ab40e702e3..9037ef83a23a 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sentry-native"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; tag = finalAttrs.version; - hash = "sha256-9UwF8B1dd4RhboMgkZCHI3UqAm8aZAhgLo9VzjwlW/I="; + hash = "sha256-McOb4ICd6/6CTjG63Pzei5LAvfLcnL34qnwvU0RDm1A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sg/sgt-puzzles/package.nix b/pkgs/by-name/sg/sgt-puzzles/package.nix index d4af4eb46e9c..6bc1e154cf20 100644 --- a/pkgs/by-name/sg/sgt-puzzles/package.nix +++ b/pkgs/by-name/sg/sgt-puzzles/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sgt-puzzles"; - version = "20260523.7ad37c6"; + version = "20260720.3c36322"; src = fetchurl { url = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz"; - hash = "sha256-Pcl8wCXrnjQ68jMpZMhWcvKiHanqk1efMbzGbjOHupc="; + hash = "sha256-z0OuMD8IXEp7TAcR4xKXVanGiev78+pVvyc9lgIiOAY="; }; sgt-puzzles-menu = fetchurl { diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix index e6a2e4a3dc08..fd1c7735d024 100644 --- a/pkgs/by-name/sh/shopify-cli/package.nix +++ b/pkgs/by-name/sh/shopify-cli/package.nix @@ -19,20 +19,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "shopify"; - version = "3.91.1"; + version = "4.5.1"; src = fetchFromGitHub { owner = "shopify"; repo = "cli"; tag = finalAttrs.version; - hash = "sha256-cOq4LpTMr59ev04PIu0GYAAK0N0n2SrYCnz8sHfcXrs="; + hash = "sha256-uunVTgq3njrnuKHksXpGhAcAQanOFtsLRa/Ab6adoXo="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-gwEVlvr8hxgyCsGjxjz1UkbDZYYq1iukKTPJ7JHdo2U="; + hash = "sha256-IvPxHUdjFVkWpQnmmZz82rn8XJVljPbgNoVGpg7uU84="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/sif/package.nix b/pkgs/by-name/si/sif/package.nix index fd35b645958a..aa8c44778f8c 100644 --- a/pkgs/by-name/si/sif/package.nix +++ b/pkgs/by-name/si/sif/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "sif"; - version = "0-unstable-2026-07-03"; + version = "0-unstable-2026-07-12"; src = fetchFromGitHub { owner = "vmfunc"; repo = "sif"; - rev = "7ea1cd28d5b535b8ea7826de9100e12907bc2fd0"; - hash = "sha256-1gyfWJVuuEdW87DBZ++NX/pSoA12l+Ju3n5TVDzfnoo="; + rev = "d13622dc1c6f401f2cb23b40fbe36af7fb812a10"; + hash = "sha256-VHBo65gs/Aij40xrzyhJz4puIXHI/ON6qcS7v+Nggu4="; }; - vendorHash = "sha256-ftnEHvnjdJpViEXS3nLK8nRmJRBLzjzqMZKPVvlzRDk="; + vendorHash = "sha256-IMavLk0Sz6Lelj9jkS+fBruSinXiVzX+OWfbqfuwt14="; subPackages = [ "cmd/sif" ]; diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index 5f6bb47767be..1f3eb11bace5 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "signalbackup-tools"; - version = "20260712"; + version = "20260718"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = finalAttrs.version; - hash = "sha256-X4I7eFUXty9LNI2nNyVUZXYhKQds+elor/Zs5FSg2iE="; + hash = "sha256-C/yAq2i8r9gk0LCOi6kaM/kusklu/jeJ61H45PnSWQY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index 139b02922412..df0ae0a33d14 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -5,7 +5,6 @@ nix-update-script, apple-sdk_15, versionCheckHook, - llvmPackages, }: let @@ -22,20 +21,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5tyc/yYzdV/3JTtujuj7le/14XkC7TlN/nZg7tOZsNg="; }; - nativeBuildInputs = [ - # TODO: Remove once #536365 reaches this branch - llvmPackages.lld - ]; - buildInputs = [ apple-sdk_15 ]; makeFlags = [ "arm64" ]; - # TODO: Remove once #536365 reaches this branch - env.NIX_CFLAGS_LINK = "-fuse-ld=lld"; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/sl/sleek-grub-theme/package.nix b/pkgs/by-name/sl/sleek-grub-theme/package.nix index e7ae9353fbb4..33db59ef3c61 100644 --- a/pkgs/by-name/sl/sleek-grub-theme/package.nix +++ b/pkgs/by-name/sl/sleek-grub-theme/package.nix @@ -15,13 +15,13 @@ assert builtins.elem withStyle [ stdenv.mkDerivation { pname = "sleek-grub-theme"; - version = "unstable-2024-08-11"; + version = "0-unstable-2025-05-21"; src = fetchFromGitHub { owner = "sandesh236"; repo = "sleek--themes"; - rev = "0c47e645ccc2d72aa165e9d994f9d09f58de9f6d"; - hash = "sha256-H4s4CSR8DaH8RT9w40hkguNNcC0U8gHKS2FLt+FApeA="; + rev = "e103aa4cd655be6a38dbab37b1911c6ed9ef7765"; + hash = "sha256-E3DSOZlszBRy2F172L7ZSSsDlkk3n9jGXl4hRWv2WF8="; }; installPhase = '' diff --git a/pkgs/by-name/sm/smbnetfs/package.nix b/pkgs/by-name/sm/smbnetfs/package.nix deleted file mode 100644 index e41c7b3ac2a6..000000000000 --- a/pkgs/by-name/sm/smbnetfs/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fuse, - samba, - pkg-config, - glib, - autoconf, - attr, - libsecret, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "smbnetfs"; - version = "0.6.3"; - src = fetchurl { - url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${finalAttrs.version}/smbnetfs-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-6sN7l2n76cP0uvPrZMYaa1mtTyqgXf3culoaxK301WA="; - }; - - nativeBuildInputs = [ - pkg-config - autoconf - ]; - buildInputs = [ - fuse - samba - glib - attr - libsecret - ]; - - meta = { - description = "FUSE FS for mounting Samba shares"; - maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.linux; - license = lib.licenses.gpl2Only; - downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs"; - homepage = "https://sourceforge.net/projects/smbnetfs/"; - mainProgram = "smbnetfs"; - }; -}) diff --git a/pkgs/by-name/sn/snip/package.nix b/pkgs/by-name/sn/snip/package.nix index 6091c029014a..f890bd12d9f1 100644 --- a/pkgs/by-name/sn/snip/package.nix +++ b/pkgs/by-name/sn/snip/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "snip"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "edouard-claude"; repo = "snip"; tag = "v${finalAttrs.version}"; - hash = "sha256-u6Jc9U4tb5Y/evtWR/Nw535xVh09ChcKN0Dm+l3bjvA="; + hash = "sha256-y88ZHg29Z/QBZk8YWXp287Rel7DpPESYAlbqt5hj1nc="; }; vendorHash = "sha256-2MxFZqjNuLzcuu+bsLyOyHIakCxh7j0FUx8LsjZRhrY="; diff --git a/pkgs/by-name/sp/spamassassin/package.nix b/pkgs/by-name/sp/spamassassin/package.nix index 0a2031455183..38246bbf77e4 100644 --- a/pkgs/by-name/sp/spamassassin/package.nix +++ b/pkgs/by-name/sp/spamassassin/package.nix @@ -74,6 +74,8 @@ perlPackages.buildPerlPackage rec { makeMakerFlags = [ "SYSCONFDIR=/etc LOCALSTATEDIR=/var/lib/spamassassin" ]; + __darwinAllowLocalNetworking = true; + checkInputs = (with perlPackages; [ TextDiff # t/strip2.t diff --git a/pkgs/by-name/sp/spicedb-zed/package.nix b/pkgs/by-name/sp/spicedb-zed/package.nix index 14efa4ded236..f72d9fb245c1 100644 --- a/pkgs/by-name/sp/spicedb-zed/package.nix +++ b/pkgs/by-name/sp/spicedb-zed/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "zed"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-rlTcC2+faNZKvzouGC9nJBBCsDabxozTE/SFbf8YKQ8="; + hash = "sha256-wwD/PCnhCFzhq/Oe9+qU+w/ZlloZbezjOtBKMQkxI9E="; }; - vendorHash = "sha256-/nnPVy+pjcgkgJW8630IycmGF4Qq4I01htEDlsWvZbM="; + vendorHash = "sha256-swlwje4XCzhRojPOaW28MDEaZQIvXGUoH7qjyz5+tUo="; ldflags = [ "-X 'github.com/jzelinskie/cobrautil/v2.Version=${finalAttrs.src.tag}'" ]; diff --git a/pkgs/by-name/sp/spotify-player/package.nix b/pkgs/by-name/sp/spotify-player/package.nix index 94c7f440b17e..2424344e74a7 100644 --- a/pkgs/by-name/sp/spotify-player/package.nix +++ b/pkgs/by-name/sp/spotify-player/package.nix @@ -49,16 +49,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ rustPlatform.buildRustPackage (finalAttrs: { pname = "spotify-player"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "aome510"; repo = "spotify-player"; tag = "v${finalAttrs.version}"; - hash = "sha256-SxzQdQOg+KS6jXJNifVkehR91g6gTHBYgyxfXx9WWI8="; + hash = "sha256-+GADmRl4XMwV8TfYZjEeyKDDfda3bDPzeerhYryX6vA="; }; - cargoHash = "sha256-TmGdJXKOsTL9HVyEEe3PtiLMSDJV/TRokRBVAUdHL7I="; + cargoHash = "sha256-CSZ5sZ+d7Jhi43ipaWXKupYPFgWCbCx4RMTQN8emu9o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ss/sshocker/package.nix b/pkgs/by-name/ss/sshocker/package.nix index d8bb6db7571b..d49c79aa5b0f 100644 --- a/pkgs/by-name/ss/sshocker/package.nix +++ b/pkgs/by-name/ss/sshocker/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "sshocker"; - version = "0.3.9"; + version = "0.3.11"; src = fetchFromGitHub { owner = "lima-vm"; repo = "sshocker"; tag = "v${finalAttrs.version}"; - hash = "sha256-7s5jPMt6q7RUXxwA7rwVXhWGRrwfMc/EcEQxicwEHjs="; + hash = "sha256-VFUPRGC6NkBd75X21uAlqDMAYU4Tyo/RFgBsc5D4LMk="; }; - vendorHash = "sha256-FGaZTE8CCZ16ozsZr5MUFNkEy8+nkBYXH55n5TJG4Bg="; + vendorHash = "sha256-75eziqi+lgKAA4MTBqVEdf4PEn5J8kk480xsa/2XtqQ="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/st/stalwart-cli/package.nix b/pkgs/by-name/st/stalwart-cli/package.nix index f0213bd93504..7819c6235483 100644 --- a/pkgs/by-name/st/stalwart-cli/package.nix +++ b/pkgs/by-name/st/stalwart-cli/package.nix @@ -7,14 +7,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "stalwart-cli"; - version = "1.0.10"; + version = "1.0.11"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-9fB9qkRtXIL/8qROl3FiK0w5XUA+nDVjxi1+dhwtxJM="; + hash = "sha256-nU9KL25zS71tRRc6Z9r6cEQDuw35RVhesfJf5hSVx4s="; }; - cargoHash = "sha256-91S7XMbNClc349AvXixQdBnPV5+3G1RA5fpfNUfFmwk="; + cargoHash = "sha256-yByKWH4o43zGki8Tf9pNQATyQO6UNvzFtjj9cqzvP1I="; __structuredAttrs = true; # `Result::unwrap()` on an `Err` value: Network(reqwest::Error { kind: Builder, source: General("No CA certificates were loaded from the system") }) nativeCheckInputs = [ cacert ]; diff --git a/pkgs/by-name/st/stalwart-vandelay/package.nix b/pkgs/by-name/st/stalwart-vandelay/package.nix index 7b9e4fc45efa..5b00794ce326 100644 --- a/pkgs/by-name/st/stalwart-vandelay/package.nix +++ b/pkgs/by-name/st/stalwart-vandelay/package.nix @@ -8,14 +8,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "vandelay"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "stalwartlabs"; repo = "vandelay"; tag = "v${finalAttrs.version}"; - hash = "sha256-ePOh2lJWJvZ5sV8KQ4n9A5pV7UhDBkN+RQ37LLoMm+o="; + hash = "sha256-Eg4kQncwCHpFzCZBp2OK4yUsBsYXwf1pQ+USHwmU9Ro="; }; - cargoHash = "sha256-KlAarYv8Vzp0bpR2jhC4bG0iVyG5YPGvsa8GHRsscJg="; + cargoHash = "sha256-+v0xgVliX/sDDDMCzWMVDnBDoJK9a2xaIkMJwEIO6ks="; __structuredAttrs = true; __darwinAllowLocalNetworking = true; # called `Result::unwrap()` on an `Err` value: Tls("rustls platform verifier: unexpected error: No CA certificates were loaded from the system") diff --git a/pkgs/by-name/su/surge-xt/package.nix b/pkgs/by-name/su/surge-xt/package.nix index 3a2e22cb5574..bad3fc26ea66 100644 --- a/pkgs/by-name/su/surge-xt/package.nix +++ b/pkgs/by-name/su/surge-xt/package.nix @@ -96,7 +96,10 @@ stdenv.mkDerivation (finalAttrs: { description = "LV2, VST3 & CLAP synthesizer plug-in (previously released as Vember Audio Surge)"; homepage = "https://surge-synthesizer.github.io"; license = lib.licenses.gpl3; - platforms = [ "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; maintainers = with lib.maintainers; [ magnetophon mrtnvgr diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index 31032d54a62e..5cb5fbb93ec5 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "syft"; - version = "1.46.0"; + version = "1.48.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${finalAttrs.version}"; - hash = "sha256-gjVfsJQoE//u0i6lVQCEF2dSUvoepIOaqqCazOUgSwI="; + hash = "sha256-ilpWgVfEAN1v+ue2xIplvlctZpuASVZaqcWGI8ZMWUY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-t4L+Q82ohwBEXVh1Yy7OOrNhinnAXzOHO7mmFJQUZYM="; + vendorHash = "sha256-CM0afxHJTbDzAlskaT2cPBL/0IQGSv1+S7k8t40tDIc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix index 35e58e18ab5b..3c9edf4f23ea 100644 --- a/pkgs/by-name/sy/syslogng/package.nix +++ b/pkgs/by-name/sy/syslogng/package.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "syslog-ng"; - version = "4.11.0"; + version = "4.12.0"; src = fetchFromGitHub { owner = "syslog-ng"; repo = "syslog-ng"; tag = "syslog-ng-${finalAttrs.version}"; - hash = "sha256-7t1Q3qaPMp36siQALmeB27G6hfsql+kepERGB0yPsVU="; + hash = "sha256-89v0Ape6FZVYePb+wjy0RO+NOyzluQNJliexM04li3Y="; fetchSubmodules = true; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index aa06af6acefe..ad9aad2305e5 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "telegraf"; - version = "1.39.1"; + version = "1.39.2"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "influxdata"; repo = "telegraf"; rev = "v${finalAttrs.version}"; - hash = "sha256-B9Xy02oYSYcU0IBOZes9tof/04TLvLybOU/nLLaFORk="; + hash = "sha256-yWWjlCAc5xJh4IwszVRTGIM5DMXKHyfAHEa1jSVi/mk="; }; - vendorHash = "sha256-9o0Tt6OZnoNO8iSLYmn1SMkQmZzC19uNmfHSkEqWzmA="; + vendorHash = "sha256-j/yGDEXNOrMAq4ArMjqTxZHfvQZkjmDpZQ3LAUe8BJ0="; proxyVendor = true; ldflags = [ diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix index 2cb02d9f5f87..a2314bead65f 100644 --- a/pkgs/by-name/te/teleport_17/package.nix +++ b/pkgs/by-name/te/teleport_17/package.nix @@ -7,11 +7,11 @@ }: buildTeleport { - version = "17.7.25"; - hash = "sha256-IrelrkTvOBcTkO7cHf572MU5KkOQq3we53dgFsDCSRo="; - vendorHash = "sha256-ERwCdWdp230wkqsRUCnd1hbO4PqXo+gDPsoGbxQqt04="; + version = "17.7.26"; + hash = "sha256-JwPW+w2ZS4jGWxf0GZgf3UMUrxKcIthnvZT8nImtE2c="; + vendorHash = "sha256-YX0HC+cU3YpAdToALJa/FeCc8ANEq7E+zExzX42lk9c="; cargoHash = "sha256-BE/TBZoOaB3Th14E+t3qJ+0Uww56TtRA1sRQ+usFo+Y="; - pnpmHash = "sha256-TARwHswSWbKk2eoyynuaOm7pvt2CwbjtklqnM+9/YXM="; + pnpmHash = "sha256-oVQF+Ba7zLCr86pPzFydVOBzA3GSzvtIfoggtiO2oFQ="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; inherit buildGoModule withRdpClient extPatches; diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix index 31e2be061ec6..a691659160fa 100644 --- a/pkgs/by-name/te/teleport_18/package.nix +++ b/pkgs/by-name/te/teleport_18/package.nix @@ -7,11 +7,11 @@ }: buildTeleport { - version = "18.9.2"; - hash = "sha256-w6qCH57L2rwClbSpZeG01eekzj3JRNijwSdfl+wx8v8="; - vendorHash = "sha256-LJmpFHvFsBsneq1Cl3vvqxBGB94gSjaikNDZtQfwNjM="; - pnpmHash = "sha256-8tKVv5SPJlS89EsHhF8qpThkh4n47qRBbHDCgX17Cdg="; - cargoHash = "sha256-+B5fGIzCpiYmqVcM4iy+PTIdtvuvtufQiXMHNzHTDlQ="; + version = "18.10.0"; + hash = "sha256-df2VEtMTsnB72WIQj7iButC3b/U7tpv2e6dQEZm5zVA="; + vendorHash = "sha256-5uTZuWOSgL4319iUg8QuIqY4rACr4xBUHzdLXyG6Xo0="; + pnpmHash = "sha256-Fvp2ROOcr7g0yqjQheiLTaBEMysmyLLyzir6pYh09SQ="; + cargoHash = "sha256-cjks+Gv4CdlqWaJFFeyFsIuc3KsE7A/1MEDQB36pTkk="; wasm-bindgen-cli = wasm-bindgen-cli_0_2_122; buildGoModule = buildGo125Module; diff --git a/pkgs/by-name/te/temporal-ui-server/package.nix b/pkgs/by-name/te/temporal-ui-server/package.nix index 4883e941a960..6e68bf22576f 100644 --- a/pkgs/by-name/te/temporal-ui-server/package.nix +++ b/pkgs/by-name/te/temporal-ui-server/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "temporal-ui-server"; - version = "2.52.0"; + version = "2.52.1"; src = fetchFromGitHub { owner = "temporalio"; repo = "ui-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-5WGE4igWVkWwxy5k8x+X4roDX1glaW+x67UGkoiSWwM="; + hash = "sha256-Z6lDqzDDzyHh2ZLf1paqUT9f6+ioR0qnVhX4/QFa9D0="; }; vendorHash = "sha256-E9pg16YJRDahBmiHwQY3r8kA+vBfza7KdFYqdw+qBSY="; diff --git a/pkgs/by-name/te/tetrd/package.nix b/pkgs/by-name/te/tetrd/package.nix index ee7b6897f1b9..2f0640e3445f 100644 --- a/pkgs/by-name/te/tetrd/package.nix +++ b/pkgs/by-name/te/tetrd/package.nix @@ -21,15 +21,16 @@ libappindicator, udev, libgbm, + libGL, }: stdenv.mkDerivation rec { pname = "tetrd"; - version = "1.0.4"; + version = "1.3.1-1"; src = fetchurl { - url = "https://web.archive.org/web/20211130190525/https://download.tetrd.app/files/tetrd.linux_amd64.pkg.tar.xz"; - sha256 = "1bxp7rg2dm9nnvkgg48xd156d0jgdf35flaw0bwzkkh3zz9ysry2"; + url = "https://web.archive.org/web/20260108185127/https://download.tetrd.app/files/tetrd.linux_amd64.pkg.tar.xz"; + sha256 = "0mpixs20jrxkbxvd7nl0p664jgqfp3m6qf7kmsj7frkhky697fbm"; }; sourceRoot = "."; @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + libGL c-ares ffmpeg libevent @@ -71,6 +73,9 @@ stdenv.mkDerivation rec { wrapProgram $out/opt/Tetrd/tetrd \ --prefix LD_LIBRARY_PATH ":" ${lib.makeLibraryPath buildInputs} + mkdir $out/bin + ln -s $out/opt/Tetrd/tetrd $out/bin/tetrd + runHook postInstall ''; @@ -84,5 +89,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; + mainProgram = "tetrd"; }; } diff --git a/pkgs/by-name/tf/tfupdate/package.nix b/pkgs/by-name/tf/tfupdate/package.nix index 7ced17a1bfa4..e380a581b337 100644 --- a/pkgs/by-name/tf/tfupdate/package.nix +++ b/pkgs/by-name/tf/tfupdate/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "tfupdate"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "minamijoyo"; repo = "tfupdate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-1okamMftP12ggQWxTgkjD4iAuxLlQ0YSwiUq8U39D7Y="; + sha256 = "sha256-bvMm+BFdJQ4DTDJwg9eRwAUp1QdJWzCZL1+wOBCJGX4="; }; vendorHash = "sha256-5dz76K1/sBmms1iL7dFHXg2jJwsRmDlgstiHKExBAyU="; diff --git a/pkgs/by-name/th/thruster/package.nix b/pkgs/by-name/th/thruster/package.nix index 8a17723640d7..c1cd9e6f3af9 100644 --- a/pkgs/by-name/th/thruster/package.nix +++ b/pkgs/by-name/th/thruster/package.nix @@ -7,16 +7,16 @@ buildGo126Module (finalAttrs: { pname = "thruster"; - version = "0.1.22"; + version = "0.1.23"; src = fetchFromGitHub { owner = "basecamp"; repo = "thruster"; tag = "v${finalAttrs.version}"; - hash = "sha256-d+zdzzT+47y9WOFARlQ/wCrc9tnyS/4HsE0a6aQl/KA="; + hash = "sha256-R7JutM3tWkkkRsxxNgHIoz7VdYIfXNTmmvhSh8YHFuM="; }; - vendorHash = "sha256-veXgGs6+TauExVAaNnkIZwylQWZ4um3rrG8of/dYCv0="; + vendorHash = "sha256-V9KAr+/r5SGNSBamD3U7bvBiiXn5GTmopSxiNmFL6lQ="; subPackages = [ "cmd/thrust" ]; diff --git a/pkgs/by-name/ti/tiddit/package.nix b/pkgs/by-name/ti/tiddit/package.nix index 562f44a65f2e..5bb402ec8d61 100644 --- a/pkgs/by-name/ti/tiddit/package.nix +++ b/pkgs/by-name/ti/tiddit/package.nix @@ -8,14 +8,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "tiddit"; - version = "3.9.5"; + version = "3.9.7"; pyproject = true; src = fetchFromGitHub { owner = "SciLifeLab"; repo = "TIDDIT"; tag = "TIDDIT-${finalAttrs.version}"; - hash = "sha256-6uJZzetqRS0czX4qjjPgiSaPun7BkrPYllDdFWNK84k="; + hash = "sha256-B3vUxLEnOdX733iGOfMmueVaSEqMmlp6fN4M8oElNNQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/to/todoist-cli/package.nix b/pkgs/by-name/to/todoist-cli/package.nix index 3aa1dcdc3788..bdf112b99693 100644 --- a/pkgs/by-name/to/todoist-cli/package.nix +++ b/pkgs/by-name/to/todoist-cli/package.nix @@ -7,16 +7,16 @@ }: buildNpmPackage rec { pname = "todoist-cli"; - version = "1.76.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Doist"; repo = "todoist-cli"; rev = "v${version}"; - sha256 = "sha256-3glrAc2yZJqP8gd28m5cjVPR+t7hM17etsxQWOs4J8k="; + sha256 = "sha256-5+FxpTQmxeoNF/lTjKvFxP1T7HYt7YaUflTvw0GcOac="; }; - npmDepsHash = "sha256-q50gIxHYdwW7cUO6FaUr3em1NX6kNw/+T8T+QLaB6Wk="; + npmDepsHash = "sha256-IVabpRYKMI6ST/TumG7pMwDoUMIJBlhjUm35Eo7mSlE="; doCheck = true; diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix index bc82d13e2aee..904d070735c7 100644 --- a/pkgs/by-name/to/tombi/package.nix +++ b/pkgs/by-name/to/tombi/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "tombi"; - version = "1.2.2"; + version = "1.2.4"; __structuredAttrs = true; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "tombi-toml"; repo = "tombi"; tag = "v${finalAttrs.version}"; - hash = "sha256-F7YQy+p0nsC4rKBs8CUG39FrK7fI8JE71YhHV6RaFZg="; + hash = "sha256-XusEBLWK9yd1FLlfPY+lNPeBN1Q50RV5wrTMz+C6TZ8="; }; # Tests relies on the presence of network diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 3b0d8486db5e..8fc2aaddb44a 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -102,7 +102,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg_7 ] ); - version = "15.0.18"; + version = "15.0.19"; sources = { x86_64-linux = fetchurl { @@ -112,7 +112,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-4e7G8M/iKU65ECMVhxGjaJwHfwVZ49RD7ro6YJT43v0="; + hash = "sha256-LrSrQx9JIcpjsSO2+fRFoHP797ZfGI9FpXfVdusr4s8="; }; i686-linux = fetchurl { @@ -122,7 +122,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-lLShsQQ2thSSp4PRK9Fhza6e01Myj2mUP4qqCeyilXo="; + hash = "sha256-N+TjpJrHg8cB6vwCqrTWnz4/dwzu2/r55kNmkLemWvU="; }; }; diff --git a/pkgs/by-name/tp/tpm2-tools/package.nix b/pkgs/by-name/tp/tpm2-tools/package.nix index 0aacf1ca3c4e..a92a5c36bec1 100644 --- a/pkgs/by-name/tp/tpm2-tools/package.nix +++ b/pkgs/by-name/tp/tpm2-tools/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tpm2-tools"; - version = "5.7"; + version = "5.8"; src = fetchurl { url = "https://github.com/tpm2-software/tpm2-tools/releases/download/${finalAttrs.version}/tpm2-tools-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-OBDTa1B5JW9PL3zlUuIiE9Q7EDHBMVON+KLbw8VwmDo="; + sha256 = "sha256-HLcxhcroFLThXHwtCyJkLWQPr0h3X0FWof2S7fhL73M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix index 822f813f1a50..b18355cac248 100644 --- a/pkgs/by-name/tr/trilium-desktop/package.nix +++ b/pkgs/by-name/tr/trilium-desktop/package.nix @@ -5,7 +5,7 @@ fetchurl, makeBinaryWrapper, # use specific electron since it has to load a compiled module - electron_41, + electron_42, autoPatchelfHook, makeDesktopItem, copyDesktopItems, @@ -15,7 +15,7 @@ let pname = "trilium-desktop"; - version = "0.103.0"; + version = "0.104.0"; triliumSource = os: arch: hash: { url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip"; @@ -26,9 +26,9 @@ let darwinSource = triliumSource "macos"; # exposed like this for update.sh - x86_64-linux.hash = "sha256-1d6nYhj83LWzglkWoOtAj6lNPkik1qXY5lVpr1iG7No="; - aarch64-linux.hash = "sha256-LQMNgj1Ml8gShlPS0qgD/a+Fw4SjvvHrw6XAcSLN7q4="; - aarch64-darwin.hash = "sha256-dMlgJgDuxZH1jnvLalmgDUMVCdWQ8AviGt86aeMbGVY="; + x86_64-linux.hash = "sha256-VVYBXjKBo5GNKrIiSjvLw3Md26NEO2Fgot2421PDr0k="; + aarch64-linux.hash = "sha256-iHFzCiqNajETgJm4jk6NdrCybM1SG9qThBwEaGJMeqM="; + aarch64-darwin.hash = "sha256-zVV7lJhl/DNDfvbyCCdTSeDvhyzQLF8pxfnr2QYKeas="; sources = { x86_64-linux = linuxSource "x64" x86_64-linux.hash; @@ -109,7 +109,7 @@ let asar pack $tmp/ $out/share/trilium/resources/app.asar rm -rf $tmp - makeWrapper ${lib.getExe electron_41} $out/bin/trilium \ + makeWrapper ${lib.getExe electron_42} $out/bin/trilium \ "''${gappsWrapperArgs[@]}" \ --set-default ELECTRON_IS_DEV 0 \ --add-flags $out/share/trilium/resources/app.asar diff --git a/pkgs/by-name/tr/trilium-server/package.nix b/pkgs/by-name/tr/trilium-server/package.nix index 02b27fca73c2..2e9e0558309a 100644 --- a/pkgs/by-name/tr/trilium-server/package.nix +++ b/pkgs/by-name/tr/trilium-server/package.nix @@ -7,12 +7,12 @@ }: let - version = "0.103.0"; + version = "0.104.0"; serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz"; - serverSource_x64.hash = "sha256-+PmlEevacif9xP8y7KrMMCwMQ0jGmT9yVhMrQ1SYG58="; + serverSource_x64.hash = "sha256-lrZL0c9ijvjYUQlN6BN1BhHR2KacFG6h6KzIlkIKLGk="; serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz"; - serverSource_arm64.hash = "sha256-RjnHCvVIR/ExZ9lC8ukGr2M8X1Hnj5ZeVMmQHUvZTKY="; + serverSource_arm64.hash = "sha256-EgqYA7IBSt9tZ12MgktIKhJ9/ww/prTCE5Z7enMUk7Q="; serverSource = if stdenv.hostPlatform.isx86_64 then diff --git a/pkgs/by-name/ts/tsid/package.nix b/pkgs/by-name/ts/tsid/package.nix index bab941e3b92e..ec43fc9c74f2 100644 --- a/pkgs/by-name/ts/tsid/package.nix +++ b/pkgs/by-name/ts/tsid/package.nix @@ -49,6 +49,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + __structuredAttrs = true; + strictDeps = true; + meta = { description = "Efficient Task Space Inverse Dynamics (TSID) based on Pinocchio"; homepage = "https://github.com/stack-of-tasks/tsid"; diff --git a/pkgs/by-name/un/unpoller/package.nix b/pkgs/by-name/un/unpoller/package.nix index c4a0e4387fba..904d1e14eb7d 100644 --- a/pkgs/by-name/un/unpoller/package.nix +++ b/pkgs/by-name/un/unpoller/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "unpoller"; - version = "3.3.1"; + version = "3.3.3"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${finalAttrs.version}"; - hash = "sha256-MivEuI/XjRDlX+VjSAMLjRl0WlRVnhP18qVujbvwjeQ="; + hash = "sha256-VWu2n5J7ZLC2PzHXFDum0HFAwq5MDczT0dzUxRBSN5A="; }; - vendorHash = "sha256-3DBUrKTvwRqaNuYtBlP5DlF1SNmU+ZNeH7ATVQjgLsA="; + vendorHash = "sha256-QBvdR7pLKqeiZLIIxgTbAkyGLLR0nrK/NU9wSmyU5zU="; ldflags = [ "-w" diff --git a/pkgs/by-name/up/upscaler/package.nix b/pkgs/by-name/up/upscaler/package.nix index 942f1a38457a..8f65eae2488c 100644 --- a/pkgs/by-name/up/upscaler/package.nix +++ b/pkgs/by-name/up/upscaler/package.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "upscaler"; - version = "1.6.3"; + version = "1.6.4"; pyproject = false; # meson instead of pyproject @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "World"; repo = "Upscaler"; rev = finalAttrs.version; - hash = "sha256-h+m5YOnsWFmQH0FxYrGbUzGMr38HhnkHegJl4daRXAs="; + hash = "sha256-yhGRKPqkuM2iCnA90bXaEaB+RZGAw15fNSm208zQrGE="; }; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/vf/vfkit/package.nix b/pkgs/by-name/vf/vfkit/package.nix index dbe208e8b563..0acbe47ce0cf 100644 --- a/pkgs/by-name/vf/vfkit/package.nix +++ b/pkgs/by-name/vf/vfkit/package.nix @@ -5,7 +5,6 @@ darwin, fetchFromGitHub, fetchpatch2, - llvmPackages, nix-update-script, testers, vfkit, @@ -34,17 +33,12 @@ buildGoModule rec { nativeBuildInputs = [ darwin.sigtool - # TODO: Remove this when NixOS/nixpkgs#536365 reaches master. - llvmPackages.lld ]; buildInputs = [ apple-sdk_15 ]; - # TODO: Remove this when NixOS/nixpkgs#536365 reaches master. - env.NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' llvmPackages.lld "ld64.lld"}"; - postFixup = '' codesign --entitlements vf.entitlements -f -s - $out/bin/vfkit ''; diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 484d203349d1..2d2a2eb8acbd 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.146.0"; + version = "1.148.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-EWRVbUeugyLsExP3NyPVLd7v2kwbRg5OjFg2WAY1FuM="; + hash = "sha256-ehkiL+HqrUc5w4WsmasobscMQgQanEZexpNDjZQ7mo4="; }; vendorHash = null; @@ -60,7 +60,6 @@ buildGoModule (finalAttrs: { # Increase timeouts in tests to prevent failure on heavily loaded builders substituteInPlace lib/storage/storage_test.go \ --replace-fail "time.After(10 " "time.After(120 " \ - --replace-fail "time.NewTimer(30 " "time.NewTimer(120 " \ --replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" ''; @@ -79,7 +78,13 @@ buildGoModule (finalAttrs: { passthru = { tests = lib.recurseIntoAttrs nixosTests.victoriametrics; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + # avoid pmm and -cluster releases + "--version-regex" + "v([0-9\\.]+)" + ]; + }; }; meta = { diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index 5d0aa4dcef05..6f13470d5cdb 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -14,12 +14,12 @@ }: let - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "go-vikunja"; repo = "vikunja"; rev = "v${version}"; - hash = "sha256-bdHiSFaN0vNQMhy6GPlpoFeYrk2CLvO7E30d8J/9GC0="; + hash = "sha256-0yAFrq+qzLZLXPblWY2lkoJ2idzENR3YqdFNiDqep6U="; }; frontend = stdenv.mkDerivation (finalAttrs: { @@ -37,7 +37,7 @@ let ; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-cDGeIrCxZtcomu3YxikutjXpVe3EeUZ/L3+3y9yx67s="; + hash = "sha256-MnkwuEaBEY81LXInDao2Fi+FvKFyvsVS/QeXdS4FhPQ="; }; nativeBuildInputs = [ @@ -102,7 +102,7 @@ buildGoModule { mage ]; - vendorHash = "sha256-4UMnfbwL2JFnw9KZDO5sq6XCSBUD5ejeqp6vaTbYWJc="; + vendorHash = "sha256-4JOwr6QCWglxXbRkcko2nsAxEhVbHDO1S2vI91NFM/8="; inherit frontend; diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix index c8828798bbbb..ec8b5d38fb15 100644 --- a/pkgs/by-name/vi/vintagestory/package.nix +++ b/pkgs/by-name/vi/vintagestory/package.nix @@ -27,11 +27,11 @@ assert waylandSupport -> libxkbcommon != null; stdenv.mkDerivation (finalAttrs: { pname = "vintagestory"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz"; - hash = "sha256-sa4Pj1DwT6W6LJCAYznmbyqPtMUTaLSNTkXS1imQp04="; + hash = "sha256-6efnjDUXMweOzN1mnkwVyQzQjs1QlFHBss1qb62Z2o0="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/wa/wasm-tools/package.nix b/pkgs/by-name/wa/wasm-tools/package.nix index 058c02225957..481342d49c05 100644 --- a/pkgs/by-name/wa/wasm-tools/package.nix +++ b/pkgs/by-name/wa/wasm-tools/package.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wasm-tools"; - version = "1.253.0"; + version = "1.254.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasm-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-z17Y6bqsAkZ25Rkbtx7g0x2R9+tllYrpumLkgL13gjI="; + hash = "sha256-Zy+cJdbsRmwRyy9y/nfpi3kWmklKOrgrw78DwQ/s+fs="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-mBp9QbjEpwT3v0Bmvur+HTUOncSNYkqmfoyORzEqR+k="; + cargoHash = "sha256-RgAew00flGTwt1FvfWsmPgg/MK4CMFVG2h5dmDgCZMo="; cargoBuildFlags = [ "--package" "wasm-tools" diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix index 20a9c8e2da3e..b7b11b349f56 100644 --- a/pkgs/by-name/wa/wasmtime/package.nix +++ b/pkgs/by-name/wa/wasmtime/package.nix @@ -20,9 +20,9 @@ let cargoHash = "sha256-EhuGBZchVyB9G5eRt/8QKN6grcP5AjFJMyGFdkfvT7g="; }; main = { - version = "46.0.1"; - hash = "sha256-rPIO+wQSu5KWT/v3Wbjs29p5Aoqpnpb+TwSTT5CRb6U="; - cargoHash = "sha256-cJD5iq342giBP+YdTem0/nOsMhI7DKRL4iiai5xayv8="; + version = "47.0.1"; + hash = "sha256-/4ZOL5s4L3NyoTYTkMYXmRXT9Suy81E+dGuInyMlOdM="; + cargoHash = "sha256-ETPn0tZZDkQSqjg0QavR9yCbqjMPEbvwZb8GIl2VgGQ="; }; }; source = sources.${variant}; diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix index 5f3f92f8b935..4ae49f9f2976 100644 --- a/pkgs/by-name/wa/wavelog/package.nix +++ b/pkgs/by-name/wa/wavelog/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wavelog"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "wavelog"; repo = "wavelog"; tag = finalAttrs.version; - hash = "sha256-RWARyBoRNHK9jd0T5u/QbL9w5TTzVeCcD4Elg/uWQNg="; + hash = "sha256-8DjRJ9QJ2M4lfw6coveXR/aayNeLY9fICVP2uBixcBc="; }; installPhase = '' diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix index 276cb28987a7..6a3f474210b5 100644 --- a/pkgs/by-name/we/weaviate/package.nix +++ b/pkgs/by-name/we/weaviate/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "weaviate"; - version = "1.38.3"; + version = "1.38.5"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${finalAttrs.version}"; - hash = "sha256-S37l12pMPrMjHRJ8n9/1vT2lZ5Ma6riX8Q7MGAhioGk="; + hash = "sha256-jv0/zya98kncWAZL/EYgN0oXu7R9gC+jmu0pkQhyhyo="; }; vendorHash = "sha256-MxCR1Owy0tOYU2GGHbxI9STfT5ZitsZGbI0ttYuFeAQ="; diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index 68f845908833..6acb49966255 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "webdav"; - version = "5.13.0"; + version = "5.14.0"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; tag = "v${finalAttrs.version}"; - hash = "sha256-BzdXc5CvQ/PUUjtVptBZC6UJsyn4MvqsdJuAEDomT6M="; + hash = "sha256-WoXXLJ2r8YtS91iGJ5XE2wn/TJjkA6kj29INGlplJSA="; }; - vendorHash = "sha256-qk97AB2UEEnVNM1Z7FBdAAWjto9xPjnCXCaO8R0dOh8="; + vendorHash = "sha256-BiEofFnuAcuXQv16RN/lx9+SDUzss++jAmf2ifLJg34="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix index 34ffe80868f8..098ba203cc0e 100644 --- a/pkgs/by-name/wi/winbox4/package.nix +++ b/pkgs/by-name/wi/winbox4/package.nix @@ -5,7 +5,7 @@ }: let pname = "winbox"; - version = "4.2"; + version = "4.3"; metaCommon = { description = "Graphical configuration utility for RouterOS-based devices"; @@ -23,13 +23,13 @@ let x86_64-zip = callPackage ./build-from-zip.nix { inherit pname version metaCommon; - hash = "sha256-htyVwuCsCRwvAwsdnbz+Z3E9Tk6kH8U0faGDo9CvyVo="; + hash = "sha256-VzYArCTfOKegbqQxixJ1QkfuxLVMbJCwpXEA1nZ4ekw="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-rEBdkLh9+7gzdlQ4uI/SdCAWwWnG2tBQPWTdGcETfsI="; + hash = "sha256-VoHQPjITOFiz3FQceMG644yzNVtf2YMmrHJeC9i6tXA="; }; in (if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: { diff --git a/pkgs/by-name/xf/xfstests/package.nix b/pkgs/by-name/xf/xfstests/package.nix index 6e18aa424a10..7bb4b239f07b 100644 --- a/pkgs/by-name/xf/xfstests/package.nix +++ b/pkgs/by-name/xf/xfstests/package.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "xfstests"; - version = "2026.05.17"; + version = "2026.06.21"; src = fetchzip { url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/snapshot/xfstests-dev-v${finalAttrs.version}.tar.gz"; - hash = "sha256-vfK4PcPdd1121lcjhjP63RyS6YdFfgZ6Nsauv02b1S8="; + hash = "sha256-hngS9Hnsz9XKQ42yh6mcXHiTOzL+Zk9hRpai7e2tU0E="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/by-name/xz/xz/package.nix similarity index 98% rename from pkgs/tools/compression/xz/default.nix rename to pkgs/by-name/xz/xz/package.nix index d57a98eb4e20..371962669c56 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/by-name/xz/xz/package.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: { create 30 % smaller output than gzip and 15 % smaller output than bzip2. ''; + maintainers = with lib.maintainers; [ andrewzah ]; license = with lib.licenses; [ gpl2Plus lgpl21Plus diff --git a/pkgs/by-name/ya/yad/gettext-0.25.patch b/pkgs/by-name/ya/yad/gettext-0.25.patch deleted file mode 100644 index 02f551459ef9..000000000000 --- a/pkgs/by-name/ya/yad/gettext-0.25.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 20a4e42..921ba18 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8,9 +8,13 @@ AC_PREREQ([2.59]) - - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_SRCDIR([src]) -+AC_CONFIG_MACRO_DIRS([m4]) - - AM_MAINTAINER_MODE - -+AM_GNU_GETTEXT_VERSION([0.25]) -+AM_GNU_GETTEXT([external]) -+ - IT_PROG_INTLTOOL([0.40.0]) - - AC_PROG_CC diff --git a/pkgs/by-name/ya/yad/package.nix b/pkgs/by-name/ya/yad/package.nix index 1eb72440e0b2..39fff868cf82 100644 --- a/pkgs/by-name/ya/yad/package.nix +++ b/pkgs/by-name/ya/yad/package.nix @@ -3,44 +3,53 @@ stdenv, fetchFromGitHub, pkg-config, - intltool, autoreconfHook, wrapGAppsHook3, + gettext, + gspell, gtk3, - hicolor-icon-theme, + gtksourceview, + libappindicator-gtk3, netpbm, + webkitgtk_4_1, }: stdenv.mkDerivation (finalAttrs: { pname = "yad"; - version = "14.1"; + version = "15.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-Y7bp20fkNdSgBcSV1kPEpWEP7ASwZcScVRaPauwI72M="; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-z+t4eG8yXhfs4GfLFDaaOCAxrr5MIoFD6BKF8vr59IY="; }; - # FIXME: remove when gettext is fixed - patches = [ ./gettext-0.25.patch ]; - configureFlags = [ - "--enable-icon-browser" - "--with-gtk=gtk3" "--with-rgb=${placeholder "out"}/share/yad/rgb.txt" + "--enable-html" + "--enable-tray" + "--enable-appindicator" + "--enable-spell" + "--enable-sourceview" + "--enable-deprecated" + "--enable-tools" + "--enable-icon-browser" ]; buildInputs = [ + gspell gtk3 - hicolor-icon-theme + gtksourceview + libappindicator-gtk3 + webkitgtk_4_1 ]; nativeBuildInputs = [ autoreconfHook pkg-config - intltool wrapGAppsHook3 + gettext ]; postPatch = '' @@ -51,10 +60,6 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 ${netpbm.out}/share/netpbm/misc/rgb.txt $out/share/yad/rgb.txt ''; - postAutoreconf = '' - intltoolize - ''; - meta = { homepage = "https://github.com/v1cont/yad"; description = "GUI dialog tool for shell scripts"; @@ -66,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3; mainProgram = "yad"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ RoGreat ]; platforms = with lib.platforms; linux; }; }) diff --git a/pkgs/by-name/ya/yascreen/package.nix b/pkgs/by-name/ya/yascreen/package.nix index 67483c4b6f1a..5fd3b9af187f 100644 --- a/pkgs/by-name/ya/yascreen/package.nix +++ b/pkgs/by-name/ya/yascreen/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yascreen"; - version = "2.11"; + version = "2.13"; src = fetchFromGitHub { owner = "bbonev"; repo = "yascreen"; tag = "v${finalAttrs.version}"; - hash = "sha256-SkJPq1xeC2XU8zP9uPdXECotgvG4siKvvHfi7z0APio="; + hash = "sha256-641H0uR2rR9vVe7WF2bSzFs+6HXlPHWgD0jKH9MofqU="; }; nativeBuildInputs = [ go-md2man ]; diff --git a/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix b/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix index 3b4a38a4b0a8..7480109f824c 100644 --- a/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/clipboard/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "clipboard.yazi"; - version = "0-unstable-2026-07-14"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "XYenon"; repo = "clipboard.yazi"; - rev = "4533c7f1b16196ad32749e35344bdc82a624871b"; - hash = "sha256-lThDO1b9iq+N6x/F9fKEWlNPpgJBTfxpY2xjyZF22mM="; + rev = "d4d19ea45836f279c0b99e1d234fe5ce4a154e4b"; + hash = "sha256-fawprH1+WysMcERWdCtgWulSHo4Pmu3eLLHbnKwvkIM="; }; meta = { diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix index 39f845789fcd..7f073a745712 100644 --- a/pkgs/by-name/za/zapret/package.nix +++ b/pkgs/by-name/za/zapret/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zapret"; - version = "72.12"; + version = "72.13"; src = fetchFromGitHub { owner = "bol-van"; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ''; tag = "v${finalAttrs.version}"; - hash = "sha256-UWkLi/wWihtdLyk77cQ90xZ31vho1PjPfFQ6bQWrIUs="; + hash = "sha256-jwhGhxqIhJfkmjT3Zzsy4injQWqSVRet8fZr9VA04sQ="; }; buildInputs = [ diff --git a/pkgs/by-name/za/zapret2/package.nix b/pkgs/by-name/za/zapret2/package.nix index 722346667f8e..312ffb992f0f 100644 --- a/pkgs/by-name/za/zapret2/package.nix +++ b/pkgs/by-name/za/zapret2/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "zapret2"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "bol-van"; repo = "zapret2"; tag = "v${finalAttrs.version}"; - hash = "sha256-pcAIvB/MfFJZFl5kPZjRZZOXgamfQm8hD4UGYC3jbro="; + hash = "sha256-yX/xdTq8Vk6ToQ17Zbl+2yU7+WIX5y6ksWxHfBd8ky0="; leaveDotGit = true; postFetch = '' cd "$out" diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix index 0ae9f8dce25b..7a6d8ff0fead 100644 --- a/pkgs/by-name/za/zapzap/package.nix +++ b/pkgs/by-name/za/zapzap/package.nix @@ -1,22 +1,31 @@ { lib, fetchFromGitHub, + fetchpatch, python3Packages, qt6, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "zapzap"; - version = "6.5.2.5"; + version = "7.0"; pyproject = true; src = fetchFromGitHub { owner = "rafatosta"; repo = "zapzap"; tag = finalAttrs.version; - hash = "sha256-VybcZNB0k1DwAmluQpEMuM7cHKI8sGyG284g9E3YcP8="; + hash = "sha256-0LrIx7k9b0+zsmezjF6CmJo4nqU7GPW1HHWAUVVnbzk="; }; + patches = [ + # Support setting dict lookup path. Remove with next release. + (fetchpatch { + url = "https://github.com/rafatosta/zapzap/commit/3517079e8fbd3853fe184c393137709de68f020e.patch"; + hash = "sha256-Eqy483+mJHLHsS21B8LnJ9oIqwTRCMVKhHBO8hleBh4="; + }) + ]; + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/ze/zenroom/package.nix b/pkgs/by-name/ze/zenroom/package.nix index d9e43ef9d6c8..ad212d45432a 100644 --- a/pkgs/by-name/ze/zenroom/package.nix +++ b/pkgs/by-name/ze/zenroom/package.nix @@ -14,16 +14,24 @@ # tests callPackage, + jq, + meson, + ninja, }: +let + inherit (stdenv.hostPlatform) + isDarwin + isLinux + isMusl + isUnix + ; +in + stdenv.mkDerivation (finalAttrs: { pname = "zenroom"; version = "5.37.2"; - __structuredAttrs = true; - dontUseCmakeConfigure = true; # cmake is a dependency, but we use make to build - strictDeps = true; - src = fetchFromGitHub { owner = "dyne"; repo = "Zenroom"; @@ -38,9 +46,22 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = '' - patchShebangs build/embed-lualibs + patchShebangs build/{embed-lualibs,meson_version.sh} + patchShebangs test/ ''; + __structuredAttrs = true; + strictDeps = true; + + # cmake is required to build dependencies, not the main package + dontUseCmakeConfigure = true; + + # manually invoken while testing + dontUseMesonConfigure = true; + dontUseNinjaBuild = true; + dontUseNinjaCheck = true; + dontUseNinjaInstall = true; + nativeBuildInputs = [ cmake which # ar @@ -51,23 +72,27 @@ stdenv.mkDerivation (finalAttrs: { readline ]; - buildFlags = - with stdenv.hostPlatform; - lib.optionals (isLinux && !isMusl) [ - "linux-lib" - "linux-exe" - ] - ++ lib.optionals (isLinux && isMusl) [ - "musl" - ] - ++ lib.optionals isDarwin [ - "osx-lib" - "osx-exe" - ] - ++ lib.optionals (isUnix && !isLinux && !isDarwin) [ - "posix-lib" - "posix-exe" - ]; + buildFlags = [ + "VERSION=${finalAttrs.version}" + "COMMIT=0000000" + "BRANCH=master" + "CURRENT_YEAR=1970" # unix epoch + ] + ++ lib.optionals (isLinux && !isMusl) [ + "linux-lib" + "linux-exe" + ] + ++ lib.optionals (isLinux && isMusl) [ + "musl" + ] + ++ lib.optionals isDarwin [ + "osx-lib" + "osx-exe" + ] + ++ lib.optionals (isUnix && !isLinux && !isDarwin) [ + "posix-lib" + "posix-exe" + ]; hardeningDisable = [ "format" ]; # -Werror=format-security @@ -82,11 +107,30 @@ stdenv.mkDerivation (finalAttrs: { install -D libzenroom${stdenv.hostPlatform.extensions.sharedLibrary} -t $out/lib ''; + nativeCheckInputs = [ + jq + meson + ninja + ]; + + doCheck = true; + checkTarget = "check" + lib.optionalString isDarwin "-osx"; + + preCheck = + lib.optionalString isDarwin # sh + '' + # on darwin, we're using GNU base64 + substituteInPlace test/zencode/cookbook_{hash_pdf,ecdh_encrypt_json}.bats \ + --replace-fail \ + 'cmd_base64="base64 -b 0"' \ + 'cmd_base64="base64 -w 0"' + ''; + passthru.updateScript = nix-update-script { }; passthru.tests = callPackage ./tests { zenroom = finalAttrs.finalPackage; }; meta = { - description = "no-code cryptographic virtual machine"; + description = "No-code cryptographic virtual machine"; longDescription = '' Zenroom is a tiny, portable, and fully isolated crypto VM for building privacy-preserving applications, smart contracts, and secure data diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index 668d20d678fc..0c4a670ffc9f 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zizmor"; - version = "1.26.1"; + version = "1.27.0"; src = fetchFromGitHub { owner = "zizmorcore"; repo = "zizmor"; tag = "v${finalAttrs.version}"; - hash = "sha256-AL4y9lB60zvWhr5U6vzVyg0DhxFCaKkP8+6DWdg2vYA="; + hash = "sha256-wiVAZ26JJB3C9WYiM5OfK83oT1HDr1jlfvcpELFHy0E="; }; - cargoHash = "sha256-PGU9R6EKT+9ZdgxBgQqlvvmyEtDRG6zT2EdQPzlPIM0="; + cargoHash = "sha256-Cbu0ur4WUURgrgITe5UCz5qTHR3F6PjxEqbm1t+lpBA="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 5633f22e76f2..61080c03f37e 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "11.21.1"; + version = "11.22.0"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-TBSc1dMOjZhJFffVm0SHbwDzDQFhXVjpeQ6qkYV14ew="; + hash = "sha256-r0ODtq+EiOpHWTm3vTW2FI5Xp8yqXK1Ekfh3hP6ns2Q="; }; - npmDepsHash = "sha256-AS4/eOZG2nXErCacXR4FerUkqpt4BNwUjohuLMsauks="; + npmDepsHash = "sha256-yzWx39qU/RH5XdY89nz/vZcq9exyAmVQnB5FU4pke48="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 3dfa427a2f7a..8359575a4e32 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -20,6 +20,7 @@ mkCoqDerivation { release."1.4.0".hash = "sha256-8TtNPEbp3uLAH+MjOKiTZHOjPb3vVYlabuqsdWxbg80="; release."1.4.1".hash = "sha256-0UASpo9CdpvidRv33BDWrevo+NSOhxLQFPCJAWPXf+s="; release."1.4.2".hash = "sha256-d5J8j8gi6siwCLevM6y8Hf2rTB/HEfh72LLk0Qlzr0c="; + release."1.4.3".hash = "sha256-9GWz7YsgPKoDkUok6nfHHT2GGLaB2oojYizKlt8BZAg="; inherit version; defaultVersion = @@ -36,8 +37,9 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp.version ] [ - (case (isGe "8.20") (isGe "2.4") "1.4.2") - (case (isGe "8.16") (isGe "2.0") "1.4.1") + (case (isGe "8.20") (isGe "2.5") "1.4.3") + (case (isGe "8.20") (range "2.4" "2.5") "1.4.2") + (case (isGe "8.16") (range "2.0" "2.4") "1.4.1") (case (isGe "8.16") "2.0.0" "1.3.0") (case (isGe "8.11") (range "1.12" "1.19") "1.2.5") (case (isGe "8.11") (range "1.11" "1.14") "1.2.4") diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index 3252dddbbac3..abf16a0336f7 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -18,6 +18,7 @@ mkCoqDerivation { release."1.17".hash = "sha256-2VzdopXgKS/wC5Rd1/Zlr12J5bSIGINFjG1nrMjDrGE="; release."2.2".hash = "sha256-y8LlQg9d9rfPFjzS9Xu3BW/H3tPiOC+Eb/zwXJGW9d4="; release."2.3".hash = "sha256-inWJok0F3SZpVfoyMfpRXHVHn4z2aY8JjCKKhdVTnoc="; + release."2.4".hash = "sha256-7hq2K9KMkWug2zyvB2mcy1pnpTJKg8l8vtBtUt6NcXo="; releaseRev = (v: "v${v}"); inherit version; @@ -35,6 +36,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp.version ] [ + (case (range "8.16" "9.2") (range "2.0" "2.6") "2.4") (case (range "8.16" "9.1") (range "2.0" "2.5") "2.3") (case (range "8.16" "9.0") (range "2.0" "2.3") "2.2") (case (range "8.10" "8.18") (range "1.12.0" "1.18.0") "1.17") diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index ec3162fbd29b..d86510376a25 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -31,6 +31,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-ssreflect.version ] [ + (case (range "8.16" "9.2") (range "2.0.0" "2.6.0") "1.0.5") (case (range "8.16" "9.1") (range "2.0.0" "2.5.0") "1.0.4") (case (range "8.16" "9.1") (range "2.0.0" "2.4.0") "1.0.3") (case (range "8.16" "9.0") (range "2.0.0" "2.3.0") "1.0.2") @@ -38,6 +39,7 @@ mkCoqDerivation { (case (range "8.10" "8.16") (range "1.12.0" "1.17.0") "1.0.0") ] null; + release."1.0.5".hash = "sha256-Ti9gwd9rV+a0MJCAOjrpuZH+F9JI1l6dNAQYmIdGreU="; release."1.0.4".hash = "sha256-fvE53jJe7/kQUI+lhO6lKdWfsFfRjOk2YGOcHUoJ6BU="; release."1.0.3".hash = "sha256-5lpOCDyH6NFzGLvnXHHAnR7Qv5oXsUyC8TLBFrIiBag="; release."1.0.2".hash = "sha256-U20xgA+e9KTRdvILD1cxN6ia+dlA8uBTIbc4QlKz9ss="; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index 8642a58a073c..06b9ec660bea 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -33,8 +33,8 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - (case (range "8.18" "9.1") (isGe "2.3.0") "1.6.0+2.3+8.18") - (case (range "8.16" "9.1") (isGe "2.0.0") "1.5.0+2.0+8.16") + (case (range "8.18" "9.1") (range "2.3.0" "2.5.0") "1.6.0+2.3+8.18") + (case (range "8.16" "9.1") (range "2.0.0" "2.5.0") "1.5.0+2.0+8.16") (case (range "8.13" "8.20") (range "1.12" "1.19.0") "1.3.0+1.12+8.13") (case (range "8.13" "8.16") (range "1.12" "1.17.0") "1.1.0+1.12+8.13") ] diff --git a/pkgs/development/coq-modules/odd-order/default.nix b/pkgs/development/coq-modules/odd-order/default.nix index dab19c066d4b..e69d05d2db6a 100644 --- a/pkgs/development/coq-modules/odd-order/default.nix +++ b/pkgs/development/coq-modules/odd-order/default.nix @@ -10,6 +10,7 @@ mkCoqDerivation { pname = "odd-order"; owner = "math-comp"; + release."2.4.0".hash = "sha256-8U3xFKe/gBSapwNRix3i2+jbyTja5xXGnQwtiTiF+9w="; release."2.3.0".hash = "sha256-53FG8I9O+tsIlmaa9qy6VYyJNwWfGmhavKhbZ0VqAGc="; release."2.2.0".hash = "sha256-z0C7+wtY8NpoT8wYqHiy8mB2HPYAeJndzDmf7Bb0mg8="; release."2.1.0".hash = "sha256-TPlaQbO0yXEpUgy3rlCx/w1MSLECJk5tdU26fAGe48Q="; @@ -33,6 +34,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-character.version ] [ + (case (range "9.1" "9.2") (range "2.5" "2.6") "2.4.0") (case (range "9.0" "9.1") (range "2.5" "2.5") "2.3.0") (case (range "8.16" "9.1") (range "2.2.0" "2.4.0") "2.2.0") (case (range "8.16" "9.0") (range "2.1.0" "2.3.0") "2.1.0") diff --git a/pkgs/development/coq-modules/wasmcert/default.nix b/pkgs/development/coq-modules/wasmcert/default.nix index 5d0c09374f99..454f6a63bd39 100644 --- a/pkgs/development/coq-modules/wasmcert/default.nix +++ b/pkgs/development/coq-modules/wasmcert/default.nix @@ -30,7 +30,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-boot.version ] [ - (case (lib.versions.range "8.20" "9.1") (lib.versions.isGe "2.4") "2.2.0") + (case (lib.versions.range "8.20" "9.1") (lib.versions.range "2.4" "2.5") "2.2.0") ] null; diff --git a/pkgs/development/libraries/astal/buildAstalModule.nix b/pkgs/development/libraries/astal/buildAstalModule.nix index 5d81786729bc..8f69f476d8ad 100644 --- a/pkgs/development/libraries/astal/buildAstalModule.nix +++ b/pkgs/development/libraries/astal/buildAstalModule.nix @@ -65,7 +65,6 @@ let meta = { homepage = "https://aylur.github.io/astal/guide/libraries/${website-path}"; license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ PerchunPak ]; platforms = [ "aarch64-linux" "x86_64-linux" diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix index f1f35969bd49..77f440b8bb2a 100644 --- a/pkgs/development/libraries/astal/source.nix +++ b/pkgs/development/libraries/astal/source.nix @@ -7,15 +7,15 @@ let originalDrv = fetchFromGitHub { owner = "Aylur"; repo = "astal"; - rev = "04454c22094401cc8e682cfe1f8ecc3194cac5f9"; - hash = "sha256-bXd034/ARs18ZQ7hWUAw9NwyfBmcKQws8DQHzwYp6jM="; + rev = "fd94e333c8bd45557291c805f1df79d5f787d590"; + hash = "sha256-flVUft590tsDX9z97O4DzVFg6zvOOmGeYhPeDdaP1DI="; }; in originalDrv.overrideAttrs ( final: prev: { name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name pname = "astal-source"; - version = "0-unstable-2026-07-03"; + version = "0-unstable-2026-07-19"; meta = prev.meta // { description = "Building blocks for creating custom desktop shells (source)"; diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index 4a77e4a43e8d..01beb2532886 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -13,9 +13,12 @@ lld, nasm, cmake, + libGL, gstreamer, gst-plugins-base, + gst-plugins-good, gst-plugins-bad, + gst-plugins-ugly, gtk4, cairo, csound, @@ -24,7 +27,11 @@ libwebp, openssl, pango, - gst-plugins-good, + + jq, + writeTextFile, + validatePkgConfig, + testers, nix-update-script, # specifies a limited subset of plugins to build (the default `null` means all plugins supported on the stdenv platform) plugins ? null, @@ -36,33 +43,33 @@ }: let - # populated from meson_options.txt (manually for now, but that might change in the future) + # checked against upstream meson_options.txt in postConfigure + # ordered according plugin list in README.md for readability + # validate plugin is excluded here and in the verification script below validPlugins = { - # audio - audiofx = [ ]; - claxon = [ ]; - csound = [ csound ]; - lewton = [ ]; - spotify = [ ]; - # generic file = [ ]; + gopbuffer = [ ]; + inter = [ ]; + originalbuffer = [ ]; + streamgrouper = [ ]; sodium = [ libsodium ]; threadshare = [ ]; - # mux - flavors = [ ]; - fmp4 = [ ]; - mp4 = [ ]; - # net aws = [ openssl ]; + deepgram = [ ]; + hlsmultivariantsink = [ ]; hlssink3 = [ ]; + icecast = [ ]; + mpegtslive = [ ]; ndi = [ ]; onvif = [ pango ]; + quinn = [ ]; raptorq = [ ]; reqwest = [ openssl ]; rtp = [ ]; + rtsp = [ ]; webrtc = [ gst-plugins-bad openssl @@ -72,18 +79,17 @@ let openssl ]; - # text - textahead = [ ]; - json = [ ]; - regex = [ ]; - textwrap = [ ]; - - # utils - fallbackswitch = [ gtk4 ]; - livesync = [ gtk4 ]; - togglerecord = [ gtk4 ]; - tracers = [ ]; - uriplaylistbin = [ ]; + # audio + audiofx = [ ]; + audioparsers = [ ]; + claxon = [ ]; + csound = [ csound ]; + demucs = [ ]; + elevenlabs = [ ]; + lewton = [ ]; + speechmatics = [ ]; + spotify = [ ]; + whisper = [ ]; # video cdg = [ ]; @@ -95,8 +101,34 @@ let hsv = [ ]; png = [ ]; rav1e = [ ]; + skia = [ ]; videofx = [ cairo ]; + # would require libvvdec + vvdec = [ ]; webp = [ libwebp ]; + + # mux + flavors = [ ]; + isobmff = [ ]; + + # text + textaccumulate = [ ]; + textahead = [ ]; + json = [ ]; + regex = [ ]; + textwrap = [ ]; + + # utils + fallbackswitch = [ gtk4 ]; + livesync = [ gtk4 ]; + togglerecord = [ gtk4 ]; + tracers = [ ]; + uriplaylistbin = [ ]; + debugseimetainserter = [ ]; + + # analytics + analytics = [ gst-plugins-bad ]; + burn = [ ]; }; selectedPlugins = @@ -105,8 +137,16 @@ let else lib.subtractLists ( [ - "csound" # tests have weird failure on x86, does not currently work on arm or darwin - "livesync" # tests have suspicious intermittent failure, see https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/357 + # tests have weird failure on x86, does not currently work on arm or darwin + # csound rust package currently incompatible with csound >= 7.x + "csound" + + # test failures + "isobmff" + "webrtc" + + "vvdec" # libvvdec not currently packaged + "skia" # skia-bindings requires configuration to link against system libraries ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "raptorq" # pointer alignment failure in tests on aarch64 @@ -126,7 +166,43 @@ let ] ) (lib.attrNames validPlugins); + rsPrefixedPlugins = [ + "analytics" + "audiofx" + "audioparsers" + "closedcaption" + "file" + "inter" + "onvif" + "png" + "rtp" + "rtsp" + "tracers" + "videofx" + "webp" + "webrtc" + ]; + + pkgConfigName = + name: + if name == "flavors" then + "gstrsflv" + else + (if lib.elem name rsPrefixedPlugins then "gstrs${name}" else "gst${name}"); + pkgConfigNames = map pkgConfigName selectedPlugins; + invalidPlugins = lib.subtractLists (lib.attrNames validPlugins) selectedPlugins; + + validPluginFile = writeTextFile { + name = "known-plugin-names.txt"; + text = lib.concatLines (lib.attrNames validPlugins); + }; + + # aws-lc-rs has no pregenerated bindings for exotic platforms + # https://aws.github.io/aws-lc-rs/platform_support.html + # whisper requires bindgen + requiresBindgen = + !(stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) || lib.elem "whisper" selectedPlugins; in assert lib.assertMsg (invalidPlugins == [ ]) "Invalid gst-plugins-rs plugin${ @@ -135,7 +211,7 @@ assert lib.assertMsg (invalidPlugins == [ ]) stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-rs"; - version = "0.14.4"; + version = "0.15.3"; outputs = [ "out" @@ -147,15 +223,32 @@ stdenv.mkDerivation (finalAttrs: { owner = "gstreamer"; repo = "gst-plugins-rs"; rev = finalAttrs.version; - hash = "sha256-MZyYHMq6gFJkVxlrmeXUjOmRYsQBHj0848cnF+7mtbU="; + hash = "sha256-DO5Dk9xjqWTI4ORzlHYPc/O/tyHfSyh7+YCzES5ZiHs="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "gst-plugins-rs-${finalAttrs.version}"; - hash = "sha256-T+fdu+Oe07Uf1YoRGYl2DMb1QgdSZVLwcOqH4bBNGXU="; + hash = "sha256-EHikshVeaBzyx9+GBIkOPii63T12BobWdW6nTBLzwU8="; }; + postConfigure = '' + meson introspect . --buildoptions | \ + ${lib.getExe jq} -r 'map(select(.description | test("Build .+ plugin")) | .name | select(. != "validate")) | sort | .[]' \ + > valid-plugin-names.txt + echo "checking for consistency between validPlugins and meson_options.txt" + diff -u ${validPluginFile} valid-plugin-names.txt + ''; + + patches = [ + ./doctest-fixes.patch + ]; + + postPatch = '' + patchShebangs cargo_wrapper.py dependencies.py + ''; + + __structuredAttrs = true; strictDeps = true; nativeBuildInputs = [ @@ -169,10 +262,9 @@ stdenv.mkDerivation (finalAttrs: { cargo cargo-c nasm + validatePkgConfig ] - # aws-lc-rs has no pregenerated bindings for exotic platforms - # https://aws.github.io/aws-lc-rs/platform_support.html - ++ lib.optionals (!(stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64)) [ + ++ lib.optionals requiresBindgen [ cmake rustPlatform.bindgenHook ] @@ -188,6 +280,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gstreamer gst-plugins-base + libGL ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_gstreamer @@ -197,6 +290,7 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ gst-plugins-good gst-plugins-bad + gst-plugins-ugly ]; mesonFlags = (map (plugin: lib.mesonEnable plugin true) selectedPlugins) ++ [ @@ -211,24 +305,25 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; # csound lib dir must be manually specified for it to build - preConfigure = '' - export CARGO_BUILD_JOBS=$NIX_BUILD_CORES - - patchShebangs dependencies.py - '' - + lib.optionalString (lib.elem "csound" selectedPlugins) '' + preConfigure = lib.optionalString (lib.elem "csound" selectedPlugins) '' export CSOUND_LIB_DIR=${lib.getLib csound}/lib ''; mesonCheckFlags = [ "--verbose" ]; + # required for icecast tests + __darwinAllowLocalNetworking = + finalAttrs.finalPackage.doCheck && lib.elem "icecast" selectedPlugins; + preCheck = '' # Fontconfig error: No writable cache directories - export XDG_CACHE_HOME=$(mktemp -d) + export XDG_CACHE_HOME="$(mktemp -d)" + export GST_PLUGIN_PATH="$(realpath "target/${stdenv.hostPlatform.rust.cargoShortTarget}/$cargoBuildType")" + export GST_PLUGIN_SCANNER="${lib.getLib gstreamer}/libexec/gstreamer-1.0/gst-plugin-scanner" ''; postInstall = '' - install -Dm444 -t ''${!outputDev}/lib/pkgconfig gst*.pc + install -Dm444 -t ''${!outputDev}/lib/pkgconfig plugins/gst*.pc ''; doInstallCheck = @@ -240,6 +335,10 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; updateScript = nix-update-script { # use numbered releases rather than gstreamer-* releases # this matches upstream's recommendation: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/470#note_2202772 @@ -262,5 +361,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ tmarkus ]; + pkgConfigModules = pkgConfigNames; }; }) diff --git a/pkgs/development/libraries/gstreamer/rs/doctest-fixes.patch b/pkgs/development/libraries/gstreamer/rs/doctest-fixes.patch new file mode 100644 index 000000000000..5ada0c1409c5 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/rs/doctest-fixes.patch @@ -0,0 +1,98 @@ +diff --git a/audio/elevenlabs/src/synthesizer/imp.rs b/audio/elevenlabs/src/synthesizer/imp.rs +index c31cb4f4d..a55b4fbb6 100644 +--- a/audio/elevenlabs/src/synthesizer/imp.rs ++++ b/audio/elevenlabs/src/synthesizer/imp.rs +@@ -21,7 +21,7 @@ + //! + //! Example usage with srt file as input: + //! +-//! ``` ++//! ```sh + //! gst-launch-1.0 filesrc location=/home/meh/Documents/chaplin-fr-shifted.srt ! \ + //! subparse ! clocksync ! queue ! \ + //! elevenlabssynthesizer voice-id=kENkNtk0xyzG09WW40xE overflow=shift api-key=XXX ! autoaudiosink +diff --git a/audio/whisper/src/transcriber/imp.rs b/audio/whisper/src/transcriber/imp.rs +index 28e5446ce..939a66138 100644 +--- a/audio/whisper/src/transcriber/imp.rs ++++ b/audio/whisper/src/transcriber/imp.rs +@@ -34,21 +34,21 @@ + * The element re-exports the features exposed by the whisper-rs crate to select backends, this is + * an example for building the element with CUDA support enabled: + * +- * ``` ++ * ```sh + * cargo build --features=cuda + * ``` + * + * You can download models using the [whisper.cpp download script], this is an example for + * downloading the large-v3 model: + * +- * ``` ++ * ```sh + * ./download-ggml-model.sh large-v3 + * ``` + * + * Equipped with this, this is an example for running live inference with the element introducing a + * 6 seconds latency: + * +- * ``` ++ * ```sh + * gst-launch-1.0 filesrc location=/home/meh/Music/chaplin.wav ! \ + * wavparse ! audioconvert ! audioresample ! clocksync ! \ + * queue max-size-time=5000000000 max-size-buffers=0 max-size-bytes=0 ! \ +diff --git a/utils/debugseimetainserter/src/debugseimetainserter/mod.rs b/utils/debugseimetainserter/src/debugseimetainserter/mod.rs +index a1d8d83ed..e090c6afd 100644 +--- a/utils/debugseimetainserter/src/debugseimetainserter/mod.rs ++++ b/utils/debugseimetainserter/src/debugseimetainserter/mod.rs +@@ -12,7 +12,7 @@ + * Adds GstVideoSEIUserDataUnregisteredMeta to video buffers for testing SEI insertion. + * + * ## Example launch line +- * ``` ++ * ```sh + * gst-launch-1.0 videotestsrc ! x264enc ! h264parse ! \ + * debugseimetainserter uuid=12345678-1234-1234-1234-123456789abc data="test payload" ! \ + * h264seiinserter ! filesink location=output.h264 +diff --git a/utils/tracers/src/pipeline_snapshot/imp.rs b/utils/tracers/src/pipeline_snapshot/imp.rs +index 6e4d5c54e..cccfbdc82 100644 +--- a/utils/tracers/src/pipeline_snapshot/imp.rs ++++ b/utils/tracers/src/pipeline_snapshot/imp.rs +@@ -33,23 +33,23 @@ + * - `dot-prefix` (string, default: "pipeline-snapshot-"): when dumping pipelines to a `dot` file each file is named `$prefix$pipeline_name.dot`. + * - `dot-ts` (boolean, default: "true"): if the current timestamp should be added as a prefix to each pipeline `dot` file. + * - `cleanup-mode` (enum, default: "none"): Determines how .dot files are cleaned up: +- * - "initial": Removes all existing .dot files from the target folder when the tracer starts +- * - "automatic": Performs cleanup before each snapshot. If folder-mode is enabled, cleans up .dot files within folders. +- * If folder-mode is None, cleans up .dot files directly in the target directory +- * - "none": Never removes any .dot files ++ * - "initial": Removes all existing .dot files from the target folder when the tracer starts ++ * - "automatic": Performs cleanup before each snapshot. If folder-mode is enabled, cleans up .dot files within folders. ++ * if folder-mode is None, cleans up .dot files directly in the target directory ++ * - "none": Never removes any .dot files + * - `folder-mode` (enum, default: "none"): Controls how .dot files are organized in folders: +- * - "none": All .dot files are stored directly in the target directory without subfolder organization +- * - "numbered": Creates a new numbered folder (starting from 0) for each snapshot operation +- * - "timed": Creates a new folder named with the current timestamp for each snapshot operation ++ * - "none": All .dot files are stored directly in the target directory without subfolder organization ++ * - "numbered": Creates a new numbered folder (starting from 0) for each snapshot operation ++ * - "timed": Creates a new folder named with the current timestamp for each snapshot operation + * - `dots-viewer-websocket-url`: A websocket URL to connect to a dots-viewer server instance, +- * allowing the user to snapshot running pipelines from the web +-* page. To trigger a snapshot, the user should send a json message +-* with the following format: +-* ```json +-* { +-* "type": "Snapshot" +-* } +-* ``` ++ * allowing the user to snapshot running pipelines from the web ++ * page. To trigger a snapshot, the user should send a json message ++ * with the following format: ++ * ```json ++ * { ++ * "type": "Snapshot" ++ * } ++ * ``` + * + * Examples: + * diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.77.nix b/pkgs/development/libraries/libmicrohttpd/0.9.77.nix deleted file mode 100644 index 3874f77acb87..000000000000 --- a/pkgs/development/libraries/libmicrohttpd/0.9.77.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl }: - -callPackage ./generic.nix rec { - version = "0.9.77"; - - src = fetchurl { - url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz"; - hash = "sha256-nnAjoVESAGDSgGpupME8qZM+zk6s/FyUZNIO3dt2sKA="; - }; -} diff --git a/pkgs/development/libraries/qgpgme/default.nix b/pkgs/development/libraries/qgpgme/default.nix index d1f7e6ca669e..3e628fd6bb37 100644 --- a/pkgs/development/libraries/qgpgme/default.nix +++ b/pkgs/development/libraries/qgpgme/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qgpgme"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { url = "mirror://gnupg/qgpgme/qgpgme-${finalAttrs.version}.tar.xz"; - hash = "sha256-WzL+s+7kp/lALSK3IGSAkI3EO7TfOCkXwHXFEhFvjwg="; + hash = "sha256-PGKQ/1v+q5gbtIspUXA3YfHb6mQMtje+s1YNX++w4LM="; }; patches = [ diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index bc8f313b45e8..8c524b725fc9 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -375,6 +375,7 @@ final: prev: { meta = { homepage = "https://github.com/barrettruth/canola.nvim"; + maintainers = with lib.maintainers; [ saadndm ]; license = lib.licenses.mit; description = "a refined oil.nvim"; }; diff --git a/pkgs/development/ocaml-modules/cmon/default.nix b/pkgs/development/ocaml-modules/cmon/default.nix new file mode 100644 index 000000000000..3edc0bb5e226 --- /dev/null +++ b/pkgs/development/ocaml-modules/cmon/default.nix @@ -0,0 +1,30 @@ +{ + lib, + fetchurl, + buildDunePackage, + grenier, + pprint, +}: + +buildDunePackage (finalAttrs: { + pname = "cmon"; + version = "0.2"; + + src = fetchurl { + url = "https://github.com/let-def/cmon/releases/download/v${finalAttrs.version}/cmon-${finalAttrs.version}.tbz"; + hash = "sha256-lJi5NV27YqyDgUx1i4vBj/buzyzdWJSrSceGGs82grg="; + }; + + propagatedBuildInputs = [ + grenier + pprint + ]; + + doCheck = true; + + meta = { + description = "A library for printing OCaml values with sharing"; + license = lib.licenses.mit; + homepage = "https://github.com/let-def/cmon"; + }; +}) diff --git a/pkgs/development/ocaml-modules/dockerfile/default.nix b/pkgs/development/ocaml-modules/dockerfile/default.nix index c51b03746cb7..ceb9635145ae 100644 --- a/pkgs/development/ocaml-modules/dockerfile/default.nix +++ b/pkgs/development/ocaml-modules/dockerfile/default.nix @@ -10,13 +10,13 @@ buildDunePackage (finalAttrs: { pname = "dockerfile"; - version = "8.4.0"; + version = "8.4.1"; src = fetchFromGitHub { owner = "ocurrent"; repo = "ocaml-dockerfile"; tag = finalAttrs.version; - hash = "sha256-5CHKuVWOVWJ1ZO7r+lrSpHK1mm75Ek1vDR14pDXR9Dk="; + hash = "sha256-xI+kjIwaGd7K9zLyoBgN2AFmQ/rL0/C/hPwrEgHkCgs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/grenier/default.nix b/pkgs/development/ocaml-modules/grenier/default.nix new file mode 100644 index 000000000000..88f50619d7c6 --- /dev/null +++ b/pkgs/development/ocaml-modules/grenier/default.nix @@ -0,0 +1,22 @@ +{ + lib, + fetchurl, + buildDunePackage, +}: + +buildDunePackage (finalAttrs: { + pname = "grenier"; + version = "0.16"; + src = fetchurl { + url = "https://github.com/let-def/grenier/releases/download/v${finalAttrs.version}/grenier-${finalAttrs.version}.tbz"; + hash = "sha256-j9Iqv59FicIGAIZU+p7rsc9KWHN+uzQTjGcJUg82t18="; + }; + + doCheck = true; + + meta = { + description = "A collection of various algorithms in OCaml"; + license = lib.licenses.isc; + homepage = "https://github.com/let-def/grenier"; + }; +}) diff --git a/pkgs/development/ocaml-modules/lrgrep/default.nix b/pkgs/development/ocaml-modules/lrgrep/default.nix new file mode 100644 index 000000000000..7a51a78d623f --- /dev/null +++ b/pkgs/development/ocaml-modules/lrgrep/default.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchurl, + buildDunePackage, + menhir, + cmon, + menhirLib, + menhirSdk, +}: + +buildDunePackage (finalAttrs: { + pname = "lrgrep"; + version = "0.9"; + + minimalOCamlVersion = "4.14"; + + src = fetchurl { + url = "https://github.com/let-def/lrgrep/releases/download/v${finalAttrs.version}/lrgrep-${finalAttrs.version}.tbz"; + hash = "sha256-5T3hLkxcvmvKAGQ1kyZrT5+i4/ahOBle7/ekMp9cHHU="; + }; + + nativeBuildInputs = [ menhir ]; + + propagatedBuildInputs = [ + cmon + menhirLib + menhirSdk + ]; + + doCheck = true; + + meta = { + license = lib.licenses.isc; + description = "Detailed error messages for Menhir-generated parsers"; + homepage = "https://github.com/let-def/lrgrep"; + }; +}) diff --git a/pkgs/development/python-modules/aiortc/default.nix b/pkgs/development/python-modules/aiortc/default.nix index 12710d9f4eaf..7f044c702c2d 100644 --- a/pkgs/development/python-modules/aiortc/default.nix +++ b/pkgs/development/python-modules/aiortc/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "aiortc"; - version = "1.14.0"; + version = "1.15.0"; pyproject = true; src = fetchFromGitHub { owner = "aiortc"; repo = "aiortc"; tag = version; - hash = "sha256-ZgxSaiKkJrA5XvUT1zq8kwqB8mOvn46vLWXHyJSsHbM="; + hash = "sha256-XuqitZv0VJmbcvLZK3tLsN0TLfjujL35mbcyBche5SQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix index 8000174085d1..7158b48c67a6 100644 --- a/pkgs/development/python-modules/albucore/default.nix +++ b/pkgs/development/python-modules/albucore/default.nix @@ -2,57 +2,63 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, - pytestCheckHook, + + # build-system + hatchling, + + # dependencies + numkong, numpy, opencv-python, - simsimd, stringzilla, + + # tests + hypothesis, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "albucore"; - version = "0.0.24"; + version = "0.2.4"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "albumentations-team"; repo = "albucore"; - tag = version; - hash = "sha256-frVMPW3au/6vPRY89GIt7chCPkUMl13DpPqCPqIjz/o="; + tag = finalAttrs.version; + hash = "sha256-gI6q9ODkc2JoDfV8RA2NzwbC9A6QyZFa7C24prqMydU="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail \ - 'from pkg_resources import DistributionNotFound, get_distribution' \ - 'from importlib.metadata import PackageNotFoundError as DistributionNotFound, distribution as get_distribution' - ''; - - pythonRelaxDeps = [ "opencv-python" ]; - - build-system = [ setuptools ]; + build-system = [ + hatchling + ]; dependencies = [ + numkong numpy opencv-python - simsimd stringzilla ]; pythonImportsCheck = [ "albucore" ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + hypothesis + pytestCheckHook + ]; - # albumentations doesn't support newer versions of albucore - # and has been archived upstream in favor of relicensed `albumentationsx` - passthru.skipBulkUpdate = true; + disabledTests = [ + # Flaky on some CPUs: + # AssertionError: Not equal to tolerance rtol=1e-05, atol=1e-05 + "test_normalize_consistency_across_shapes" + ]; meta = { description = "High-performance image processing library to optimize and extend Albumentations with specialized functions for image transformations"; homepage = "https://github.com/albumentations-team/albucore"; - changelog = "https://github.com/albumentations-team/albucore/releases/tag/${version}"; + changelog = "https://github.com/albumentations-team/albucore/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; -} +}) diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix deleted file mode 100644 index 623187c8e1ec..000000000000 --- a/pkgs/development/python-modules/albumentations/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - setuptools, - - # dependencies - albucore, - numpy, - opencv-python, - pydantic, - pyyaml, - scipy, - - # optional dependencies - huggingface-hub, - pillow, - torch, - - # tests - deepdiff, - pytestCheckHook, - pytest-mock, - scikit-image, - scikit-learn, - torchvision, -}: - -buildPythonPackage rec { - pname = "albumentations"; - version = "2.0.8"; - pyproject = true; - - src = fetchFromGitHub { - owner = "albumentations-team"; - repo = "albumentations"; - tag = version; - hash = "sha256-8vUipdkIelRtKwMw63oUBDN/GUI0gegMGQaqDyXAOTQ="; - }; - - patches = [ - ./dont-check-for-updates.patch - ]; - - postPatch = '' - substituteInPlace setup.py \ - --replace-fail \ - 'from pkg_resources import DistributionNotFound, get_distribution' \ - 'from importlib.metadata import PackageNotFoundError as DistributionNotFound, distribution as get_distribution' - substituteInPlace tests/test_blur.py \ - --replace-fail \ - '(ImageFilter.GaussianBlur(radius=sigma))' \ - '(ImageFilter.GaussianBlur(radius=float(sigma)))' - ''; - - pythonRelaxDeps = [ "opencv-python" ]; - - build-system = [ setuptools ]; - - dependencies = [ - albucore - numpy - opencv-python - pydantic - pyyaml - scipy - ]; - - optional-dependencies = { - hub = [ huggingface-hub ]; - pytorch = [ torch ]; - text = [ pillow ]; - }; - - nativeCheckInputs = [ - deepdiff - pytestCheckHook - pytest-mock - scikit-image - scikit-learn - torch - torchvision - ]; - - disabledTests = [ - "test_pca_inverse_transform" - # these tests hang - "test_keypoint_remap_methods" - "test_multiprocessing_support" - ]; - - pythonImportsCheck = [ "albumentations" ]; - - meta = { - description = "Fast image augmentation library and easy to use wrapper around other libraries"; - homepage = "https://github.com/albumentations-team/albumentations"; - changelog = "https://github.com/albumentations-team/albumentations/releases/tag/${src.tag}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; - }; -} diff --git a/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch b/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch deleted file mode 100644 index 6f9214e02f70..000000000000 --- a/pkgs/development/python-modules/albumentations/dont-check-for-updates.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/albumentations/__init__.py b/albumentations/__init__.py -index 44ee9b9..ea3bc50 100644 ---- a/albumentations/__init__.py -+++ b/albumentations/__init__.py -@@ -22,7 +22,3 @@ from .core.transforms_interface import * - - with suppress(ImportError): - from .pytorch import * -- --# Perform the version check after all other initializations --if os.getenv("NO_ALBUMENTATIONS_UPDATE", "").lower() not in {"true", "1"}: -- check_for_updates() diff --git a/pkgs/development/python-modules/albumentationsx/default.nix b/pkgs/development/python-modules/albumentationsx/default.nix new file mode 100644 index 000000000000..2689048ec00d --- /dev/null +++ b/pkgs/development/python-modules/albumentationsx/default.nix @@ -0,0 +1,133 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + albucore, + numpy, + pydantic, + pyyaml, + scipy, + typing-extensions, + + # optional-dependencies + opencv-contrib-python, + opencv-python, + opencv-python-headless, + huggingface-hub, + pillow, + torch, + pyvips, + + # tests + deepdiff, + defusedxml, + gitMinimal, + hypothesis, + pytest-mock, + pytestCheckHook, + scikit-image, + scikit-learn, + torchvision, +}: + +buildPythonPackage (finalAttrs: { + pname = "albumentationsx"; + version = "2.3.3"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "albumentations-team"; + repo = "AlbumentationsX"; + tag = finalAttrs.version; + hash = "sha256-exCQwduQM29K5Omb48KYIqm2D4yfOKFFEr37zhIvACY="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + albucore + numpy + pydantic + pyyaml + scipy + typing-extensions + ]; + + optional-dependencies = { + contrib = [ + opencv-contrib-python + ]; + contrib-headless = [ + # opencv-contrib-python-headless + ]; + gui = [ + opencv-python + ]; + headless = [ + opencv-python-headless + ]; + hub = [ + huggingface-hub + ]; + pillow = [ + pillow + ]; + pytorch = [ + torch + ]; + pyvips = [ + pyvips + ]; + text = [ + pillow + ]; + }; + + pythonImportsCheck = [ "albumentations" ]; + + nativeCheckInputs = [ + deepdiff + defusedxml + gitMinimal + hypothesis + pillow + pytest-mock + pytestCheckHook + scikit-image + scikit-learn + torch + torchvision + ]; + + disabledTests = [ + # ImportError: cannot import name 'benchmark_coverage' from 'tools' + "test_direct_script_ignores_unrelated_tools_package" + + # AssertionError: Arrays are not almost equal to 6 decimals + "test_pca_inverse_transform" + ]; + + disabledTestPaths = [ + # Infinite recursion with albu-spec + "tests/test_type_consistency.py" + + # Requires unfree google-docstring-parser + "tests/test_docstrings.py" + ]; + + meta = { + description = "Python library for image augmentation"; + homepage = "https://github.com/albumentations-team/AlbumentationsX"; + changelog = "https://github.com/albumentations-team/AlbumentationsX/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index e951dd2aa04e..459776589ddb 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,6 +11,8 @@ # dependencies numpy, + + pytestCheckHook, }: buildPythonPackage (finalAttrs: { @@ -38,6 +40,8 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "awkward_cpp" ]; + nativeCheckInputs = [ pytestCheckHook ]; + meta = { description = "CPU kernels and compiled extensions for Awkward Array"; homepage = "https://github.com/scikit-hep/awkward"; diff --git a/pkgs/development/python-modules/blockchain/default.nix b/pkgs/development/python-modules/blockchain/default.nix deleted file mode 100644 index 872734c1291d..000000000000 --- a/pkgs/development/python-modules/blockchain/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - future, -}: - -buildPythonPackage rec { - pname = "blockchain"; - version = "1.4.4"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "1qpbmz6dk5gx1996dswpipwhj6sp5j0dlfap012l46zqnvmkxanv"; - }; - - postPatch = '' - substituteInPlace setup.py --replace "enum-compat" "" - ''; - - propagatedBuildInputs = [ future ]; - - # tests are interacting with the API and not mocking the calls - doCheck = false; - - pythonImportsCheck = [ "blockchain" ]; - - meta = { - description = "Python client Blockchain Bitcoin Developer API"; - homepage = "https://github.com/blockchain/api-v1-client-python"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/compreffor/default.nix b/pkgs/development/python-modules/compreffor/default.nix index 77b7b25396aa..1aacf32ee4ef 100644 --- a/pkgs/development/python-modules/compreffor/default.nix +++ b/pkgs/development/python-modules/compreffor/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "compreffor" ]; meta = { - changelog = "https://github.com/googlefonts/compreffor/releases/tag/${version}"; + changelog = "https://github.com/googlefonts/compreffor/releases/tag/v${version}"; description = "CFF table subroutinizer for FontTools"; mainProgram = "compreffor"; homepage = "https://github.com/googlefonts/compreffor"; diff --git a/pkgs/development/python-modules/cssselect/default.nix b/pkgs/development/python-modules/cssselect/default.nix index 2d26b38dedfb..9509a08ec1b2 100644 --- a/pkgs/development/python-modules/cssselect/default.nix +++ b/pkgs/development/python-modules/cssselect/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "CSS Selectors for Python"; homepage = "https://cssselect.readthedocs.io/"; - changelog = "https://github.com/scrapy/cssselect/v${version}//CHANGES"; + changelog = "https://github.com/scrapy/cssselect/blob/v${version}/CHANGES"; license = lib.licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index 6c814ab806d3..93f99b0800d0 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = { description = "Plugin enabling dbt to operate on a BigQuery database"; homepage = "https://github.com/dbt-labs/dbt-bigquery"; - changelog = "https://github.com/dbt-labs/dbt-bigquery/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/dbt-labs/dbt-bigquery/blob/v${version}/CHANGELOG.md"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index 2a968331608f..7577c20fc83e 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = { description = "Plugin enabling dbt to work with Amazon Redshift"; homepage = "https://github.com/dbt-labs/dbt-redshift"; - changelog = "https://github.com/dbt-labs/dbt-redshift/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/dbt-labs/dbt-redshift/blob/v${version}/CHANGELOG.md"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/dfdiskcache/default.nix b/pkgs/development/python-modules/dfdiskcache/default.nix index 284fc1c807f2..9a9a28b4f4f0 100644 --- a/pkgs/development/python-modules/dfdiskcache/default.nix +++ b/pkgs/development/python-modules/dfdiskcache/default.nix @@ -23,6 +23,12 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; + # Upstream pins pandas<3 (still true as of the v0.1.0 tag), but the + # package works fine against pandas 3.x; relax the constraint rather + # than staying behind on pandas. + # https://github.com/thombashi/df-diskcache/blob/v0.1.0/requirements/requirements.txt + pythonRelaxDeps = [ "pandas" ]; + propagatedBuildInputs = [ pandas simplesqlite diff --git a/pkgs/development/python-modules/electrum-ecc/default.nix b/pkgs/development/python-modules/electrum-ecc/default.nix index f162b894da4b..37db42c2a6a4 100644 --- a/pkgs/development/python-modules/electrum-ecc/default.nix +++ b/pkgs/development/python-modules/electrum-ecc/default.nix @@ -19,14 +19,14 @@ let in buildPythonPackage rec { pname = "electrum-ecc"; - version = "0.0.6"; + version = "0.0.7"; pyproject = true; build-system = [ setuptools ]; src = fetchPypi { pname = "electrum_ecc"; inherit version; - hash = "sha256-Y2DHH7CLUdgKRV6TjxJrpMeQvnS6ImRh1U16OqaJC4k="; + hash = "sha256-7UE04dv/D9gwInZMasyXoCzeNRKSfXxB9NSLmgbpH7I="; }; env = { diff --git a/pkgs/development/python-modules/epc/default.nix b/pkgs/development/python-modules/epc/default.nix index 735c8aa1ecc6..3ddce46c91c8 100644 --- a/pkgs/development/python-modules/epc/default.nix +++ b/pkgs/development/python-modules/epc/default.nix @@ -3,24 +3,38 @@ buildPythonPackage, fetchPypi, sexpdata, + setuptools, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "epc"; version = "0.0.5"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "a14d2ea74817955a20eb00812e3a4630a132897eb4d976420240f1152c0d7d25"; + inherit (finalAttrs) pname version; + hash = "sha256-oU0up0gXlVog6wCBLjpGMKEyiX602XZCAkDxFSwNfSU="; }; - propagatedBuildInputs = [ sexpdata ]; - doCheck = false; + build-system = [ setuptools ]; + + dependencies = [ sexpdata ]; + + pythonImportsCheck = [ "epc" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # imports nose + "epc/tests/test_py2py.py" + ]; + + __darwinAllowLocalNetworking = true; meta = { description = "EPC (RPC stack for Emacs Lisp) implementation in Python"; homepage = "https://github.com/tkf/python-epc"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; }; -} +}) diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 7606b61fd07b..d88b2ba733bc 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -4,15 +4,16 @@ fetchPypi, linuxHeaders, setuptools, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "evdev"; version = "1.9.3"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-LBQOAayEN3WPoj/lyHE5dBJGH0LUIaogJB3I/oz8y8k="; }; @@ -25,16 +26,23 @@ buildPythonPackage rec { buildInputs = [ linuxHeaders ]; - doCheck = false; - pythonImportsCheck = [ "evdev" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # tries to open /dev/uinput + "tests/test_uinput.py" + ]; + meta = { description = "Provides bindings to the generic input event interface in Linux"; homepage = "https://python-evdev.readthedocs.io/"; - changelog = "https://github.com/gvalkov/python-evdev/blob/v${version}/docs/changelog.rst"; + changelog = "https://github.com/gvalkov/python-evdev/blob/v${finalAttrs.version}/docs/changelog.rst"; license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/development/python-modules/expiring-dict/default.nix b/pkgs/development/python-modules/expiring-dict/default.nix index ce39c7151918..5da8b3aff24f 100644 --- a/pkgs/development/python-modules/expiring-dict/default.nix +++ b/pkgs/development/python-modules/expiring-dict/default.nix @@ -4,16 +4,17 @@ fetchPypi, setuptools, sortedcontainers, + pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "expiring-dict"; version = "1.1.2"; pyproject = true; src = fetchPypi { pname = "expiring_dict"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-yoy4AjBOrlszoj7EwZAZthCt/aUMvEyb+jrVws04djE="; }; @@ -23,10 +24,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "expiring_dict" ]; + nativeCheckInputs = [ pytestCheckHook ]; + meta = { description = "Python dict with TTL support for auto-expiring caches"; homepage = "https://github.com/dparker2/py-expiring-dict"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/extras/default.nix b/pkgs/development/python-modules/extras/default.nix index d73a0c050ea7..a7fd5bbdb958 100644 --- a/pkgs/development/python-modules/extras/default.nix +++ b/pkgs/development/python-modules/extras/default.nix @@ -2,24 +2,36 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + pytestCheckHook, + testtools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "extras"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; - sha256 = "132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e"; + inherit (finalAttrs) pname version; + hash = "sha256-Ey423hC5yR1dTMYgFgpHbgRoqI8WyUMYF6ZylhGoG04="; }; - # error: invalid command 'test' - doCheck = false; + build-system = [ setuptools ]; + + preCheck = '' + substituteInPlace extras/tests/test_extras.py \ + --replace-fail "assertEquals(" "assertEqual(" + ''; + + nativeCheckInputs = [ + pytestCheckHook + testtools + ]; meta = { description = "Useful extra bits for Python - things that should be in the standard library"; homepage = "https://github.com/testing-cabal/extras"; license = lib.licenses.mit; }; -} +}) diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index e29b3dfd2e1e..443051a5e6c7 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = { description = "Find a website's favicon"; homepage = "https://github.com/scottwernervt/favicon"; - changelog = "https://github.com/scottwernervt/favicon/blob/${version}/CHANGELOG.rst"; + changelog = "https://github.com/scottwernervt/favicon/blob/v${version}/CHANGELOG.rst"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/feedparser/default.nix b/pkgs/development/python-modules/feedparser/default.nix index 63b58214b3b4..1e461251d8ff 100644 --- a/pkgs/development/python-modules/feedparser/default.nix +++ b/pkgs/development/python-modules/feedparser/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "Universal feed parser"; homepage = "https://github.com/kurtmckee/feedparser"; - changelog = "https://feedparser.readthedocs.io/en/latest/changelog.html"; + changelog = "https://feedparser.readthedocs.io/en/latest/changelog"; license = lib.licenses.bsd2; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 96dfc323b171..11ae76d4c8a4 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/maxcountryman/flask-login/blob/${version}/CHANGES.md"; + changelog = "https://github.com/maxcountryman/flask-login/blob/${src.rev}/CHANGES.md"; description = "User session management for Flask"; homepage = "https://github.com/maxcountryman/flask-login"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 10b3531a71d1..c5438209c007 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = { description = "Flask extension that provides integration with MongoEngine and WTF model forms"; homepage = "https://github.com/mongoengine/flask-mongoengine"; - changelog = "https://github.com/MongoEngine/flask-mongoengine/releases/tag/v${version}"; + changelog = "https://github.com/MongoEngine/flask-mongoengine/blob/${src.rev}/docs/changelog.rst"; license = lib.licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 4e7dcfbe00cd..923acd291434 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -63,8 +63,8 @@ buildPythonPackage rec { meta = { description = "BigQuery Storage API API client library"; - homepage = "https://github.com/googleapis/python-bigquery-storage"; - changelog = "https://github.com/googleapis/python-bigquery-storage/blob/v${version}/CHANGELOG.md"; + homepage = "https://docs.cloud.google.com/bigquery/docs/reference/storage"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-storage-v${version}/packages/google-cloud-bigquery-storage/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; mainProgram = "fixup_bigquery_storage_v1_keywords.py"; diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 8d819a0764c2..296dfc38c9e5 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -71,8 +71,8 @@ buildPythonPackage (finalAttrs: { meta = { description = "Google Cloud Datastore API client library"; - homepage = "https://github.com/googleapis/python-datastore"; - changelog = "https://github.com/googleapis/python-datastore/blob/v${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://cloud.google.com/datastore"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-datastore-v${finalAttrs.version}/packages/google-cloud-datastore/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-dns/default.nix b/pkgs/development/python-modules/google-cloud-dns/default.nix index b94f421edd06..c8c78900546d 100644 --- a/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -46,8 +46,8 @@ buildPythonPackage rec { meta = { description = "Google Cloud DNS API client library"; - homepage = "https://github.com/googleapis/python-dns"; - changelog = "https://github.com/googleapis/python-dns/blob/v${version}/CHANGELOG.md"; + homepage = "https://cloud.google.com/dns"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-dns-v${version}/packages/google-cloud-dns/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/greek-accentuation/default.nix b/pkgs/development/python-modules/greek-accentuation/default.nix index b42d5ef270b6..fb7838425bff 100644 --- a/pkgs/development/python-modules/greek-accentuation/default.nix +++ b/pkgs/development/python-modules/greek-accentuation/default.nix @@ -2,19 +2,29 @@ buildPythonPackage, lib, fetchPypi, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "greek-accentuation"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; + src = fetchPypi { - inherit pname version; + pname = "greek-accentuation"; + inherit (finalAttrs) version; hash = "sha256-l2HZXdqlLubvy2bWhhZVYGMpF0DXVKTDFehkcGF5xdk="; }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "greek_accentuation" ]; + meta = { description = "Python 3 library for accenting (and analyzing the accentuation of) Ancient Greek words"; homepage = "https://github.com/jtauber/greek-accentuation"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ kmein ]; }; -} +}) diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index 56f25b285b23..53a81d5003e8 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -5,7 +5,6 @@ # Python bits: buildPythonPackage, setuptools, - pytest, responses, docopt, flask, @@ -14,6 +13,8 @@ pygments, requests, tabulate, + addBinToPathHook, + pytestCheckHook, }: buildPythonPackage (finalAttrs: { @@ -41,11 +42,6 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; - nativeCheckInputs = [ - pytest - responses - ]; - dependencies = [ docopt flask @@ -56,13 +52,16 @@ buildPythonPackage (finalAttrs: { tabulate ]; - checkPhase = '' - export PATH="$PATH:$out/bin" - py.test -xm "not assumption" - ''; - pythonImportsCheck = [ "grip" ]; + nativeCheckInputs = [ + responses + pytestCheckHook + addBinToPathHook + ]; + + enabledTestMarks = [ "not assumption" ]; + meta = { description = "Preview GitHub Markdown files like Readme locally before committing them"; mainProgram = "grip"; diff --git a/pkgs/development/python-modules/guntamatic/default.nix b/pkgs/development/python-modules/guntamatic/default.nix index cfd49b969f01..324efab2ac90 100644 --- a/pkgs/development/python-modules/guntamatic/default.nix +++ b/pkgs/development/python-modules/guntamatic/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "guntamatic"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; src = fetchFromGitHub { owner = "JensTimmerman"; repo = "guntamatic"; tag = "v${finalAttrs.version}"; - hash = "sha256-OQpbBdTxbKd2A9AWJOLmoKNmPx3ZXTWqLgwTndDWMuw="; + hash = "sha256-cm3aFIRnWFKgkaEYDQCGSREZRmGhv0ltKMpkWHu+ugI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/hatch-babel/default.nix b/pkgs/development/python-modules/hatch-babel/default.nix index 83500ad98b66..97ec67da9952 100644 --- a/pkgs/development/python-modules/hatch-babel/default.nix +++ b/pkgs/development/python-modules/hatch-babel/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "Hatch build-hook to compile Babel *.po files to *.mo files at build time"; homepage = "https://github.com/NiklasRosenstein/hatch-babel"; - changelog = "https://github.com/NiklasRosenstein/hatch-babel/blob/${src.tag}/.changelog/${src.tag}.toml"; + # changelog = "https://github.com/NiklasRosenstein/hatch-babel/blob/${src.tag}/.changelog/${src.tag}.toml"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/pkgs/development/python-modules/hatch-requirements-txt/default.nix index fcb16f29a563..a6c143230e48 100644 --- a/pkgs/development/python-modules/hatch-requirements-txt/default.nix +++ b/pkgs/development/python-modules/hatch-requirements-txt/default.nix @@ -31,7 +31,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - changelog = "https://github.com/repo-helper/hatch-requirements-txt/releases/tag/${version}"; description = "Hatchling plugin to read project dependencies from requirements.txt"; homepage = "https://github.com/repo-helper/hatch-requirements-txt"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 70c165ddfd95..88fe1179b2ca 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; homepage = "https://github.com/scikit-learn-contrib/hdbscan"; - changelog = "https://github.com/scikit-learn-contrib/hdbscan/releases/tag/release-${src.tag}"; + changelog = "https://github.com/scikit-learn-contrib/hdbscan/releases/tag/release-${version}"; license = lib.licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 51c7458bcc92..6d2e6dd8d188 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202607201"; + version = "0.1.202607211"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-YmWkOspunMtdWMl5MvESUpWE1yRVl+eKpiTwC9LvBZ0="; + hash = "sha256-G6Yum+tZ49Lw44z+fPkFrSLY1JrWReTewx8QSlet6zA="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/insightface/default.nix b/pkgs/development/python-modules/insightface/default.nix index 45c384fa1b91..95fdb9f918b4 100644 --- a/pkgs/development/python-modules/insightface/default.nix +++ b/pkgs/development/python-modules/insightface/default.nix @@ -1,36 +1,47 @@ { lib, - albumentations, buildPythonPackage, - cython, fetchPypi, - insightface, - matplotlib, + + # build-system + cython, + setuptools, + + # dependencies mxnet, numpy, onnx, onnxruntime, opencv-python, + requests, + scikit-image, + scipy, + tqdm, + + # optional-dependencies + # gui: pillow, pyside6, reportlab, - requests, - setuptools, - scipy, - scikit-image, scikit-learn, + # face3d + albumentationsx, + matplotlib, + + insightface, testers, - tqdm, stdenv, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "insightface"; version = "1.0.1"; pyproject = true; + __structuredAttrs = true; + # No tags on GitHub src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-J68kiRu7pHDLNXOzZqD8yomJ/IUDyfjygejLpv1xYHU="; }; @@ -59,16 +70,21 @@ buildPythonPackage rec { scikit-learn ]; face3d = [ - albumentations + albumentationsx matplotlib ]; }; - # aarch64-linux tries to get cpu information from /sys, which isn't available - # inside the nix build sandbox. - dontUsePythonImportsCheck = stdenv.buildPlatform.system == "aarch64-linux"; + pythonImportsCheck = [ + "insightface" + "insightface.app" + "insightface.data" + ]; - passthru.tests = lib.optionalAttrs (stdenv.buildPlatform.system != "aarch64-linux") { + # No tests in the Pypi archive + doCheck = false; + + passthru.tests = { version = testers.testVersion { package = insightface; command = "insightface-cli --help"; @@ -78,14 +94,6 @@ buildPythonPackage rec { }; }; - pythonImportsCheck = [ - "insightface" - "insightface.app" - "insightface.data" - ]; - - doCheck = false; # Upstream has no tests - meta = { description = "State-of-the-art 2D and 3D Face Analysis Project"; mainProgram = "insightface-cli"; @@ -93,4 +101,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ oddlama ]; }; -} +}) diff --git a/pkgs/development/python-modules/kagglesdk/default.nix b/pkgs/development/python-modules/kagglesdk/default.nix index 20100ed44533..eba6894d10a9 100644 --- a/pkgs/development/python-modules/kagglesdk/default.nix +++ b/pkgs/development/python-modules/kagglesdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage (finalAttrs: { pname = "kagglesdk"; - version = "0.1.30"; + version = "0.1.34"; pyproject = true; __structuredAttrs = true; @@ -21,7 +21,7 @@ buildPythonPackage (finalAttrs: { owner = "Kaggle"; repo = "kagglesdk"; tag = "v${finalAttrs.version}"; - hash = "sha256-7YjbJ6uo6R3jpo25wlHftYAA+0t7oUXc432N/REeCzU="; + hash = "sha256-Yd4QZpSdcOWpEqDGf+uFe4JGDknSjkjTYWn1j89oRLM="; }; build-system = [ diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix index 9229225803a1..9abb49158f97 100644 --- a/pkgs/development/python-modules/knx-frontend/default.nix +++ b/pkgs/development/python-modules/knx-frontend/default.nix @@ -7,14 +7,14 @@ buildPythonPackage (finalAttrs: { pname = "knx-frontend"; - version = "2026.7.8.100603"; + version = "2026.7.17.104339"; pyproject = true; # TODO: source build, uses yarn.lock src = fetchPypi { pname = "knx_frontend"; inherit (finalAttrs) version; - hash = "sha256-80yeDZ8a8WDf/NEXjFSkcfpglp9yTnmg+4csFbgdFpM="; + hash = "sha256-//Tjixp8mXP2KFuW2U9iEW1BXMi2jfbuJBj/LuijW4Q="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/kopf/default.nix b/pkgs/development/python-modules/kopf/default.nix index 7c54175dea98..a1140bd74c07 100644 --- a/pkgs/development/python-modules/kopf/default.nix +++ b/pkgs/development/python-modules/kopf/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "kopf"; - version = "1.44.5"; + version = "1.44.6"; pyproject = true; src = fetchFromGitHub { owner = "nolar"; repo = "kopf"; tag = version; - hash = "sha256-iwAq06qXtD3c0otC1S9TfRPDpc54y/NJQpJ7X8dCgGI="; + hash = "sha256-ffBdauplO1WkrXcsJuCKBhlkXpoinFqRU24uSoDQIm0="; }; build-system = [ diff --git a/pkgs/development/python-modules/lazr-restfulclient/default.nix b/pkgs/development/python-modules/lazr-restfulclient/default.nix index cd0b2508a4b5..e289ef57e847 100644 --- a/pkgs/development/python-modules/lazr-restfulclient/default.nix +++ b/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -51,8 +51,7 @@ buildPythonPackage rec { meta = { description = "Programmable client library that takes advantage of the commonalities among"; - homepage = "https://launchpad.net/lazr.restfulclient"; - changelog = "https://git.launchpad.net/lazr.restfulclient/tree/NEWS.rst?h=${version}"; + homepage = "https://pypi.org/project/lazr.restfulclient"; license = lib.licenses.lgpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index ad479f304311..0e0f08d8fc95 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -58,7 +58,6 @@ buildPythonPackage (finalAttrs: { meta = { description = "Modified version of Supybot, an IRC bot"; homepage = "https://github.com/ProgVal/Limnoria"; - changelog = "https://github.com/progval/Limnoria/releases/tag/master-${finalAttrs.version}"; license = lib.licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/linode-api4/default.nix b/pkgs/development/python-modules/linode-api4/default.nix index 153d1d207cf8..602a16888bdf 100644 --- a/pkgs/development/python-modules/linode-api4/default.nix +++ b/pkgs/development/python-modules/linode-api4/default.nix @@ -7,6 +7,7 @@ mock, nix-update-script, polling, + pyprojectVersionPatchHook, pytestCheckHook, requests, setuptools, @@ -16,6 +17,7 @@ buildPythonPackage (finalAttrs: { pname = "linode-api4"; version = "5.45.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { @@ -27,6 +29,8 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; + nativeBuildInputs = [ pyprojectVersionPatchHook ]; + dependencies = [ deprecated polling diff --git a/pkgs/development/python-modules/mlx/darwin-build-fixes.patch b/pkgs/development/python-modules/mlx/darwin-build-fixes.patch deleted file mode 100644 index e25e6da7d070..000000000000 --- a/pkgs/development/python-modules/mlx/darwin-build-fixes.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ab8aea44..9e1b06f4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -100,10 +100,7 @@ elseif(MLX_BUILD_METAL) - endif() - - # Throw an error if xcrun not found -- execute_process( -- COMMAND zsh "-c" "/usr/bin/xcrun -sdk macosx --show-sdk-version" -- OUTPUT_VARIABLE MACOS_SDK_VERSION -- OUTPUT_STRIP_TRAILING_WHITESPACE COMMAND_ERROR_IS_FATAL ANY) -+ set(MACOS_SDK_VERSION @sdkVersion@) - - if(${MACOS_SDK_VERSION} LESS 14.0) - message( diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index b70ed7de68e8..4db98899b12d 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - replaceVars, nanobind, # build-system @@ -12,7 +11,6 @@ typing-extensions, # buildInputs - apple-sdk, fmt, nlohmann_json, # linux-only @@ -20,7 +18,6 @@ # tests numpy, - psutil, pytestCheckHook, python, runCommand, @@ -42,7 +39,7 @@ let in buildPythonPackage (finalAttrs: { pname = "mlx"; - version = "0.31.2"; + version = "0.32.0"; pyproject = true; __structuredAttrs = true; @@ -50,18 +47,12 @@ buildPythonPackage (finalAttrs: { owner = "ml-explore"; repo = "mlx"; tag = "v${finalAttrs.version}"; - hash = "sha256-0Oxacz61WGWZrpWw+fMQjEQfwOx1l1L2d0kWl54/LrQ="; + hash = "sha256-yHpTyRf9FOPbdyDWSM7b6VC72STnUpgCMLbDxLbdaqs="; }; patches = [ # Use nix packages instead of fetching their sources - ./dont-fetch-nanobind.patch ./dont-fetch-json.patch - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - (replaceVars ./darwin-build-fixes.patch { - sdkVersion = apple-sdk.version; - }) ]; postPatch = '' @@ -83,24 +74,17 @@ buildPythonPackage (finalAttrs: { env = { PYPI_RELEASE = 1; - CMAKE_ARGS = toString ( - [ - # NOTE The `metal` command-line utility used to build the Metal kernels is not open-source. - # To build mlx with Metal support in Nix, you'd need to use one of the sandbox escape - # hatches which let you interact with a native install of Xcode, such as `composeXcodeWrapper` - # or by changing the upstream (e.g., https://github.com/zed-industries/zed/discussions/7016). - (lib.cmakeBool "MLX_BUILD_METAL" false) - (lib.cmakeBool "USE_SYSTEM_FMT" true) - (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}") - (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-I${lib.getDev nlohmann_json}/include/nlohmann") - - # Cmake cannot find nanobind-config.cmake by itself - (lib.cmakeFeature "nanobind_DIR" "${nanobind}/${python.sitePackages}/nanobind/cmake") - ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ - (lib.cmakeBool "MLX_ENABLE_X64_MAC" true) - ] - ); + CMAKE_ARGS = toString [ + # NOTE The `metal` command-line utility used to build the Metal kernels is not open-source. + # To build mlx with Metal support in Nix, you'd need to use one of the sandbox escape + # hatches which let you interact with a native install of Xcode, such as `composeXcodeWrapper` + # or by changing the upstream (e.g., https://github.com/zed-industries/zed/discussions/7016). + (lib.cmakeBool "MLX_BUILD_METAL" false) + (lib.cmakeBool "USE_SYSTEM_FMT" true) + (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_GGUFLIB" "${gguf-tools}") + (lib.cmakeOptionType "filepath" "FETCHCONTENT_SOURCE_DIR_NANOBIND" "${nanobind.src}") + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-I${lib.getDev nlohmann_json}/include/nlohmann") + ]; }; build-system = [ @@ -122,7 +106,6 @@ buildPythonPackage (finalAttrs: { # Run the mlx Python test suite. nativeCheckInputs = [ numpy - psutil pytestCheckHook ]; @@ -130,11 +113,7 @@ buildPythonPackage (finalAttrs: { "python/tests/" ]; - disabledTests = [ - # brittle memory leak test, see: https://github.com/ml-explore/mlx/pull/3088 - "test_siblings_without_eval" - ] - ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ + disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [ # Segmentation fault "test_lapack" "test_multivariate_normal" diff --git a/pkgs/development/python-modules/mlx/dont-fetch-nanobind.patch b/pkgs/development/python-modules/mlx/dont-fetch-nanobind.patch deleted file mode 100644 index c9822ae1e2c7..000000000000 --- a/pkgs/development/python-modules/mlx/dont-fetch-nanobind.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a2395d02..6d24df02 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -354,13 +354,7 @@ if(MLX_BUILD_PYTHON_BINDINGS) - Python 3.10 - COMPONENTS Interpreter Development.Module - REQUIRED) -- FetchContent_Declare( -- nanobind -- GIT_REPOSITORY https://github.com/wjakob/nanobind.git -- GIT_TAG v2.12.0 -- GIT_SHALLOW TRUE -- EXCLUDE_FROM_ALL) -- FetchContent_MakeAvailable(nanobind) -+ find_package(nanobind CONFIG REQUIRED) - add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/python/src) - endif() - diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix index 4644774549d6..a4581f7c2cd5 100644 --- a/pkgs/development/python-modules/neo/default.nix +++ b/pkgs/development/python-modules/neo/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "neo"; - version = "0.14.4"; + version = "0.14.5"; pyproject = true; src = fetchFromGitHub { owner = "NeuralEnsemble"; repo = "python-neo"; tag = version; - hash = "sha256-VdT7PFSle8HxWfsPrrI+mHtsTO315+Sw0RGx8HSYtwk="; + hash = "sha256-IB+RuQBJTu0Ss7PLdBpONBl50xdTiR512ni+w3Z+DEM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/onnx-asr/default.nix b/pkgs/development/python-modules/onnx-asr/default.nix index a73f4879a6ff..ea3f8bdf6dac 100644 --- a/pkgs/development/python-modules/onnx-asr/default.nix +++ b/pkgs/development/python-modules/onnx-asr/default.nix @@ -23,14 +23,14 @@ buildPythonPackage (finalAttrs: { pname = "onnx-asr"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "istupakov"; repo = "onnx-asr"; tag = "v${finalAttrs.version}"; - hash = "sha256-gi5U56ZPSo0bJ0Fmi8nebvIXENZWwX4lofk5vKV8gag="; + hash = "sha256-PUlGF8ICXWwSpeWufduJL7wLsIcI+bmoHrj9ZHrgX3U="; }; build-system = [ diff --git a/pkgs/development/python-modules/opencamlib/01-build-verbose.patch b/pkgs/development/python-modules/opencamlib/01-build-verbose.patch new file mode 100644 index 000000000000..7cab8b09999d --- /dev/null +++ b/pkgs/development/python-modules/opencamlib/01-build-verbose.patch @@ -0,0 +1,12 @@ +diff --git i/pyproject.toml w/pyproject.toml +index 20be73f..3773051 100644 +--- i/pyproject.toml ++++ w/pyproject.toml +@@ -36,7 +36,7 @@ requires = ["scikit-build-core"] + build-backend = "scikit_build_core.build" + + [tool.scikit-build] +-cmake.verbose = true ++build.verbose = true + logging.level = "DEBUG" + wheel.packages = ["src/pythonlib/opencamlib"] diff --git a/pkgs/development/python-modules/opencamlib/default.nix b/pkgs/development/python-modules/opencamlib/default.nix index 101482b80711..f9cfc3e55599 100644 --- a/pkgs/development/python-modules/opencamlib/default.nix +++ b/pkgs/development/python-modules/opencamlib/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-pUj71PdWo902dqF9O6SLnpvFooFU2OfLBv8hAVsH/iA="; }; + patches = [ + # Upstream status: https://github.com/aewallin/opencamlib/pull/180 + ./01-build-verbose.patch + ]; + build-system = [ scikit-build-core ]; diff --git a/pkgs/development/python-modules/panflute/default.nix b/pkgs/development/python-modules/panflute/default.nix index 8c98ea2073c7..9585cc6c89c0 100644 --- a/pkgs/development/python-modules/panflute/default.nix +++ b/pkgs/development/python-modules/panflute/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions"; homepage = "https://scorreia.com/software/panflute"; - changelog = "https://github.com/sergiocorreia/panflute/releases/tag/${version}"; + # changelog = "https://github.com/sergiocorreia/panflute/releases/tag/${version}"; license = lib.licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index f0cc7a23c6e3..6b384f1fc879 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -37,8 +37,8 @@ buildPythonPackage rec { meta = { description = "Python driver for PostgreSQL"; - homepage = "https://github.com/tlocke/pg8000"; - changelog = "https://github.com/tlocke/pg8000#release-notes"; + homepage = "https://codeberg.org/tlocke/pg8000"; + changelog = "https://codeberg.org/tlocke/pg8000/src/tag/${version}#release-notes"; license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index eb318545012f..bebda0eeb7f0 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -25,7 +25,6 @@ buildPythonPackage rec { meta = { description = "Support library for building plugins systems in Python"; homepage = "https://github.com/mitsuhiko/pluginbase"; - changelog = "https://github.com/mitsuhiko/pluginbase/releases/tag/${version}"; license = lib.licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix index e38083936fcb..68f1471d2869 100644 --- a/pkgs/development/python-modules/precis-i18n/default.nix +++ b/pkgs/development/python-modules/precis-i18n/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Internationalized usernames and passwords"; homepage = "https://github.com/byllyfish/precis_i18n"; - changelog = "https://github.com/byllyfish/precis_i18n/blob/${src.tag}/CHANGELOG.rst"; + changelog = "https://github.com/byllyfish/precis_i18n/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/py-cpuinfo/default.nix b/pkgs/development/python-modules/py-cpuinfo/default.nix index b2748ad0eaa0..fa5220003475 100644 --- a/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { Python. ''; homepage = "https://github.com/workhorsy/py-cpuinfo"; - changelog = "https://github.com/workhorsy/py-cpuinfo/blob/v${version}/ChangeLog"; + changelog = "https://github.com/workhorsy/py-cpuinfo/blob/${src.rev}/ChangeLog"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix index 37b25ca42834..28c0aaeef552 100644 --- a/pkgs/development/python-modules/py-ecc/default.nix +++ b/pkgs/development/python-modules/py-ecc/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "py_ecc" ]; meta = { - changelog = "https://github.com/ethereum/py_ecc/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/ethereum/py_ecc/blob/${src.rev}/docs/release_notes.rst"; description = "ECC pairing and bn_128 and bls12_381 curve operations"; homepage = "https://github.com/ethereum/py_ecc"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix index 40929339f835..882fdcfb150c 100644 --- a/pkgs/development/python-modules/pydantic-ai-slim/default.nix +++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix @@ -2,6 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, + nix-update, + writeShellApplication, # build-system hatchling, @@ -20,14 +22,14 @@ buildPythonPackage (finalAttrs: { pname = "pydantic-ai-slim"; - version = "2.13.0"; + version = "2.14.1"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-ai"; tag = "v${finalAttrs.version}"; - hash = "sha256-mp0LYmqh2AsXXCXkDFDv+eIEaPFqvtwsK2DZ2N3RMTs="; + hash = "sha256-pqgNRwe3PeBUtMX9evYze6oKUeQJwEO5x9/XS8f9ago="; }; sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim"; @@ -53,6 +55,18 @@ buildPythonPackage (finalAttrs: { doCheck = false; + passthru.updateScript = lib.getExe (writeShellApplication { + name = "pydantic-ai-updater"; + runtimeInputs = [ + nix-update + ]; + text = '' + nix-update --build --commit python3Packages.genai-prices + nix-update --build --commit python3Packages.pydantic-graph + nix-update --build --commit python3Packages.pydantic-ai-slim + ''; + }); + meta = { changelog = "https://github.com/pydantic/pydantic-ai/releases/tag/${finalAttrs.src.tag}"; description = "GenAI Agent Framework, the Pydantic way"; diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix index 22d1106f4894..2f3f123757bc 100644 --- a/pkgs/development/python-modules/pydantic-graph/default.nix +++ b/pkgs/development/python-modules/pydantic-graph/default.nix @@ -14,16 +14,19 @@ typing-inspection, }: +# Update together with pydantic-ai-slim +# nixpkgs-update: no auto update + buildPythonPackage (finalAttrs: { pname = "pydantic-graph"; - version = "2.13.0"; + version = "2.14.1"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-ai"; tag = "v${finalAttrs.version}"; - hash = "sha256-mp0LYmqh2AsXXCXkDFDv+eIEaPFqvtwsK2DZ2N3RMTs="; + hash = "sha256-pqgNRwe3PeBUtMX9evYze6oKUeQJwEO5x9/XS8f9ago="; }; sourceRoot = "${finalAttrs.src.name}/pydantic_graph"; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index e32c63e89ef4..c6b365bf23f1 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, replaceVars, - stdenv, graphviz, coreutils, pkg-config, @@ -12,10 +11,6 @@ pytest, }: -let - # TODO: remove once #540793 makes it to master - graphviz' = graphviz.override { withQuartz = stdenv.hostPlatform.isDarwin; }; -in buildPythonPackage (finalAttrs: { pname = "pygraphviz"; version = "2.0"; @@ -32,7 +27,7 @@ buildPythonPackage (finalAttrs: { # pygraphviz depends on graphviz executables and wc being in PATH (replaceVars ./path.patch { path = lib.makeBinPath [ - graphviz' + graphviz coreutils ]; }) @@ -43,19 +38,19 @@ buildPythonPackage (finalAttrs: { --replace-fail ', "swig>4.1.0"' "" ''; - env.GRAPHVIZ_PREFIX = graphviz'; + env.GRAPHVIZ_PREFIX = graphviz; build-system = [ setuptools ]; nativeBuildInputs = [ - graphviz' # for dot + graphviz # for dot pkg-config swig ]; - buildInputs = [ graphviz' ]; + buildInputs = [ graphviz ]; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 8d43f92e62ce..0f51a236fc73 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "pyoverkiz"; - version = "2.0.5"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "iMicknl"; repo = "python-overkiz-api"; tag = "v${finalAttrs.version}"; - hash = "sha256-LdOVhOWxejTXhgUwlbucYNDqhKJDov56IaEcvJvEBQ4="; + hash = "sha256-4qm/pjRVQDpRm8WOPpo/KZbbeEDgUg+etXbjTtFi8SU="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index faa32fc7dc0a..dc6ad358c88a 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -31,14 +31,14 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "8.3.2"; + version = "8.3.3"; pyproject = true; src = fetchFromGitHub { owner = "arangodb"; repo = "python-arango"; tag = version; - hash = "sha256-wN1KsOK5WidQDyyUII5OWsqMyIkh0XstPXKccNO0clI="; + hash = "sha256-4nDMu0n6O0C9QMPDXCA2TkN56zqajn8qQqB6ma+JvAA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix index 92a72f0f88ea..39e32e859fca 100644 --- a/pkgs/development/python-modules/python-sat/default.nix +++ b/pkgs/development/python-modules/python-sat/default.nix @@ -20,7 +20,7 @@ let in buildPythonPackage (finalAttrs: { pname = "python-sat"; - version = "1.9.dev5"; + version = "1.9.dev6"; pyproject = true; build-system = [ setuptools ]; @@ -28,7 +28,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { inherit (finalAttrs) version; pname = "python_sat"; - hash = "sha256-OxH2AQbusuv5aB/t85nrNOXAuyCfNFZRvMFMWFfmdhg="; + hash = "sha256-7YCz8nvHcKNKtgQoRShp/xgWHMyJ48GkFMZCkR+g54w="; }; # The kissat source archive is not included in the repo and pysat attempts to diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 844ef6a1f2f8..0fdd71f19769 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "rns"; - version = "1.3.9"; + version = "1.4.0"; pyproject = true; __structuredAttrs = true; src = fetchPypi { pname = "rns"; version = finalAttrs.version; - hash = "sha256-/TdFwauk3L+IM/qHoxV+yZAHRaMtbZa6Mw1iOpiTKhU="; + hash = "sha256-+p520KeL8lPq5mE35rvcZfRw2zlQqVsDTOMsqEX/DkQ="; }; patches = [ diff --git a/pkgs/development/python-modules/scaleway-core/default.nix b/pkgs/development/python-modules/scaleway-core/default.nix index ee31dc9e75a9..58636e4e8562 100644 --- a/pkgs/development/python-modules/scaleway-core/default.nix +++ b/pkgs/development/python-modules/scaleway-core/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, nix-update-script, poetry-core, + pyprojectVersionPatchHook, pytestCheckHook, python-dateutil, pyyaml, @@ -28,6 +29,8 @@ buildPythonPackage (finalAttrs: { build-system = [ poetry-core ]; + nativeBuildInputs = [ pyprojectVersionPatchHook ]; + dependencies = [ python-dateutil pyyaml diff --git a/pkgs/development/python-modules/scaleway/default.nix b/pkgs/development/python-modules/scaleway/default.nix index 2d855b7ff6b9..b84b1d38c9f7 100644 --- a/pkgs/development/python-modules/scaleway/default.nix +++ b/pkgs/development/python-modules/scaleway/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, nix-update-script, poetry-core, + pyprojectVersionPatchHook, scaleway-core, }: @@ -25,6 +26,8 @@ buildPythonPackage (finalAttrs: { build-system = [ poetry-core ]; + nativeBuildInputs = [ pyprojectVersionPatchHook ]; + dependencies = [ scaleway-core ]; # Tests require credentials diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index 1190d875005a..862240603244 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -28,14 +28,14 @@ buildPythonPackage (finalAttrs: { pname = "scikit-bio"; - version = "0.7.2"; + version = "0.7.3"; pyproject = true; src = fetchFromGitHub { owner = "scikit-bio"; repo = "scikit-bio"; tag = finalAttrs.version; - hash = "sha256-zBOUZukqLhTxKG9BluWB+2zTCx5ALhM1s+YP2itqg9A="; + hash = "sha256-7cptpv7x/2KJbyMCZ4X6wVVUMx+CDcZ6nOtbeUoD5a0="; }; build-system = [ diff --git a/pkgs/development/python-modules/sdkmanager/default.nix b/pkgs/development/python-modules/sdkmanager/default.nix index f332e584477f..4b4cec3c70a2 100644 --- a/pkgs/development/python-modules/sdkmanager/default.nix +++ b/pkgs/development/python-modules/sdkmanager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "sdkmanager"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; src = fetchFromGitLab { owner = "fdroid"; repo = "sdkmanager"; tag = version; - hash = "sha256-/MrRCR6TJ64DiL4D1290jik1L+jITi4dH9Tj3cjF+ms="; + hash = "sha256-UDl+hRNWuv6kmLLtz+FoPcwPOYY23uOnRzLaDwq1abI="; }; pythonRelaxDeps = [ "urllib3" ]; diff --git a/pkgs/development/python-modules/sense-energy/default.nix b/pkgs/development/python-modules/sense-energy/default.nix index 48be52a65efb..d878e8b22431 100644 --- a/pkgs/development/python-modules/sense-energy/default.nix +++ b/pkgs/development/python-modules/sense-energy/default.nix @@ -7,6 +7,7 @@ ciso8601, async-timeout, kasa-crypt, + msgpack, orjson, requests, websocket-client, @@ -15,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "sense-energy"; - version = "0.14.2"; + version = "0.14.3"; pyproject = true; src = fetchFromGitHub { owner = "scottbonline"; repo = "sense"; tag = finalAttrs.version; - hash = "sha256-QFwESlynFXV/OqD9LfPeUdIsWgK7R6XZqhSchmHUtSw="; + hash = "sha256-Ug58qKlFBe4DpAKMWNup7A2QTslGaaY2OMPyJtnfWfM="; }; postPatch = '' @@ -36,6 +37,7 @@ buildPythonPackage (finalAttrs: { aiohttp async-timeout kasa-crypt + msgpack orjson ciso8601 requests diff --git a/pkgs/development/python-modules/shaperglot/default.nix b/pkgs/development/python-modules/shaperglot/default.nix index 16492234750e..cd4c5682209f 100644 --- a/pkgs/development/python-modules/shaperglot/default.nix +++ b/pkgs/development/python-modules/shaperglot/default.nix @@ -2,66 +2,46 @@ lib, buildPythonPackage, fetchFromGitHub, - gflanguages, - num2words, - protobuf, pytestCheckHook, - pyyaml, - setuptools-scm, - setuptools, - strictyaml, - termcolor, - ufo2ft, - vharfbuzz, - youseedee, + rustPlatform, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "shaperglot"; - version = "0.6.4"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "googlefonts"; repo = "shaperglot"; - tag = "v${version}"; - hash = "sha256-O6z7TJpC54QkqX5/G1HKSvaDYty7B9BnCQ4FpsLsEMs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-g8f8Q2DvYNvm8i6S+9K/jhhUiuGw366dht0Khx3/INg="; }; - env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-ivl3Zq0HRn4yP9JKfbjSaaERjbQ3SAEWhHk6toFp8dE="; + }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "setuptools>=75.0.0" "setuptools" + cd shaperglot-py ''; - build-system = [ - setuptools - setuptools-scm - ]; + cargoRoot = ".."; - dependencies = [ - gflanguages - num2words - protobuf - pyyaml - strictyaml - termcolor - ufo2ft - vharfbuzz - youseedee + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "shaperglot" ]; meta = { description = "Tool to test OpenType fonts for language support"; homepage = "https://github.com/googlefonts/shaperglot"; - changelog = "https://github.com/googlefonts/shaperglot/releases/tag/v${version}"; + changelog = "https://github.com/googlefonts/shaperglot/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ danc86 ]; mainProgram = "shaperglot"; }; -} +}) diff --git a/pkgs/development/python-modules/sqlalchemy/1.3-0001-fix-create-new-event-loop-if-not-exists.patch b/pkgs/development/python-modules/sqlalchemy/1.3-0001-fix-create-new-event-loop-if-not-exists.patch deleted file mode 100644 index e10c13868423..000000000000 --- a/pkgs/development/python-modules/sqlalchemy/1.3-0001-fix-create-new-event-loop-if-not-exists.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 98fd6e87243c6d5992429a9b90426af73dbcc3ff Mon Sep 17 00:00:00 2001 -From: Bart Oostveen -Date: Fri, 10 Jul 2026 13:59:21 +0200 -Subject: [PATCH] fix: create new event loop if not exists - ---- - lib/sqlalchemy/util/_concurrency_py3k.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/sqlalchemy/util/_concurrency_py3k.py b/lib/sqlalchemy/util/_concurrency_py3k.py -index 1e4ffef..5aaf12c 100644 ---- a/lib/sqlalchemy/util/_concurrency_py3k.py -+++ b/lib/sqlalchemy/util/_concurrency_py3k.py -@@ -190,6 +190,8 @@ def get_event_loop(): - try: - return asyncio.get_running_loop() - except RuntimeError: -- return asyncio.get_event_loop_policy().get_event_loop() -+ loop = asyncio.new_event_loop() -+ asyncio.set_event_loop(loop) -+ return loop - else: - return asyncio.get_event_loop() --- -2.54.0 - diff --git a/pkgs/development/python-modules/sqlalchemy/1_3.nix b/pkgs/development/python-modules/sqlalchemy/1_3.nix deleted file mode 100644 index 38670bc2b31c..000000000000 --- a/pkgs/development/python-modules/sqlalchemy/1_3.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - - # build-system - setuptools, - - # dependencies - greenlet, - - # optionals - cx-oracle, - mysqlclient, - pg8000, - psycopg2, - psycopg2cffi, - # TODO: pymssql - pymysql, - pyodbc, - - # tests - mock, - pytest-xdist, - pytestCheckHook, -}: - -buildPythonPackage (finalAttrs: { - pname = "sqlalchemy"; - version = "1.3.24"; - pyproject = true; - - src = fetchFromGitHub { - owner = "sqlalchemy"; - repo = "sqlalchemy"; - tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-6qAjyqMVrugABHssAQuql3z1YHTAOSm5hARJuJXJJvo="; - }; - - patches = [ ./1.3-0001-fix-create-new-event-loop-if-not-exists.patch ]; - - postPatch = '' - sed -i '/tag_build = dev/d' setup.cfg - ''; - - build-system = [ setuptools ]; - - dependencies = [ greenlet ]; - - optional-dependencies = lib.fix (self: { - mssql = [ pyodbc ]; - mssql_pymysql = [ - # TODO: pymssql - ]; - mssql_pyodbc = [ pyodbc ]; - mysql = [ mysqlclient ]; - oracle = [ cx-oracle ]; - postgresql = [ psycopg2 ]; - postgresql_pg8000 = [ pg8000 ]; - postgresql_psycopg2binary = [ psycopg2 ]; - postgresql_psycopg2cffi = [ psycopg2cffi ]; - pymysql = [ pymysql ]; - }); - - nativeCheckInputs = [ - pytest-xdist - pytestCheckHook - mock - ]; - - disabledTestPaths = [ - # typing correctness, not interesting - "test/ext/mypy" - # slow and high memory usage, not interesting - "test/aaa_profiling" - ]; - - pythonImportsCheck = [ "sqlalchemy" ]; - - meta = { - changelog = - let - shortVersion = lib.replaceString "." "" (lib.versions.majorMinor finalAttrs.version); - in - "https://github.com/sqlalchemy/sqlalchemy/blob/${finalAttrs.src.rev}/doc/build/changelog/changelog_${shortVersion}.rst"; - description = "Database Toolkit for Python"; - homepage = "https://github.com/sqlalchemy/sqlalchemy"; - license = lib.licenses.mit; - }; -}) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 47e552a0f890..c30b150a038f 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.136"; + version = "3.1.138"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = finalAttrs.version; - hash = "sha256-KU4nA3SpcCN1PmrYJ2Yy/3ECXcy+P5nnuETd0NT5EE0="; + hash = "sha256-QzQtubmTzKYiKY5j/Ol0VfsbxP6/Cs6u7JZ1iRj5660="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index 072c3185b234..4695bdb13acc 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -2,23 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, ua-parser, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "user-agents"; version = "2.2.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; # PyPI is missing devices.json src = fetchFromGitHub { owner = "selwin"; repo = "python-user-agents"; - rev = "v${version}"; - sha256 = "0pcbjqj21c2ixhl414bh2h8khi8y1igzfpkyqwan1pakix0lq45a"; + tag = "v${finalAttrs.version}"; + hash = "sha256-qhBMQY9T3WAVx35e918MHkU4ERRwkUAo7FGwICSWi10="; }; - propagatedBuildInputs = [ ua-parser ]; + build-system = [ setuptools ]; + + dependencies = [ ua-parser ]; + + pythonImportsCheck = [ "user_agents" ]; meta = { description = "Python library to identify devices by parsing user agent strings"; @@ -27,4 +34,4 @@ buildPythonPackage rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/vegafusion/default.nix b/pkgs/development/python-modules/vegafusion/default.nix index c53d97e00fdc..1feb046ad299 100644 --- a/pkgs/development/python-modules/vegafusion/default.nix +++ b/pkgs/development/python-modules/vegafusion/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { hash = "sha256-yiECw9WGd+03KFOWa+bwR10gQFqzx4Riy6uw2zwdc3s="; }; + patches = [ + ./fix-test_transformer.patch + ]; + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; diff --git a/pkgs/development/python-modules/vegafusion/fix-test_transformer.patch b/pkgs/development/python-modules/vegafusion/fix-test_transformer.patch new file mode 100644 index 000000000000..71c14c2bf78d --- /dev/null +++ b/pkgs/development/python-modules/vegafusion/fix-test_transformer.patch @@ -0,0 +1,47 @@ +From 5ba473229913031b2b3053371db7887d23b45ff8 Mon Sep 17 00:00:00 2001 +From: Mario <191101255+wariuccio@users.noreply.github.com> +Date: Tue, 14 Jul 2026 20:10:05 +0100 +Subject: [PATCH] Relax data type checks in `test_transformer.py` + +https://github.com/vega/vegafusion/issues/591 +--- + vegafusion-python/tests/test_transformer.py | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/vegafusion-python/tests/test_transformer.py b/vegafusion-python/tests/test_transformer.py +index 8852bb068..fe7f87e1e 100644 +--- a/vegafusion-python/tests/test_transformer.py ++++ b/vegafusion-python/tests/test_transformer.py +@@ -17,7 +17,7 @@ def test_to_arrow_expands_categoricals(): + + # Check that pyarrow type is String (not Dictionary) + b_type = pa_table.column("b").type +- assert b_type == pa.string() ++ assert b_type == pa.string() or b_type == pa.large_string() + + + def test_to_table_converts_decimals(): +@@ -45,7 +45,7 @@ def test_to_table_with_mixed_string_int_column(): + + # Check that pyarrow type is float64 (not Decimal128) + b_type = pa_table.column("b").type +- assert b_type == pa.string() ++ assert b_type == pa.string() or b_type == pa.large_string() + + + def test_to_table_with_all_conversions(): +@@ -68,6 +68,12 @@ def test_to_table_with_all_conversions(): + pa_table = to_arrow_table(df) + + # Check pyarrow types +- assert pa_table.column("b").type == pa.string() ++ assert ( ++ pa_table.column("b").type == pa.string() ++ or pa_table.column("b").type == pa.large_string() ++ ) + assert pa_table.column("c").type == pa.float64() +- assert pa_table.column("d").type == pa.string() ++ assert ( ++ pa_table.column("d").type == pa.string() ++ or pa_table.column("d").type == pa.large_string() ++ ) diff --git a/pkgs/development/python-modules/wasmtime/default.nix b/pkgs/development/python-modules/wasmtime/default.nix index 3eea7f3f5268..3cc70aebe1b4 100644 --- a/pkgs/development/python-modules/wasmtime/default.nix +++ b/pkgs/development/python-modules/wasmtime/default.nix @@ -18,14 +18,14 @@ let in buildPythonPackage (finalAttrs: { pname = "wasmtime"; - version = "46.0.1"; + version = "47.0.1"; pyproject = true; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wasmtime-py"; tag = finalAttrs.version; - hash = "sha256-PWMrmr9PPi98lQe5+KaY4bPLOYyJ5qYugMJwVwwnuwA="; + hash = "sha256-EtozWiHv354jDu0pHAI2vnx1c53Ldq4WBhTSFPZICSs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix index 406e50661c5d..0383a478b031 100644 --- a/pkgs/development/python-modules/zamg/default.nix +++ b/pkgs/development/python-modules/zamg/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.3.6"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "killer0071234"; repo = "python-zamg"; tag = "v${version}"; - hash = "sha256-j864+3c0GDDftdLqLDD0hizT54c0IgTjT77jOneXlq0="; + hash = "sha256-kWdSXaD7+c7UrlRP47DjKbmVTHqWUveDowIDFSK3Plk="; }; pythonRelaxDeps = [ "async-timeout" ]; diff --git a/pkgs/development/rocm-modules/release-attrPaths.json b/pkgs/development/rocm-modules/release-attrPaths.json index f86ebf24603d..4b0111764e46 100644 --- a/pkgs/development/rocm-modules/release-attrPaths.json +++ b/pkgs/development/rocm-modules/release-attrPaths.json @@ -187,7 +187,6 @@ "python3Packages.accelerate", "python3Packages.adios2", "python3Packages.aigpy", - "python3Packages.albumentations", "python3Packages.ale-py", "python3Packages.anndata", "python3Packages.apptools", diff --git a/pkgs/development/rocq-modules/mathcomp-analysis/default.nix b/pkgs/development/rocq-modules/mathcomp-analysis/default.nix index 3941139e8770..96f83c3bb377 100644 --- a/pkgs/development/rocq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/rocq-modules/mathcomp-analysis/default.nix @@ -31,7 +31,7 @@ let lib.switch [ rocq-core.rocq-version mathcomp.version ] [ - (case (range "9.0" "9.1") (range "2.4.0" "2.5.0") "1.16.0") + (case (range "9.0" "9.2") (range "2.4.0" "2.6.0") "1.16.0") ] null; diff --git a/pkgs/development/rocq-modules/mathcomp-bigenough/default.nix b/pkgs/development/rocq-modules/mathcomp-bigenough/default.nix index 71f3ca0c6be2..2fd7f57d8f3a 100644 --- a/pkgs/development/rocq-modules/mathcomp-bigenough/default.nix +++ b/pkgs/development/rocq-modules/mathcomp-bigenough/default.nix @@ -25,7 +25,7 @@ mkRocqDerivation { in with lib.versions; lib.switch rocq-core.rocq-version [ - (case (range "9.0" "9.1") "1.0.4") + (case (range "9.0" "9.2") "1.0.4") ] null; propagatedBuildInputs = [ mathcomp-boot ]; diff --git a/pkgs/development/rocq-modules/mathcomp-finmap/default.nix b/pkgs/development/rocq-modules/mathcomp-finmap/default.nix index 8e5ed395218d..7d71d4767c61 100644 --- a/pkgs/development/rocq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/rocq-modules/mathcomp-finmap/default.nix @@ -29,10 +29,12 @@ mkRocqDerivation { lib.switch [ rocq-core.rocq-version mathcomp-boot.version ] [ + (case (range "9.2" "9.2") (range "2.5" "2.6") "2.2.4") # also compiles on Rocq 9.0 and 9.1 (but requires graph-theory update) (case (range "9.0" "9.1") (range "2.3" "2.5") "2.2.2") ] null; release = { + "2.2.4".sha256 = "sha256-sEok7UhXiPdIH8/wzvVhXg1yprCETVmxMzeFRHh6Tug="; "2.2.2".sha256 = "sha256-G5fSdx4MhOXtQ2H8lpyK5FuIbWAZNc7vRL3hcYmGA2o="; }; diff --git a/pkgs/development/rocq-modules/mathcomp-real-closed/default.nix b/pkgs/development/rocq-modules/mathcomp-real-closed/default.nix index 8a8fa9c78a2c..8f26ad0b6dbe 100644 --- a/pkgs/development/rocq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/rocq-modules/mathcomp-real-closed/default.nix @@ -18,6 +18,7 @@ mkRocqDerivation { inherit version; release = { "2.0.5".sha256 = "sha256-nns1TF3isv8FpWqtXilfMEVKvR50fvS6MXnYVzbCzVs="; + "2.0.6".sha256 = "sha256-c+0nlNTjTf115vjvnpLrgXye5YdjsWlsCBpGZj+hU9E="; }; defaultVersion = @@ -34,7 +35,8 @@ mkRocqDerivation { lib.switch [ rocq-core.version mathcomp.version ] [ - (case (range "9.0" "9.2") (isGe "2.5.0") "2.0.5") + (case (range "9.0" "9.2") (isGe "2.6.0") "2.0.6") + (case (range "9.0" "9.2") (isEq "2.5.0") "2.0.5") ] null; diff --git a/pkgs/development/rocq-modules/mathcomp/default.nix b/pkgs/development/rocq-modules/mathcomp/default.nix index 05de2bbd843c..1c25a1bbe76d 100644 --- a/pkgs/development/rocq-modules/mathcomp/default.nix +++ b/pkgs/development/rocq-modules/mathcomp/default.nix @@ -35,9 +35,11 @@ let inherit (lib.versions) range; in lib.switch rocq-core.rocq-version [ + (case (range "9.2" "9.2") "2.6.0") # also compiles on Rocq 9.0 and 9.1 (case (range "9.0" "9.1") "2.5.0") ] null; release = { + "2.6.0".sha256 = "sha256-SovoQ++213r8ISljts81j9E9G1vxVrFy+hhpsCw1fDY="; "2.5.0".sha256 = "sha256-M/6IP4WhTQ4j2Bc8nXBXjSjWO08QzNIYI+a2owfOh+8="; }; releaseRev = v: "mathcomp-${v}"; diff --git a/pkgs/development/tools/godot/4.7/default.nix b/pkgs/development/tools/godot/4.7/default.nix index 81ccf416ba37..3d411ed36a14 100644 --- a/pkgs/development/tools/godot/4.7/default.nix +++ b/pkgs/development/tools/godot/4.7/default.nix @@ -1,11 +1,11 @@ { - version = "4.7-stable"; - hash = "sha256-ur9bQ6DTUxeTRqFITAgjpyoOEHgYnjEAQY3sSNNtr0c="; + version = "4.7.1-stable"; + hash = "sha256-3JzJuFbicIJ4AiEVxh5t1/q9mjxwFXZvTAfEBdrIzsc="; default = { - exportTemplatesHash = "sha256-lxRFncBxkHwPPV8X1gj69p582iEzH8XTnEUD/6Tpnuw="; + exportTemplatesHash = "sha256-hkCdtiALb4/TIwmJwtIAKFHz3Ris8R1726/d9aDdD3I="; }; mono = { - exportTemplatesHash = "sha256-TAKguZrZxbwkPC55RoYo2z34k1DZ24/JlZiPadEm4Gk="; + exportTemplatesHash = "sha256-75pwi+UezZdM19zNyv16GHDaPT4cJMByvbuYGMen22M="; nugetDeps = ./deps.json; }; } diff --git a/pkgs/os-specific/linux/tt-kmd/default.nix b/pkgs/os-specific/linux/tt-kmd/default.nix index 1e3923f6f787..ebe56b8bf6f9 100644 --- a/pkgs/os-specific/linux/tt-kmd/default.nix +++ b/pkgs/os-specific/linux/tt-kmd/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "tt-kmd"; - version = "2.7.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "tenstorrent"; repo = "tt-kmd"; tag = "ttkmd-${finalAttrs.version}"; - hash = "sha256-+4Wqj91EsPthKQXajiDd9Y77oTp9BNqCgFCQrTAp6ag="; + hash = "sha256-CMZk1q/ybrpNEr8XoCtMsV5127bYKsUXl0ZitImIaPY="; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json index 5a5083ef47d5..9c3afac7e3b1 100644 --- a/pkgs/servers/nextcloud/packages/32.json +++ b/pkgs/servers/nextcloud/packages/32.json @@ -1,8 +1,8 @@ { "bookmarks": { - "hash": "sha256-8F+sNG/+M8Ed/q5dcxW95KS5ZBNsEeZNR0P2OIe/HqQ=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.2.2/bookmarks-16.2.2.tar.gz", - "version": "16.2.2", + "hash": "sha256-0jBKcGX6ljlXruILcKlsm7ZBrC5hyDuHp/9lgG0eoBE=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.2.4/bookmarks-16.2.4.tar.gz", + "version": "16.2.4", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-k7A38geyX6PS2j2t5iIXMMZMJsPKIiySVRKxcPAj+pM=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.5.0/calendar-v6.5.0.tar.gz", - "version": "6.5.0", + "hash": "sha256-aqMBHxBDvOba/4nP93iJfmYYKz7J0QRs3S8xOQCEHNY=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.5.1/calendar-v6.5.1.tar.gz", + "version": "6.5.1", "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -40,9 +40,9 @@ ] }, "contacts": { - "hash": "sha256-rFKmEZtyQgFjGBN44H167hGQP+n72uhUEiXlD7OguTI=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.15/contacts-v8.3.15.tar.gz", - "version": "8.3.15", + "hash": "sha256-KiSsvKFN2D+qoJcOGY1pfWA6FDP92rmGuPJnYPxybgc=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.3.16/contacts-v8.3.16.tar.gz", + "version": "8.3.16", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -89,14 +89,24 @@ "agpl" ] }, + "drawio": { + "hash": "sha256-CPwTRdS9pHNzIeLYSqSbY9nVUGqBT3awr9IlKng0baI=", + "url": "https://github.com/arnowelzel/drawio-nextcloud/releases/download/v4.1.2/drawio-v4.1.2.tar.gz", + "version": "4.1.2", + "description": "Integrates the diagrams.net diagram editor with Nextcloud. Users can create and edit .drawio diagrams and .dwb whiteboards directly within the Nextcloud file manager.\n\n**Features:**\n\n- Create and edit diagrams and whiteboards from the Nextcloud \"+\" menu\n- Click any .drawio or .dwb file to open the editor inline\n- Autosave with optimistic conflict detection\n- Inline diagram previews in Text, Collectives, Talk, Notes, and Deck\n- Supports public share links (read-only and editable)\n- Offline mode for privacy-sensitive deployments\n- Configurable editor URL for self-hosted diagrams.net instances", + "homepage": "https://github.com/arnowelzel/drawio-nextcloud", + "licenses": [ + "agpl" + ] + }, "end_to_end_encryption": { - "hash": "sha256-McIkFt53L1O+kb4zA3VisbgCKlcdht/DqPQKDOQTLds=", - "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.18.2/end_to_end_encryption-v1.18.2.tar.gz", - "version": "1.18.2", + "hash": "sha256-Tlv1zPWp8mLpZFrsxcbfqqro1tx5XGS+vgxrEYWe054=", + "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.18.3/end_to_end_encryption-v1.18.3.tar.gz", + "version": "1.18.3", "description": "## **End-to-End Encryption**\n\n### For End Users\n\n**Protect your most sensitive files with strong encryption.**\n\nThe End-to-End Encryption app gives you complete control over your data privacy.\nWith this app, you can encrypt specific folders so that only you (and those you trust) can access their contents.\nYour files are encrypted on your device before they reach the server, ensuring that no one—not even the server administrator—can read them.\n\n**Benefits:**\n- 🔒 **True privacy**: Files are encrypted on your device and can only be decrypted by you\n- 📱 **Works across all platforms**: Fully supported on desktop, Android, iOS clients, and as you wish even in the browser\n- 🎯 **Selective encryption**: Choose which folders to encrypt\n- 🛡️ **Secure sharing**: Share encrypted files with other users or even secure public upload using the encrypted file drop\n\n---\n\n### For Administrators\n\n**Enterprise-ready end-to-end encryption infrastructure for your Nextcloud instance.**\n\nThis app provides all the necessary server-side APIs and infrastructure to enable End-to-End encryption (E2EE) for your users.\nIt ensures that encrypted data remains secure throughout its lifecycle on your server.\n\n**Technical highlights:**\n- 🔐 **Complete API suite**: Provides all client-side APIs needed for E2EE implementation\n- 🔒 **Secure FileDrop integration**: Enables secure file sharing with encryption\n- 🛡️ **Zero-knowledge architecture**: Server never has access to encryption keys\n- ⚙️ **Group restrictions**: Limit app usage to specific user groups if needed\n- 🔄 **Background job management**: Automatic rollback handling for failed operations\n\n### Setup\nThis application provides the server-side infrastructure for end-to-end encryption, but it requires client support to function.\nTo enable end-to-end encryption, users will need to install the corresponding client-side app on their devices (desktop, Android, iOS) or use the web client.\n\nUsing the web interface, after enabling it in the personal settings, allows you to encrypt files and folders directly in the browser,\nproviding a seamless experience without needing additional software. But also requires some kind of trust in the server as the code is delivered by the server and could be manipulated.\n\nOnce enable through clients or the web interface, you can create encrypted folders and upload or move files into them.\nThe clients and the web interface will handle the encryption and decryption processes automatically.\n\n⚠️ This comes with some limitations and caveats, as only normal file operations can be handled.\nMeaning that some apps in the web interface do not work with encrypted files.", "homepage": "https://github.com/nextcloud/end_to_end_encryption", "licenses": [ - "agpl" + "AGPL-3.0-or-later" ] }, "files_automatedtagging": { @@ -130,9 +140,9 @@ ] }, "forms": { - "hash": "sha256-r570gxd4j/AEMzT3vul6qxJsJ/bTEW459LONUOYA8ZM=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.3.2/forms-v5.3.2.tar.gz", - "version": "5.3.2", + "hash": "sha256-vd6qwBAGUtm+Fbfc/Ei1mtmENX5Zvz5ZlW1MGggytJ0=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.3.4/forms-v5.3.4.tar.gz", + "version": "5.3.4", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API_v3.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -150,9 +160,9 @@ ] }, "groupfolders": { - "hash": "sha256-rOa82k/IwJdAweCzkZKLLqiOtP63eRdq98zxlnttFzc=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.16/groupfolders-v20.1.16.tar.gz", - "version": "20.1.16", + "hash": "sha256-7afza6xNdNqNzIhiRuRHyhruATFrJmlaQm/fYQNS3Pw=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.17/groupfolders-v20.1.17.tar.gz", + "version": "20.1.17", "description": "Team Folders (formerly \"Group Folders\") allows administrators to create and manage shared\nfolders for selected teams within Nextcloud.\n\nAdmins can grant one or more teams access to a folder, configure permissions (such as read,\nwrite, and sharing rights), and assign storage quotas from the Team Folders section (under\nadmin settings). The app also supports advanced permissions and integration with Nextcloud’s\ntrash and versioning systems.\n\nAs of Hub 10 / Nextcloud 31, admins must be members of a team to assign that team to a Team\nFolder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -210,9 +220,9 @@ ] }, "mail": { - "hash": "sha256-c0pMd+A2Fbxa/20BAkg3lPeVRIdu0XRTbAGJxb/9NT0=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.10.7/mail-v5.10.7.tar.gz", - "version": "5.10.7", + "hash": "sha256-r7x9WkBAYw2KJ6D2FcLqbKHTHpVUP/z2eLjy4QorL7k=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.10.8/mail-v5.10.8.tar.gz", + "version": "5.10.8", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -230,9 +240,9 @@ ] }, "music": { - "hash": "sha256-bQ9NBo5R/en3f68ag+mAsVWuhREjr/ajlKrfLn4Tvtg=", - "url": "https://github.com/nc-music/music/releases/download/v3.1.0/nc-music-3.1.0.tar.gz", - "version": "3.1.0", + "hash": "sha256-H8GsbDCdtHMKqsOVsyZA7nTBdBx0B+sfKdL5QupHEDI=", + "url": "https://github.com/nc-music/music/releases/download/v3.1.1/nc-music-3.1.1.tar.gz", + "version": "3.1.1", "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to scrobble plays and/or see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard", "homepage": "https://github.com/nc-music/music", "licenses": [ @@ -370,9 +380,9 @@ ] }, "richdocuments": { - "hash": "sha256-oLV1AFCGt/ukZ06TkOpEBGxOPQ3Z66dY2rpDj0tXiP4=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v9.1.0/richdocuments-v9.1.0.tar.gz", - "version": "9.1.0", + "hash": "sha256-s/3SPckGmlTH+nS7VTqbDcBOgiLjW6RQsc6dwdg/zYE=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v9.1.1/richdocuments-v9.1.1.tar.gz", + "version": "9.1.1", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -380,9 +390,9 @@ ] }, "sociallogin": { - "hash": "sha256-8yB+PFGi9+bUjiEEHBJxAyySMluPO/1m3sPUThe5+t0=", - "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.5.2/release.tar.gz", - "version": "6.5.2", + "hash": "sha256-/mnpEUfyhjGG31TKzFEfKUuzflPL+pGcf6PRbNnkaUE=", + "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.5.3/release.tar.gz", + "version": "6.5.3", "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. Multiple claims (comma separated) also supported - groups will be merged.\nThe format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n \"client-id\": {\n \"roles\": [\n \"client-role-1\",\n \"client-role-2\"\n ]\n }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n 'social_login_http_client' => [\n 'timeout' => 45,\n 'proxy' => 'socks4://127.0.0.1:9050', // See for allowed formats\n ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: \n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.", "homepage": "https://github.com/zorn-v/nextcloud-social-login", "licenses": [ @@ -480,9 +490,9 @@ ] }, "user_saml": { - "hash": "sha256-LDiWtEaVJbNECJkcn80L4behkUyUsRlDFDd2lk2g+pE=", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.1.4/user_saml-v8.1.4.tar.gz", - "version": "8.1.4", + "hash": "sha256-HseXj3gaVa1rjJ/C1N6x223yU0usyJ7rt8RqhVMKiDY=", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.2.0/user_saml-v8.2.0.tar.gz", + "version": "8.2.0", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\t* Authentik\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/33.json b/pkgs/servers/nextcloud/packages/33.json index a075bf2f9b1d..fb38f293f2b8 100644 --- a/pkgs/servers/nextcloud/packages/33.json +++ b/pkgs/servers/nextcloud/packages/33.json @@ -1,8 +1,8 @@ { "bookmarks": { - "hash": "sha256-8F+sNG/+M8Ed/q5dcxW95KS5ZBNsEeZNR0P2OIe/HqQ=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.2.2/bookmarks-16.2.2.tar.gz", - "version": "16.2.2", + "hash": "sha256-0jBKcGX6ljlXruILcKlsm7ZBrC5hyDuHp/9lgG0eoBE=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.2.4/bookmarks-16.2.4.tar.gz", + "version": "16.2.4", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-k7A38geyX6PS2j2t5iIXMMZMJsPKIiySVRKxcPAj+pM=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.5.0/calendar-v6.5.0.tar.gz", - "version": "6.5.0", + "hash": "sha256-aqMBHxBDvOba/4nP93iJfmYYKz7J0QRs3S8xOQCEHNY=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.5.1/calendar-v6.5.1.tar.gz", + "version": "6.5.1", "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -40,9 +40,9 @@ ] }, "contacts": { - "hash": "sha256-Lgw+wF40FlZTlbw5IXG/eUW8Chaw5Cm1i9f2R8YyPRU=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.7.3/contacts-v8.7.3.tar.gz", - "version": "8.7.3", + "hash": "sha256-2oDKASmKBOahKq2cDSIDr7ud2/plNK0DL0ReJKpHzAc=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.7.4/contacts-v8.7.4.tar.gz", + "version": "8.7.4", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -89,10 +89,20 @@ "agpl" ] }, + "drawio": { + "hash": "sha256-nVcO2V0zo7VdL/o8c6IRbiIqFnGBH7NdqL/eefQ/ip0=", + "url": "https://github.com/arnowelzel/drawio-nextcloud/releases/download/v4.3.0/drawio-v4.3.0.tar.gz", + "version": "4.3.0", + "description": "Integrates the diagrams.net diagram editor with Nextcloud. Users can create and edit .drawio diagrams and .dwb whiteboards directly within the Nextcloud file manager.\n\n**Features:**\n\n- Create and edit diagrams and whiteboards from the Nextcloud \"+\" menu\n- Click any .drawio or .dwb file to open the editor inline\n- Autosave with optimistic conflict detection\n- Inline diagram previews in Text, Collectives, Talk, Notes, and Deck\n- Supports public share links (read-only and editable)\n- Offline mode for privacy-sensitive deployments\n- Configurable editor URL for self-hosted diagrams.net instances", + "homepage": "https://github.com/arnowelzel/drawio-nextcloud", + "licenses": [ + "agpl" + ] + }, "end_to_end_encryption": { - "hash": "sha256-Z6MyXz//LNVy7Mt+yFbHIY5zGEMfsdwnAEDFsIcrs1M=", - "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v2.2.0/end_to_end_encryption-v2.2.0.tar.gz", - "version": "2.2.0", + "hash": "sha256-NfnIdc2Q8GgfgjqD8PeTS+O5vTWMBld+vCX/6ng/Im8=", + "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v2.2.1/end_to_end_encryption-v2.2.1.tar.gz", + "version": "2.2.1", "description": "## **End-to-End Encryption**\n\n### For End Users\n\n**Protect your most sensitive files with strong encryption.**\n\nThe End-to-End Encryption app gives you complete control over your data privacy.\nWith this app, you can encrypt specific folders so that only you (and those you trust) can access their contents.\nYour files are encrypted on your device before they reach the server, ensuring that no one—not even the server administrator—can read them.\n\n**Benefits:**\n- 🔒 **True privacy**: Files are encrypted on your device and can only be decrypted by you\n- 📱 **Works across all platforms**: Fully supported on desktop, Android, iOS clients, and as you wish even in the browser\n- 🎯 **Selective encryption**: Choose which folders to encrypt\n- 🛡️ **Secure sharing**: Share encrypted files with other users or even secure public upload using the encrypted file drop\n\n---\n\n### For Administrators\n\n**Enterprise-ready end-to-end encryption infrastructure for your Nextcloud instance.**\n\nThis app provides all the necessary server-side APIs and infrastructure to enable End-to-End encryption (E2EE) for your users.\nIt ensures that encrypted data remains secure throughout its lifecycle on your server.\n\n**Technical highlights:**\n- 🔐 **Complete API suite**: Provides all client-side APIs needed for E2EE implementation\n- 🔒 **Secure FileDrop integration**: Enables secure file sharing with encryption\n- 🛡️ **Zero-knowledge architecture**: Server never has access to encryption keys\n- ⚙️ **Group restrictions**: Limit app usage to specific user groups if needed\n- 🔄 **Background job management**: Automatic rollback handling for failed operations\n\n### Setup\nThis application provides the server-side infrastructure for end-to-end encryption, but it requires client support to function.\nTo enable end-to-end encryption, users will need to install the corresponding client-side app on their devices (desktop, Android, iOS) or use the web client.\n\nUsing the web interface, after enabling it in the personal settings, allows you to encrypt files and folders directly in the browser,\nproviding a seamless experience without needing additional software. But also requires some kind of trust in the server as the code is delivered by the server and could be manipulated.\n\nOnce enable through clients or the web interface, you can create encrypted folders and upload or move files into them.\nThe clients and the web interface will handle the encryption and decryption processes automatically.\n\n⚠️ This comes with some limitations and caveats, as only normal file operations can be handled.\nMeaning that some apps in the web interface do not work with encrypted files.", "homepage": "https://github.com/nextcloud/end_to_end_encryption", "licenses": [ @@ -130,9 +140,9 @@ ] }, "forms": { - "hash": "sha256-r570gxd4j/AEMzT3vul6qxJsJ/bTEW459LONUOYA8ZM=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.3.2/forms-v5.3.2.tar.gz", - "version": "5.3.2", + "hash": "sha256-vd6qwBAGUtm+Fbfc/Ei1mtmENX5Zvz5ZlW1MGggytJ0=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.3.4/forms-v5.3.4.tar.gz", + "version": "5.3.4", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API_v3.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -150,13 +160,13 @@ ] }, "groupfolders": { - "hash": "sha256-2LlfB3hCX2RvIxG6W0LY4vz9833C/TX8rI0/Ab3jiiE=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v21.0.9/groupfolders-v21.0.9.tar.gz", - "version": "21.0.9", + "hash": "sha256-elHsIh1LD/5c1BT/+YLMSMLtMXdLacTPpU4SSORdjw0=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v21.0.10/groupfolders-v21.0.10.tar.gz", + "version": "21.0.10", "description": "Team Folders (formerly \"Group Folders\") allows administrators to create and manage shared\nfolders for selected teams within Nextcloud.\n\nAdmins can grant one or more teams access to a folder, configure permissions (such as read,\nwrite, and sharing rights), and assign storage quotas from the Team Folders section (under\nadmin settings). The app also supports advanced permissions and integration with Nextcloud’s\ntrash and versioning systems.\n\nAs of Hub 10 / Nextcloud 31, admins must be members of a team to assign that team to a Team\nFolder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ - "agpl" + "AGPL-3.0-or-later" ] }, "guests": { @@ -210,9 +220,9 @@ ] }, "mail": { - "hash": "sha256-c0pMd+A2Fbxa/20BAkg3lPeVRIdu0XRTbAGJxb/9NT0=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.10.7/mail-v5.10.7.tar.gz", - "version": "5.10.7", + "hash": "sha256-r7x9WkBAYw2KJ6D2FcLqbKHTHpVUP/z2eLjy4QorL7k=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.10.8/mail-v5.10.8.tar.gz", + "version": "5.10.8", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -230,9 +240,9 @@ ] }, "music": { - "hash": "sha256-bQ9NBo5R/en3f68ag+mAsVWuhREjr/ajlKrfLn4Tvtg=", - "url": "https://github.com/nc-music/music/releases/download/v3.1.0/nc-music-3.1.0.tar.gz", - "version": "3.1.0", + "hash": "sha256-H8GsbDCdtHMKqsOVsyZA7nTBdBx0B+sfKdL5QupHEDI=", + "url": "https://github.com/nc-music/music/releases/download/v3.1.1/nc-music-3.1.1.tar.gz", + "version": "3.1.1", "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to scrobble plays and/or see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard", "homepage": "https://github.com/nc-music/music", "licenses": [ @@ -370,9 +380,9 @@ ] }, "richdocuments": { - "hash": "sha256-HGNCueLlZuauHi/0dltApMDj8FBZ4Ruj2T2F+/4qWY4=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v10.2.0/richdocuments-v10.2.0.tar.gz", - "version": "10.2.0", + "hash": "sha256-MfqxhuPGUiKBP8a8yrzFWORaMxyOWRhkYPCPFDh2K/A=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v10.2.1/richdocuments-v10.2.1.tar.gz", + "version": "10.2.1", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -380,9 +390,9 @@ ] }, "sociallogin": { - "hash": "sha256-8yB+PFGi9+bUjiEEHBJxAyySMluPO/1m3sPUThe5+t0=", - "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.5.2/release.tar.gz", - "version": "6.5.2", + "hash": "sha256-/mnpEUfyhjGG31TKzFEfKUuzflPL+pGcf6PRbNnkaUE=", + "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.5.3/release.tar.gz", + "version": "6.5.3", "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. Multiple claims (comma separated) also supported - groups will be merged.\nThe format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n \"client-id\": {\n \"roles\": [\n \"client-role-1\",\n \"client-role-2\"\n ]\n }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n 'social_login_http_client' => [\n 'timeout' => 45,\n 'proxy' => 'socks4://127.0.0.1:9050', // See for allowed formats\n ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: \n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.", "homepage": "https://github.com/zorn-v/nextcloud-social-login", "licenses": [ @@ -480,9 +490,9 @@ ] }, "user_saml": { - "hash": "sha256-LDiWtEaVJbNECJkcn80L4behkUyUsRlDFDd2lk2g+pE=", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.1.4/user_saml-v8.1.4.tar.gz", - "version": "8.1.4", + "hash": "sha256-HseXj3gaVa1rjJ/C1N6x223yU0usyJ7rt8RqhVMKiDY=", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.2.0/user_saml-v8.2.0.tar.gz", + "version": "8.2.0", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\t* Authentik\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/34.json b/pkgs/servers/nextcloud/packages/34.json index eceff77f9f7f..cd8ae39f661c 100644 --- a/pkgs/servers/nextcloud/packages/34.json +++ b/pkgs/servers/nextcloud/packages/34.json @@ -1,8 +1,8 @@ { "bookmarks": { - "hash": "sha256-8F+sNG/+M8Ed/q5dcxW95KS5ZBNsEeZNR0P2OIe/HqQ=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.2.2/bookmarks-16.2.2.tar.gz", - "version": "16.2.2", + "hash": "sha256-0jBKcGX6ljlXruILcKlsm7ZBrC5hyDuHp/9lgG0eoBE=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v16.2.4/bookmarks-16.2.4.tar.gz", + "version": "16.2.4", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users, groups and teams or via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -10,9 +10,9 @@ ] }, "calendar": { - "hash": "sha256-k7A38geyX6PS2j2t5iIXMMZMJsPKIiySVRKxcPAj+pM=", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.5.0/calendar-v6.5.0.tar.gz", - "version": "6.5.0", + "hash": "sha256-aqMBHxBDvOba/4nP93iJfmYYKz7J0QRs3S8xOQCEHNY=", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.5.1/calendar-v6.5.1.tar.gz", + "version": "6.5.1", "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -40,9 +40,9 @@ ] }, "contacts": { - "hash": "sha256-Lgw+wF40FlZTlbw5IXG/eUW8Chaw5Cm1i9f2R8YyPRU=", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.7.3/contacts-v8.7.3.tar.gz", - "version": "8.7.3", + "hash": "sha256-2oDKASmKBOahKq2cDSIDr7ud2/plNK0DL0ReJKpHzAc=", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.7.4/contacts-v8.7.4.tar.gz", + "version": "8.7.4", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -89,10 +89,20 @@ "agpl" ] }, + "drawio": { + "hash": "sha256-nVcO2V0zo7VdL/o8c6IRbiIqFnGBH7NdqL/eefQ/ip0=", + "url": "https://github.com/arnowelzel/drawio-nextcloud/releases/download/v4.3.0/drawio-v4.3.0.tar.gz", + "version": "4.3.0", + "description": "Integrates the diagrams.net diagram editor with Nextcloud. Users can create and edit .drawio diagrams and .dwb whiteboards directly within the Nextcloud file manager.\n\n**Features:**\n\n- Create and edit diagrams and whiteboards from the Nextcloud \"+\" menu\n- Click any .drawio or .dwb file to open the editor inline\n- Autosave with optimistic conflict detection\n- Inline diagram previews in Text, Collectives, Talk, Notes, and Deck\n- Supports public share links (read-only and editable)\n- Offline mode for privacy-sensitive deployments\n- Configurable editor URL for self-hosted diagrams.net instances", + "homepage": "https://github.com/arnowelzel/drawio-nextcloud", + "licenses": [ + "agpl" + ] + }, "end_to_end_encryption": { - "hash": "sha256-Z6MyXz//LNVy7Mt+yFbHIY5zGEMfsdwnAEDFsIcrs1M=", - "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v2.2.0/end_to_end_encryption-v2.2.0.tar.gz", - "version": "2.2.0", + "hash": "sha256-NfnIdc2Q8GgfgjqD8PeTS+O5vTWMBld+vCX/6ng/Im8=", + "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v2.2.1/end_to_end_encryption-v2.2.1.tar.gz", + "version": "2.2.1", "description": "## **End-to-End Encryption**\n\n### For End Users\n\n**Protect your most sensitive files with strong encryption.**\n\nThe End-to-End Encryption app gives you complete control over your data privacy.\nWith this app, you can encrypt specific folders so that only you (and those you trust) can access their contents.\nYour files are encrypted on your device before they reach the server, ensuring that no one—not even the server administrator—can read them.\n\n**Benefits:**\n- 🔒 **True privacy**: Files are encrypted on your device and can only be decrypted by you\n- 📱 **Works across all platforms**: Fully supported on desktop, Android, iOS clients, and as you wish even in the browser\n- 🎯 **Selective encryption**: Choose which folders to encrypt\n- 🛡️ **Secure sharing**: Share encrypted files with other users or even secure public upload using the encrypted file drop\n\n---\n\n### For Administrators\n\n**Enterprise-ready end-to-end encryption infrastructure for your Nextcloud instance.**\n\nThis app provides all the necessary server-side APIs and infrastructure to enable End-to-End encryption (E2EE) for your users.\nIt ensures that encrypted data remains secure throughout its lifecycle on your server.\n\n**Technical highlights:**\n- 🔐 **Complete API suite**: Provides all client-side APIs needed for E2EE implementation\n- 🔒 **Secure FileDrop integration**: Enables secure file sharing with encryption\n- 🛡️ **Zero-knowledge architecture**: Server never has access to encryption keys\n- ⚙️ **Group restrictions**: Limit app usage to specific user groups if needed\n- 🔄 **Background job management**: Automatic rollback handling for failed operations\n\n### Setup\nThis application provides the server-side infrastructure for end-to-end encryption, but it requires client support to function.\nTo enable end-to-end encryption, users will need to install the corresponding client-side app on their devices (desktop, Android, iOS) or use the web client.\n\nUsing the web interface, after enabling it in the personal settings, allows you to encrypt files and folders directly in the browser,\nproviding a seamless experience without needing additional software. But also requires some kind of trust in the server as the code is delivered by the server and could be manipulated.\n\nOnce enable through clients or the web interface, you can create encrypted folders and upload or move files into them.\nThe clients and the web interface will handle the encryption and decryption processes automatically.\n\n⚠️ This comes with some limitations and caveats, as only normal file operations can be handled.\nMeaning that some apps in the web interface do not work with encrypted files.", "homepage": "https://github.com/nextcloud/end_to_end_encryption", "licenses": [ @@ -130,9 +140,9 @@ ] }, "forms": { - "hash": "sha256-r570gxd4j/AEMzT3vul6qxJsJ/bTEW459LONUOYA8ZM=", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.3.2/forms-v5.3.2.tar.gz", - "version": "5.3.2", + "hash": "sha256-vd6qwBAGUtm+Fbfc/Ei1mtmENX5Zvz5ZlW1MGggytJ0=", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.3.4/forms-v5.3.4.tar.gz", + "version": "5.3.4", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API_v3.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -150,13 +160,13 @@ ] }, "groupfolders": { - "hash": "sha256-zyN6n2oSeO+I2wyc2Q9l1TUumdVmEThvERGC7xBkm3s=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v22.0.2/groupfolders-v22.0.2.tar.gz", - "version": "22.0.2", + "hash": "sha256-TsxpVaJJtARyUwRu0h9ZpC1QYZ8Izikk8MgdEPXlUrw=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v22.0.3/groupfolders-v22.0.3.tar.gz", + "version": "22.0.3", "description": "Team Folders (formerly \"Group Folders\") allows administrators to create and manage shared\nfolders for selected teams within Nextcloud.\n\nAdmins can grant one or more teams access to a folder, configure permissions (such as read,\nwrite, and sharing rights), and assign storage quotas from the Team Folders section (under\nadmin settings). The app also supports advanced permissions and integration with Nextcloud’s\ntrash and versioning systems.\n\nAs of Hub 10 / Nextcloud 31, admins must be members of a team to assign that team to a Team\nFolder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ - "agpl" + "AGPL-3.0-or-later" ] }, "guests": { @@ -210,9 +220,9 @@ ] }, "mail": { - "hash": "sha256-c0pMd+A2Fbxa/20BAkg3lPeVRIdu0XRTbAGJxb/9NT0=", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.10.7/mail-v5.10.7.tar.gz", - "version": "5.10.7", + "hash": "sha256-r7x9WkBAYw2KJ6D2FcLqbKHTHpVUP/z2eLjy4QorL7k=", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.10.8/mail-v5.10.8.tar.gz", + "version": "5.10.8", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -230,9 +240,9 @@ ] }, "music": { - "hash": "sha256-bQ9NBo5R/en3f68ag+mAsVWuhREjr/ajlKrfLn4Tvtg=", - "url": "https://github.com/nc-music/music/releases/download/v3.1.0/nc-music-3.1.0.tar.gz", - "version": "3.1.0", + "hash": "sha256-H8GsbDCdtHMKqsOVsyZA7nTBdBx0B+sfKdL5QupHEDI=", + "url": "https://github.com/nc-music/music/releases/download/v3.1.1/nc-music-3.1.1.tar.gz", + "version": "3.1.1", "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to scrobble plays and/or see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard", "homepage": "https://github.com/nc-music/music", "licenses": [ @@ -360,9 +370,9 @@ ] }, "richdocuments": { - "hash": "sha256-uGoXL/LnFaWlLRDdx95qmhD4HIW3p51CWlpKiWTScYg=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v11.0.0/richdocuments-v11.0.0.tar.gz", - "version": "11.0.0", + "hash": "sha256-GVK1v6DdskpMElqcKLEnmKY0oSY+iBNtMkSoZAjEyZY=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v11.0.1/richdocuments-v11.0.1.tar.gz", + "version": "11.0.1", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -370,9 +380,9 @@ ] }, "sociallogin": { - "hash": "sha256-8yB+PFGi9+bUjiEEHBJxAyySMluPO/1m3sPUThe5+t0=", - "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.5.2/release.tar.gz", - "version": "6.5.2", + "hash": "sha256-/mnpEUfyhjGG31TKzFEfKUuzflPL+pGcf6PRbNnkaUE=", + "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.5.3/release.tar.gz", + "version": "6.5.3", "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. Multiple claims (comma separated) also supported - groups will be merged.\nThe format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n \"client-id\": {\n \"roles\": [\n \"client-role-1\",\n \"client-role-2\"\n ]\n }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n 'social_login_http_client' => [\n 'timeout' => 45,\n 'proxy' => 'socks4://127.0.0.1:9050', // See for allowed formats\n ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: \n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.", "homepage": "https://github.com/zorn-v/nextcloud-social-login", "licenses": [ @@ -460,9 +470,9 @@ ] }, "user_saml": { - "hash": "sha256-LDiWtEaVJbNECJkcn80L4behkUyUsRlDFDd2lk2g+pE=", - "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.1.4/user_saml-v8.1.4.tar.gz", - "version": "8.1.4", + "hash": "sha256-HseXj3gaVa1rjJ/C1N6x223yU0usyJ7rt8RqhVMKiDY=", + "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v8.2.0/user_saml-v8.2.0.tar.gz", + "version": "8.2.0", "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\t* Authentik\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.", "homepage": "https://github.com/nextcloud/user_saml", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json index cb451cbe40f5..af5d73fe8b4d 100644 --- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json +++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json @@ -9,6 +9,7 @@ , "cospend": "agpl3Plus" , "dav_push": "agpl3Plus" , "deck": "agpl3Plus" +, "drawio": "agpl3Plus" , "end_to_end_encryption": "agpl3Plus" , "files_automatedtagging" : "agpl3Plus" , "files_linkeditor": "agpl3Plus" diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 545194dddd86..85794091d371 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -8,13 +8,13 @@ postgresqlBuildExtension (finalAttrs: { pname = "plpgsql-check"; - version = "2.9.3"; + version = "2.10.1"; src = fetchFromGitHub { owner = "okbob"; repo = "plpgsql_check"; tag = "v${finalAttrs.version}"; - hash = "sha256-zQzfOVu4O2NKJNIJcXN4irntAprBLQGetQJ3AAq/2HU="; + hash = "sha256-Md5t1YG7yZS3cFO7S99rSy4vSCIKZLcYcm3YykROOAI="; }; passthru.tests.extension = postgresqlTestExtension { diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index b7e07bc4303b..67de1c08e6fb 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,8 +1,8 @@ { - "serverVersion": "0.19.19", - "uiVersion": "0.19.19", - "serverHash": "sha256-JcJV1dEWlFsbv9eH2yQMGYEZEFB/Pe1xtL1UNtKI6c4=", - "serverCargoHash": "sha256-cwmz8Gf7T1IsCRyxo3ap+byX+Aj7+iCTHmZ/IeMN2no=", - "uiHash": "sha256-67OMwzOGl+dMX5YNPPBG/QwKOVerkSa7ICbrQl4YBp4=", + "serverVersion": "0.19.20", + "uiVersion": "0.19.20", + "serverHash": "sha256-qwc9hu+oCveG6DsBcUt6f2OZt68pogE7/rdG3L+EwJY=", + "serverCargoHash": "sha256-Bw64QDL0v6SpcJkukB6lzNrrmsHPstLU/sFtAAbEgXI=", + "uiHash": "sha256-hHZWIg7C6ZkJGlWJSNPMnc1rHRR4ZC1N1w3IcknFR5Y=", "uiPNPMDepsHash": "sha256-50IUUymGyaCAeMnWbYJlBytcULr9lvuY9kLVSEqHGL0=" } diff --git a/pkgs/servers/web-apps/szurubooru/server.nix b/pkgs/servers/web-apps/szurubooru/server.nix index 575ccc977009..a2309f694e85 100644 --- a/pkgs/servers/web-apps/szurubooru/server.nix +++ b/pkgs/servers/web-apps/szurubooru/server.nix @@ -21,6 +21,8 @@ let }; doCheck = false; }); + + sqlalchemy = self.sqlalchemy_1_4; }) ]; @@ -54,7 +56,7 @@ python.pkgs.buildPythonApplication { pyrfc3339 pytz pyyaml - sqlalchemy_1_3 + sqlalchemy yt-dlp ]; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 2b336f722305..f4233cfbe321 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -24,10 +24,6 @@ python3, }: -# cpp and mpi options are mutually exclusive -# "-DALLOW_UNSUPPORTED=ON" could be used to force the build. -assert !cppSupport || !mpiSupport; - let inherit (lib) optional optionals; in diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index c41fa32391ae..9ebe2d90d7d9 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -648,46 +648,6 @@ rec { enableParallelBuilding = true; }; - pygmentex = python3Packages.buildPythonApplication rec { - pname = "pygmentex"; - inherit (src) version; - pyproject = false; - - src = assertFixedHash pname texlive.pkgs.pygmentex.tex; - - propagatedBuildInputs = with python3Packages; [ - pygments - chardet - ]; - - dontBuild = true; - - doCheck = false; - - installPhase = '' - runHook preInstall - - install -D ./scripts/pygmentex/pygmentex.py "$out"/bin/pygmentex - - runHook postInstall - ''; - - meta = { - homepage = "https://www.ctan.org/pkg/pygmentex"; - description = "Auxiliary tool for typesetting code listings in LaTeX documents using Pygments"; - longDescription = '' - PygmenTeX is a Python-based LaTeX package that can be used for - typesetting code listings in a LaTeX document using Pygments. - - Pygments is a generic syntax highlighter for general use in all kinds of - software such as forum systems, wikis or other applications that need to - prettify source code. - ''; - license = lib.licenses.lppl13c; - maintainers = with lib.maintainers; [ romildo ]; - }; - }; - asymptote = let version = "3.09"; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index da8b6b547a68..ceba25edf09c 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -671,6 +671,7 @@ allPkgLists // { # for backward compatibility latexindent = texlive.pkgs.latexindent; + pygmentex = texlive.pkgs.pigmentex; }; combine = diff --git a/pkgs/tools/typesetting/tex/texlive/patch-scripts.sed b/pkgs/tools/typesetting/tex/texlive/patch-scripts.sed index c08d765ebd71..2587a1b1dd1d 100644 --- a/pkgs/tools/typesetting/tex/texlive/patch-scripts.sed +++ b/pkgs/tools/typesetting/tex/texlive/patch-scripts.sed @@ -3,7 +3,9 @@ N; # add script folder to path, unless we interfere with a docstring /\nr"""/b skip-python-path-patch - s!\n!\nimport sys; sys.path.insert(0,'@scriptsFolder@')\n! + # skip encoding declarations + /\n\s*#.*coding[=:]\s*[-a-zA-Z0-9_.]/N + s!\n\([^\n]*\)$!\nimport sys; sys.path.insert(0,'@scriptsFolder@')\n\1! :skip-python-path-patch } diff --git a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix index 58131679d0a8..da4be6be6e2f 100644 --- a/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix +++ b/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix @@ -146,6 +146,14 @@ lib.recursiveUpdate orig rec { ulqda.extraBuildInputs = [ (perl.withPackages (ps: with ps; [ DigestSHA1 ])) ]; #### python packages + pygmentex.extraBuildInputs = [ + (python3.withPackages ( + ps: with ps; [ + pygments + chardet + ] + )) + ]; pythontex.extraBuildInputs = [ (python3.withPackages (ps: with ps; [ pygments ])) ]; #### other runtime PATH dependencies diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a2f515b42732..422eb0b0b3ec 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -305,6 +305,9 @@ mapAliases { ansible_2_18 = throw "ansible_2_18 has been removed; use overridePythonAttrs if you need a specific version"; # Added 2025-11-10 ansible_2_19 = throw "ansible_2_19 has been removed; use overridePythonAttrs if you need a specific version"; # Added 2025-11-10 antibody = throw "antibody has been removed because it was deprecated and archived upstream. Consider using antidote instead"; # Added 2026-01-16 + antigravity = warnAlias "'antigravity' has been renamed to 'antigravity-ide'" antigravity-ide; # Added 2026-05-20 + antigravity-fhs = warnAlias "'antigravity-fhs' has been renamed to 'antigravity-ide-fhs'" antigravity-ide-fhs; # Added 2026-05-20 + antigravity-fhsWithPackages = warnAlias "'antigravity-fhsWithPackages' has been renamed to 'antigravity-ide-fhsWithPackages'" antigravity-ide-fhsWithPackages; # Added 2026-05-20 antlr4_8 = throw "antlr4_8 has been removed. Consider using a more recent version of antlr4"; # Added 2025-10-20 ao = throw "'ao' has been renamed to/replaced by 'libfive'"; # Converted to throw 2025-10-27 apacheAnt = throw "'apacheAnt' has been renamed to/replaced by 'ant'"; # Converted to throw 2025-10-27 @@ -682,6 +685,7 @@ mapAliases { dotnetfx40 = throw "'dotnetfx40' has been removed because it was unmaintained in Nixpkgs"; # Added 2026-01-27 dotty = throw "'dotty' has been renamed to/replaced by 'scala_3'"; # Converted to throw 2025-10-27 dovecot_fts_xapian = throw "'dovecot_fts_xapian' has been removed because it was unmaintained in Nixpkgs. Consider using dovecot-fts-flatcurve instead"; # Added 2025-08-16 + drone-runner-exec = throw "'drone-runner-exec' has been removed as it was deprecated and archived upstream."; # Added 2026-07-20 dsd = throw "dsd has been removed, as it was broken and lack of upstream maintenance"; # Added 2025-08-25 dtv-scan-tables_linuxtv = throw "'dtv-scan-tables_linuxtv' has been renamed to/replaced by 'dtv-scan-tables'"; # Converted to throw 2025-10-27 dtv-scan-tables_tvheadend = throw "'dtv-scan-tables_tvheadend' has been renamed to/replaced by 'dtv-scan-tables'"; # Converted to throw 2025-10-27 @@ -1231,6 +1235,7 @@ mapAliases { liblastfmSF = warnAlias "'liblastfmSF' has been renamed to 'liblastfm-vambrose'" liblastfm-vambrose; # Added 2026-02-08 liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20 libmesode = throw "'libmesode' has been removed because it was deprecated and archived upstream. Consider using 'libstrophe' instead"; # Added 2026-01-15 + libmicrohttpd_0_9_77 = throw "'libmicrohttpd_0_9_77' has been removed as it is unmaintained upstream and unused in Nixpkgs. Consider upgrading to 'libmicrohttpd' 1.x instead."; # Added 2026-07-20 libmkv = throw "'libmkv' has been removed as it is abandoned upstream"; # Added 2026-01-18 libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16 @@ -2099,6 +2104,7 @@ mapAliases { slrn = throw "'slrn' has been removed because it is unmaintained upstream and broken."; # Added 2025-06-11 slurm-llnl = throw "'slurm-llnl' has been renamed to/replaced by 'slurm'"; # Converted to throw 2025-10-27 smartgithg = throw "'smartgithg' has been renamed to/replaced by 'smartgit'"; # Converted to throw 2025-10-27 + smbnetfs = throw "'smbnetfs' has been removed as it was unmaintained. Consider migrating to gvfs"; # Added 2026-07-20 smtube = throw "'smtube' has been removed as it depends on insecure&unmaintained qtwebkit"; # Added 2026-04-26 snapcraft = throw "snapcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # Added 2025-09-18 snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 948474287e63..a4190f536c0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2358,8 +2358,6 @@ with pkgs; matrix-synapse-plugins = recurseIntoAttrs matrix-synapse-unwrapped.plugins; - maubot = with python3Packages; toPythonApplication maubot; - md2gemini = with python3.pkgs; toPythonApplication md2gemini; mdcat = callPackage ../tools/text/mdcat { @@ -2499,8 +2497,6 @@ with pkgs; liquidctl = with python3Packages; toPythonApplication liquidctl; - xz = callPackage ../tools/compression/xz { }; - madlang = haskell.lib.compose.justStaticExecutables haskellPackages.madlang; man = man-db; @@ -2593,6 +2589,7 @@ with pkgs; nomad_1_9 nomad_1_10 nomad_1_11 + nomad_2_0 ; nth = with python3Packages; toPythonApplication name-that-hash; @@ -6089,15 +6086,7 @@ with pkgs; malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { }; - inherit - ({ - libmicrohttpd_0_9_77 = callPackage ../development/libraries/libmicrohttpd/0.9.77.nix { }; - libmicrohttpd_1_0 = callPackage ../development/libraries/libmicrohttpd/1.0.nix { }; - }) - libmicrohttpd_0_9_77 - libmicrohttpd_1_0 - ; - + libmicrohttpd_1_0 = callPackage ../development/libraries/libmicrohttpd/1.0.nix { }; libmicrohttpd = libmicrohttpd_1_0; libpeas = callPackage ../development/libraries/libpeas { }; @@ -9642,8 +9631,8 @@ with pkgs; vscodium-fhs = vscodium.fhs; vscodium-fhsWithPackages = vscodium.fhsWithPackages; - antigravity-fhs = antigravity.fhs; - antigravity-fhsWithPackages = antigravity.fhsWithPackages; + antigravity-ide-fhs = antigravity-ide.fhs; + antigravity-ide-fhsWithPackages = antigravity-ide.fhsWithPackages; code-cursor-fhs = code-cursor.fhs; code-cursor-fhsWithPackages = code-cursor.fhsWithPackages; @@ -9749,7 +9738,7 @@ with pkgs; xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland { - stdenv = gcc15Stdenv; + stdenv = gcc16Stdenv; inherit (qt6) qtbase qttools diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9191c658132e..7e85b77a462a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -275,6 +275,8 @@ let cmdliner_1 = cmdliner.override { version = "1.3.0"; }; + cmon = callPackage ../development/ocaml-modules/cmon { }; + cohttp = callPackage ../development/ocaml-modules/cohttp { }; cohttp_5_3 = cohttp.overrideAttrs (_: { @@ -800,6 +802,8 @@ let graphql_ppx = callPackage ../development/ocaml-modules/graphql_ppx { }; + grenier = callPackage ../development/ocaml-modules/grenier { }; + gsl = callPackage ../development/ocaml-modules/gsl { inherit (pkgs) gsl; }; @@ -1163,6 +1167,8 @@ let lreplay = callPackage ../development/ocaml-modules/lreplay { }; + lrgrep = callPackage ../development/ocaml-modules/lrgrep { }; + lru = callPackage ../development/ocaml-modules/lru { }; lsp = callPackage ../development/ocaml-modules/ocaml-lsp/lsp.nix { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3fa3b8a4eb4e..d958bac0e5c3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22822,6 +22822,7 @@ with self; buildInputs = [ pkgs.apacheHttpd ]; doCheck = false; # would try to start Apache HTTP server passthru.tests = nixosTests.mod_perl; + __darwinAllowLocalNetworking = true; meta = { description = "Embed a Perl interpreter in the Apache/2.x HTTP server"; license = lib.licenses.asl20; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7d0e9ff77f4e..0f137fc7e207 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -83,6 +83,7 @@ mapAliases { aiosenz = throw "aiosenz was removed because Home Assistant switched to pysenz"; # added 2025-12-29 aioshutil = throw "'aioshutil' was removed because uiprotect no longer depends on it"; # added 2026-02-16 aioxmpp = throw "'aioxmpp' was removed because it depends on aiosasl, which is abandoned and does not work on modern Python versions."; # Added 2026-06-28 + albumentations = throw "'albumentations' was removed because it is unmaintained since 2025. You may now use albumentationsx"; # added 2026-07-18 amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03 amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29 amqplib = throw "amqplib has been removed as it was unmaintained upstream"; # Added 2025-11-22 @@ -132,6 +133,7 @@ mapAliases { bjoern = throw "'bjoern' has been removed, as the upstream repository was unmaintained and it was using libraries with severe security issues."; # Added 2025-09-01 bkcharts = throw "'bkcharts' has been removed as the upstream repository was archived in 2018"; # added 2025-08-26 BlinkStick = throw "'BlinkStick' has been renamed to/replaced by 'blinkstick'"; # Converted to throw 2025-10-29 + blockchain = throw "'blockchain' has been removed because its source is unavailable"; # added 2026-07-20 boiboite-opener-framework = throw "'boiboite-opener-framework' has been removed as it was unmaintained upstream"; # Added 2026-03-23 bsblan = throw "'bsblan' has been renamed to/replaced by 'python-bsblan'"; # Converted to throw 2025-10-29 bsddb3 = throw "'bsddb3' has been removed because it was deprecated in favor of 'berkeleydb'"; # added 2026-01-20 @@ -373,6 +375,7 @@ mapAliases { Markups = throw "'Markups' has been renamed to/replaced by 'markups'"; # Converted to throw 2025-10-29 mathlibtools = throw "mathlibtools has been removed because the upstream repository was archived in 2023"; # added 2025-07-09 matlink-gpapi = throw "'matlink-gpapi' has been removed as it was broken and unmaintained"; # Added 2025-11-09 + maubot = throw "'maubot' has been promoted to a top-level attribute: `pkgs.maubot`"; # added 2026-07-12 mdformat-tables = "'mdformat-tables' has been archived and replaced by 'mdformat-gfm"; # added 2025-01-25 MDP = throw "'MDP' has been renamed to/replaced by 'mdp'"; # Converted to throw 2025-10-29 MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2025-10-29 @@ -638,6 +641,7 @@ mapAliases { sphinxcontrib_plantuml = throw "'sphinxcontrib_plantuml' has been renamed to/replaced by 'sphinxcontrib-plantuml'"; # Converted to throw 2025-10-29 sqlalchemy-utc = throw "'sqlalchemy-utc' has been removed as it was unmaintained upstream"; # Added 2026-03-19 sqlalchemy-views = throw "'sqlalchemy-views' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-09 + sqlalchemy_1_3 = throw "'sqlalchemy_1_3' has been removed because it was actually version 1.4.54"; # added 2026-07-20 sqlalchemy_migrate = throw "'sqlalchemy_migrate' has been renamed to/replaced by 'sqlalchemy-migrate'"; # Converted to throw 2025-10-29 steamship = throw "'steamship' has been removed because it is broken and unmaintained upstream"; # Added 2026-05-06 strawberry-django = strawberry-graphql-django; # Added 2026-07-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29c261149fc0..41ff1aede139 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -658,7 +658,7 @@ self: super: with self; { albucore = callPackage ../development/python-modules/albucore { }; - albumentations = callPackage ../development/python-modules/albumentations { }; + albumentationsx = callPackage ../development/python-modules/albumentationsx { }; ale-py = callPackage ../development/python-modules/ale-py { }; @@ -2507,8 +2507,6 @@ self: super: with self; { blockbuster = callPackage ../development/python-modules/blockbuster { }; - blockchain = callPackage ../development/python-modules/blockchain { }; - blockdiag = callPackage ../development/python-modules/blockdiag { }; blockfrost-python = callPackage ../development/python-modules/blockfrost-python { }; @@ -10170,8 +10168,6 @@ self: super: with self; { mattermostdriver = callPackage ../development/python-modules/mattermostdriver { }; - maubot = callPackage ../development/python-modules/maubot { }; - mautrix = callPackage ../development/python-modules/mautrix { }; mautrix-appservice = self.mautrix; # alias 2019-12-28 @@ -19331,8 +19327,6 @@ self: super: with self; { sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; - sqlalchemy_1_3 = callPackage ../development/python-modules/sqlalchemy/1_3.nix { }; - sqlalchemy_1_4 = callPackage ../development/python-modules/sqlalchemy/1_4.nix { }; sqlcipher3 = callPackage ../development/python-modules/sqlcipher3 { };