diff options
92 files changed, 1505 insertions, 1048 deletions
diff --git a/doc/build-helpers/images/ocitools.section.md b/doc/build-helpers/images/ocitools.section.md index c35f65bce0073..96627615ffb54 100644 --- a/doc/build-helpers/images/ocitools.section.md +++ b/doc/build-helpers/images/ocitools.section.md @@ -1,37 +1,104 @@ # pkgs.ociTools {#sec-pkgs-ociTools} -`pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that, it makes no assumptions about the container runner you choose to use to run the created container. +`pkgs.ociTools` is a set of functions for creating runtime container bundles according to the [OCI runtime specification v1.0.0](https://github.com/opencontainers/runtime-spec/blob/v1.0.0/spec.md). +It makes no assumptions about the container runner you choose to use to run the created container. + +The set of functions in `pkgs.ociTools` currently does not handle the [OCI image specification](https://github.com/opencontainers/image-spec). + +At a high-level an OCI implementation would download an OCI Image then unpack that image into an OCI Runtime filesystem bundle. +At this point the OCI Runtime Bundle would be run by an OCI Runtime. +`pkgs.ociTools` provides utilities to create OCI Runtime bundles. ## buildContainer {#ssec-pkgs-ociTools-buildContainer} -This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory. The nix store of the container will contain all referenced dependencies of the given command. +This function creates an OCI runtime container (consisting of a `config.json` and a root filesystem directory) that runs a single command inside of it. +The nix store of the container will contain all referenced dependencies of the given command. + +This function has an assumption that the container will run on POSIX platforms, and sets configurations (such as the user running the process or certain mounts) according to this assumption. +Because of this, a container built with `buildContainer` will not work on Windows or other non-POSIX platforms without modifications to the container configuration. +These modifications aren't supported by `buildContainer`. + +For `linux` platforms, `buildContainer` also configures the following namespaces (see {manpage}`unshare(1)`) to isolate the OCI container from the global namespace: +PID, network, mount, IPC, and UTS. + +Note that no user namespace is created, which means that you won't be able to run the container unless you are the `root` user. + +### Inputs {#ssec-pkgs-ociTools-buildContainer-inputs} + +`buildContainer` expects an argument with the following attributes: + +`args` (List of String) + +: Specifies a set of arguments to run inside the container. + Any packages referenced by `args` will be made available inside the container. + +`mounts` (Attribute Set; _optional_) + +: Would specify additional mounts that the runtime must make available to the container. + + :::{.warning} + As explained in [issue #290879](https://github.com/NixOS/nixpkgs/issues/290879), this attribute is currently ignored. + ::: + + :::{.note} + `buildContainer` includes a minimal set of necessary filesystems to be mounted into the container, and this set can't be changed with the `mounts` attribute. + ::: + + _Default value:_ `{}`. -The parameters of `buildContainer` with an example value are described below: +`readonly` (Boolean; _optional_) + +: If `true`, sets the container's root filesystem as read-only. + + _Default value:_ `false`. + +`os` **DEPRECATED** + +: Specifies the operating system on which the container filesystem is based on. + If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/main/config.md#properties). + According to the linked specification, all possible values for `$GOOS` in [the Go docs](https://go.dev/doc/install/source#environment) should be valid, but will commonly be one of `darwin` or `linux`. + + _Default value:_ `"linux"`. + +`arch` **DEPRECATED** + +: Used to specify the architecture for which the binaries in the container filesystem have been compiled. + If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/main/config.md#properties). + According to the linked specification, all possible values for `$GOARCH` in [the Go docs](https://go.dev/doc/install/source#environment) should be valid, but will commonly be one of `386`, `amd64`, `arm`, or `arm64`. + + _Default value:_ `x86_64`. + +### Examples {#ssec-pkgs-ociTools-buildContainer-examples} + +::: {.example #ex-ociTools-buildContainer-bash} +# Creating an OCI runtime container that runs `bash` + +This example uses `ociTools.buildContainer` to create a simple container that runs `bash`. ```nix -buildContainer { +{ ociTools, lib, bash }: +ociTools.buildContainer { args = [ - (with pkgs; - writeScript "run.sh" '' - #!${bash}/bin/bash - exec ${bash}/bin/bash - '').outPath + (lib.getExe bash) ]; - mounts = { - "/data" = { - type = "none"; - source = "/var/lib/mydata"; - options = [ "bind" ]; - }; - }; - readonly = false; } ``` -- `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container. +As an example of how to run the container generated by this package, we'll use `runc` to start the container. +Any other tool that supports OCI containers could be used instead. -- `mounts` specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs) +```shell +$ nix-build +(some output removed for clarity) +/nix/store/7f9hgx0arvhzp2a3qphp28rxbn748l25-join -- `readonly` makes the container's rootfs read-only if it is set to true. The default value is false `false`. +$ cd /nix/store/7f9hgx0arvhzp2a3qphp28rxbn748l25-join +$ nix-shell -p runc +[nix-shell:/nix/store/7f9hgx0arvhzp2a3qphp28rxbn748l25-join]$ sudo runc run ocitools-example +help +GNU bash, version 5.2.26(1)-release (x86_64-pc-linux-gnu) +(some output removed for clarity) +``` +::: diff --git a/doc/build-helpers/images/portableservice.section.md b/doc/build-helpers/images/portableservice.section.md index 5400928b158f8..c271bc775dbae 100644 --- a/doc/build-helpers/images/portableservice.section.md +++ b/doc/build-helpers/images/portableservice.section.md @@ -1,81 +1,174 @@ # pkgs.portableService {#sec-pkgs-portableService} -`pkgs.portableService` is a function to create _portable service images_, -as read-only, immutable, `squashfs` archives. +`pkgs.portableService` is a function to create [Portable Services](https://systemd.io/PORTABLE_SERVICES/) in a read-only, immutable, `squashfs` raw disk image. +This lets you use Nix to build images which can be run on many recent Linux distributions. -systemd supports a concept of [Portable Services](https://systemd.io/PORTABLE_SERVICES/). -Portable Services are a delivery method for system services that uses two specific features of container management: +::: {.note} +Portable services are supported starting with systemd 239 (released on 2018-06-22). +::: -* Applications are bundled. I.e. multiple services, their binaries and - all their dependencies are packaged in an image, and are run directly from it. -* Stricter default security policies, i.e. sandboxing of applications. +The generated image will contain the file system structure as required by the Portable Services specification, along with the packages given to `portableService` and all of their dependencies. +When generated, the image will exist in the Nix store with the `.raw` file extension, as required by the specification. +See [](#ex-portableService-hello) to understand how to use the output of `portableService`. -This allows using Nix to build images which can be run on many recent Linux distributions. +## Inputs {#ssec-pkgs-portableService-inputs} -The primary tool for interacting with Portable Services is `portablectl`, -and they are managed by the `systemd-portabled` system service. +`portableService` expects one argument with the following attributes: -::: {.note} -Portable services are supported starting with systemd 239 (released on 2018-06-22). -::: +`pname` (String) + +: The name of the portable service. + The generated image will be named according to the template `$pname_$version.raw`, which is supported by the Portable Services specification. + +`version` (String) + +: The version of the portable service. + The generated image will be named according to the template `$pname_$version.raw`, which is supported by the Portable Services specification. + +`units` (List of Attribute Set) + +: A list of derivations for systemd unit files. + Each derivation must produce a single file, and must have a name that starts with the value of `pname` and ends with the suffix of the unit type (e.g. ".service", ".socket", ".timer", and so on). + See [](#ex-portableService-hello) to better understand this naming constraint. + +`description` (String or Null; _optional_) + +: If specified, the value is added as `PORTABLE_PRETTY_NAME` to the `/etc/os-release` file in the generated image. + This could be used to provide more information to anyone inspecting the image. + + _Default value:_ `null`. + +`homepage` (String or Null; _optional_) + +: If specified, the value is added as `HOME_URL` to the `/etc/os-release` file in the generated image. + This could be used to provide more information to anyone inspecting the image. + + _Default value:_ `null`. + +`symlinks` (List of Attribute Set; _optional_) + +: A list of attribute sets in the format `{object, symlink}`. + For each item in the list, `portableService` will create a symlink in the path specified by `symlink` (relative to the root of the image) that points to `object`. + + All packages that `object` depends on and their dependencies are automatically copied into the image. + + This can be used to create symlinks for applications that assume some files to exist globally (`/etc/ssl` or `/bin/bash`, for example). + See [](#ex-portableService-symlinks) to understand how to do that. + + _Default value:_ `[]`. + +`contents` (List of Attribute Set; _optional_) -A very simple example of using `portableService` is described below: +: A list of additional derivations to be included as-is in the image. + These derivations will be included directly in a `/nix/store` directory inside the image. + + _Default value:_ `[]`. + +`squashfsTools` (Attribute Set; _optional_) + +: Allows you to override the package that provides {manpage}`mksquashfs(1)`, which is used internally by `portableService`. + + _Default value:_ `pkgs.squashfsTools`. + +`squash-compression` (String; _optional_) + +: Passed as the compression option to {manpage}`mksquashfs(1)`, which is used internally by `portableService`. + + _Default value:_ `"xz -Xdict-size 100%"`. + +`squash-block-size` (String; _optional_) + +: Passed as the block size option to {manpage}`mksquashfs(1)`, which is used internally by `portableService`. + + _Default value:_ `"1M"`. + +## Examples {#ssec-pkgs-portableService-examples} []{#ex-pkgs-portableService} +:::{.example #ex-portableService-hello} +# Building a Portable Service image + +The following example builds a Portable Service image with the `hello` package, along with a service unit that runs it. ```nix -pkgs.portableService { - pname = "demo"; - version = "1.0"; - units = [ demo-service demo-socket ]; +{ lib, writeText, portableService, hello }: +let + hello-service = writeText "hello.service" '' + [Unit] + Description=Hello world service + + [Service] + Type=oneshot + ExecStart=${lib.getExe hello} + ''; +in +portableService { + pname = "hello"; + inherit (hello) version; + units = [ hello-service ]; } ``` -The above example will build an squashfs archive image in `result/$pname_$version.raw`. The image will contain the -file system structure as required by the portable service specification, and a subset of the Nix store with all the -dependencies of the two derivations in the `units` list. -`units` must be a list of derivations, and their names must be prefixed with the service name (`"demo"` in this case). -Otherwise `systemd-portabled` will ignore them. - -::: {.note} -The `.raw` file extension of the image is required by the portable services specification. +After building the package, the generated image can be loaded into a system through {manpage}`portablectl(1)`: + +```shell +$ nix-build +(some output removed for clarity) +/nix/store/8c20z1vh7z8w8dwagl8w87b45dn5k6iq-hello-img-2.12.1 + +$ portablectl attach /nix/store/8c20z1vh7z8w8dwagl8w87b45dn5k6iq-hello-img-2.12.1/hello_2.12.1.raw +Created directory /etc/systemd/system.attached. +Created directory /etc/systemd/system.attached/hello.service.d. +Written /etc/systemd/system.attached/hello.service.d/20-portable.conf. +Created symlink /etc/systemd/system.attached/hello.service.d/10-profile.conf → /usr/lib/systemd/portable/profile/default/service.conf. +Copied /etc/systemd/system.attached/hello.service. +Created symlink /etc/portables/hello_2.12.1.raw → /nix/store/8c20z1vh7z8w8dwagl8w87b45dn5k6iq-hello-img-2.12.1/hello_2.12.1.raw. + +$ systemctl start hello +$ journalctl -u hello +Feb 28 22:39:16 hostname systemd[1]: Starting Hello world service... +Feb 28 22:39:16 hostname hello[102887]: Hello, world! +Feb 28 22:39:16 hostname systemd[1]: hello.service: Deactivated successfully. +Feb 28 22:39:16 hostname systemd[1]: Finished Hello world service. + +$ portablectl detach hello_2.12.1 +Removed /etc/systemd/system.attached/hello.service. +Removed /etc/systemd/system.attached/hello.service.d/10-profile.conf. +Removed /etc/systemd/system.attached/hello.service.d/20-portable.conf. +Removed /etc/systemd/system.attached/hello.service.d. +Removed /etc/portables/hello_2.12.1.raw. +Removed /etc/systemd/system.attached. +``` ::: -Some other options available are: -- `description`, `homepage` - - Are added to the `/etc/os-release` in the image and are shown by the portable services tooling. - Default to empty values, not added to os-release. -- `symlinks` - - A list of attribute sets {object, symlink}. Symlinks will be created in the root filesystem of the image to - objects in the Nix store. Defaults to an empty list. -- `contents` +:::{.example #ex-portableService-symlinks} +# Specifying symlinks when building a Portable Service image - A list of additional derivations to be included in the image Nix store, as-is. Defaults to an empty list. -- `squashfsTools` +Some services may expect files or directories to be available globally. +An example is a service which expects all trusted SSL certificates to exist in a specific location by default. - Defaults to `pkgs.squashfsTools`, allows you to override the package that provides `mksquashfs`. -- `squash-compression`, `squash-block-size` +To make things available globally, you must specify the `symlinks` attribute when using `portableService`. +The following package builds on the package from [](#ex-portableService-hello) to make `/etc/ssl` available globally (this is only for illustrative purposes, because `hello` doesn't use `/etc/ssl`). - Options to `mksquashfs`. Default to `"xz -Xdict-size 100%"` and `"1M"` respectively. - -A typical usage of `symlinks` would be: ```nix +{ lib, writeText, portableService, hello, cacert }: +let + hello-service = writeText "hello.service" '' + [Unit] + Description=Hello world service + + [Service] + Type=oneshot + ExecStart=${lib.getExe hello} + ''; +in +portableService { + pname = "hello"; + inherit (hello) version; + units = [ hello-service ]; symlinks = [ - { object = "${pkgs.cacert}/etc/ssl"; symlink = "/etc/ssl"; } - { object = "${pkgs.bash}/bin/bash"; symlink = "/bin/sh"; } - { object = "${pkgs.php}/bin/php"; symlink = "/usr/bin/php"; } + { object = "${cacert}/etc/ssl"; symlink = "/etc/ssl"; } ]; +} ``` -to create these symlinks for legacy applications that assume them existing globally. - -Once the image is created, and deployed on a host in `/var/lib/portables/`, you can attach the image and run the service. As root run: -```console -portablectl attach demo_1.0.raw -systemctl enable --now demo.socket -systemctl enable --now demo.service -``` -::: {.note} -See the [man page](https://www.freedesktop.org/software/systemd/man/portablectl.html) of `portablectl` for more info on its usage. ::: diff --git a/doc/manpage-urls.json b/doc/manpage-urls.json index 5739a59d94205..2cc03af4360f0 100644 --- a/doc/manpage-urls.json +++ b/doc/manpage-urls.json @@ -318,5 +318,7 @@ "passwd(5)": "https://man.archlinux.org/man/passwd.5", "group(5)": "https://man.archlinux.org/man/group.5", "login.defs(5)": "https://man.archlinux.org/man/login.defs.5", - "nix-shell(1)": "https://nixos.org/manual/nix/stable/command-ref/nix-shell.html" + "unshare(1)": "https://man.archlinux.org/man/unshare.1.en", + "nix-shell(1)": "https://nixos.org/manual/nix/stable/command-ref/nix-shell.html", + "mksquashfs(1)": "https://man.archlinux.org/man/extra/squashfs-tools/mksquashfs.1.en" } diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 3370b55a4ab9a..3bd18fdd2a5a9 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -145,6 +145,12 @@ rec { in fix g ``` + :::{.note} + The argument to the given fixed-point function after applying an overlay will *not* refer to its own return value, but rather to the value after evaluating the overlay function. + + The given fixed-point function is called with a separate argument than if it was evaluated with `lib.fix`. + ::: + :::{.example} # Extend a fixed-point function with an overlay @@ -230,13 +236,6 @@ rec { fix (extends (final: prev: { c = final.a + final.b; }) f) => { a = 1; b = 3; c = 4; } - - :::{.note} - The argument to the given fixed-point function after applying an overlay will *not* refer to its own return value, but rather to the value after evaluating the overlay function. - - The given fixed-point function is called with a separate argument than if it was evaluated with `lib.fix`. - The new argument - ::: */ extends = # The overlay to apply to the fixed-point function diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 938d585e31793..5bbf875f0d57b 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -213,7 +213,7 @@ in serviceConfig = { User = "searx"; Group = "searx"; - ExecStart = "${cfg.package}/bin/searx-run"; + ExecStart = lib.getExe cfg.package; } // optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = builtins.toPath cfg.environmentFile; }; environment = { diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index c659d93b40872..9d074c3027d02 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -132,6 +132,28 @@ in default = "WriteReplica"; type = lib.types.enum [ "WriteReplica" "WriteReplicaNoUI" "ReadOnlyReplica" ]; }; + online_backup = { + path = lib.mkOption { + description = lib.mdDoc "Path to the output directory for backups."; + type = lib.types.path; + default = "/var/lib/kanidm/backups"; + }; + schedule = lib.mkOption { + description = lib.mdDoc "The schedule for backups in cron format."; + type = lib.types.str; + default = "00 22 * * *"; + }; + versions = lib.mkOption { + description = lib.mdDoc '' + Number of backups to keep. + + The default is set to `0`, in order to disable backups by default. + ''; + type = lib.types.ints.unsigned; + default = 0; + example = 7; + }; + }; }; }; default = { }; @@ -233,6 +255,14 @@ in environment.systemPackages = lib.mkIf cfg.enableClient [ cfg.package ]; + systemd.tmpfiles.settings."10-kanidm" = { + ${cfg.serverSettings.online_backup.path}.d = { + mode = "0700"; + user = "kanidm"; + group = "kanidm"; + }; + }; + systemd.services.kanidm = lib.mkIf cfg.enableServer { description = "kanidm identity management daemon"; wantedBy = [ "multi-user.target" ]; @@ -253,6 +283,8 @@ in BindPaths = [ # To create the socket "/run/kanidmd:/run/kanidmd" + # To store backups + cfg.serverSettings.online_backup.path ]; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix index 2f808cb65266e..02a88f690db78 100644 --- a/nixos/tests/searx.nix +++ b/nixos/tests/searx.nix @@ -36,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ...} : }; # fancy setup: run in uWSGI and use nginx as proxy - nodes.fancy = { ... }: { + nodes.fancy = { config, ... }: { imports = [ ../modules/profiles/minimal.nix ]; services.searx = { @@ -65,7 +65,7 @@ import ./make-test-python.nix ({ pkgs, ...} : include ${pkgs.nginx}/conf/uwsgi_params; uwsgi_pass unix:/run/searx/uwsgi.sock; ''; - locations."/searx/static/".alias = "${pkgs.searx}/share/static/"; + locations."/searx/static/".alias = "${config.services.searx.package}/share/static/"; }; # allow nginx access to the searx socket @@ -108,7 +108,7 @@ import ./make-test-python.nix ({ pkgs, ...} : "${pkgs.curl}/bin/curl --fail http://localhost/searx >&2" ) fancy.succeed( - "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/oscar/js/bootstrap.min.js >&2" + "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/leaflet.js >&2" ) ''; }) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d89ca909fa59c..57abacccd2d92 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2024-02-17"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "e52c456d44e2e3c580428e54182a59d82009c3e2"; - sha256 = "025l8y4i5a0zlvm1f0nqliqvqwn1cf2xas3ikiyf6cn749ar7pjw"; + rev = "70fcabba2ecb776406bedc4b7c968ea7a876de85"; + sha256 = "1vdqygp8v0j0msyhvc7239fkfvb1m71b3m0fpan9ay2h4x9q0q6i"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -173,12 +173,12 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-01-23"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "a50f92f7550fb6e9f21c0852e6cb190e6fcd50f5"; - sha256 = "01ag75gdn6yfifv5rgk8j72dly511alilqy7z97s7m3fm1zp73mv"; + rev = "91126b9896bebcea9a21bce43be4e613e7607164"; + sha256 = "0cp56d4vy8mwdf3gl64cnw25fizqw0p1nfwnn470b3mwk9851i7g"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-02-16"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "844081710a935b4bd95bb8a3cf2742ffb9630993"; - sha256 = "0dijcbygl5z4jw8gcfjvld09yijlz0fl10b0c6giizy9r09ij7av"; + rev = "0358c7e159e5502361bf3971d89bf5133bcc2893"; + sha256 = "0klr8r0kz0qnyd4g18mrdl3xvjdhsz7vbdppgrkmaa02iq1bi8i9"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -377,12 +377,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2023-09-23"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "f7151f55a9e9b96e332d7cc1e0febdcae6198356"; - sha256 = "155d7b0vgqcsdayry8gz7sz2l3wlabh1pp6jksanjbfcq3gydvxn"; + rev = "f393801c5f82a1cdc96fcd70ba9ae6d17eecedee"; + sha256 = "1yvkgzb786v35h6pw6shw61zibg50npw59f0qyq0f0w7afccschc"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-02-14"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "f0789244449468b0dad591ec5a87db6504788cfa"; - sha256 = "0vs201i5aqa157ld9ii0pl9cd9xxfcrkxx69ibk8rzn3ardnllm4"; + rev = "c3c03323c4e4bd84b8fc6173a6c95bbd6c922b11"; + sha256 = "1977s7082pvml4yi6km3i0k81n5vp0ym25ybxgl28ym66xrxcl28"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -583,12 +583,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-02-06"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "6fd9f3c54f80cec8be364594246daf9ac41cbe3e"; - sha256 = "16wa96aymgx4jfw9cxryikvfa1628csblhc4y2d33khbpy8mg81d"; + rev = "9cc8383fe930e0d6f21b17c9ebb2fdb55331b183"; + sha256 = "1mfbc89p0kk6n5gk2a51fcn7rl86whz0dm3mcikbxhfnscncnsq6"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -691,12 +691,12 @@ final: prev: astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "2024-01-27"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - rev = "415d0030a86dc52371925483a823eb04d483447b"; - sha256 = "16brpfp5kdgdlpij72kl02gzql04cyhswsaw93qm2svfvr9q2v9x"; + rev = "d96b532d2f629e0d9b55368a38debc776c3a9d32"; + sha256 = "1fxjhqgd1akd5qy0llrclmc05jqxl38dwyxij1yk31vg359vrl0j"; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; }; @@ -799,12 +799,12 @@ final: prev: asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2024-02-16"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "99b5025131c50c6ef638faefe1f872eea5454785"; - sha256 = "1cbc1silg0hf3rj7saw4ifxcn5nmvs1fyilnfxskg38bk9pag5ds"; + rev = "915e36a2ed84b73741e13d2df3edc8e01ca56f5b"; + sha256 = "0rw3wnxsk9gx4kvw2x5h1pbmpls7fvlim3ihlhw37zf2irsfph5w"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -907,16 +907,28 @@ final: prev: autoclose-nvim = buildVimPlugin { pname = "autoclose.nvim"; - version = "2023-09-16"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "37e11589aac55b0e8810dc5865f898f9cb36fef6"; - sha256 = "15l5c9r8wa2i7amdl3b88gj9qhw81wxicm4zglvzcl1yb9ga0pwd"; + rev = "dc42806540dcf448ecb2bad6b67204410cfbe629"; + sha256 = "03l4az5xccx941sbw2qx7s8aziydiad2pc75jki1mlbgs7sdbhwi"; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; + autolist-nvim = buildVimPlugin { + pname = "autolist.nvim"; + version = "2023-07-07"; + src = fetchFromGitHub { + owner = "gaoDean"; + repo = "autolist.nvim"; + rev = "5f70a5f99e96c8fe3069de042abd2a8ed2deb855"; + sha256 = "0vdr9mf761qc2rp9xc8ypgdis68khblkwn7c1kc6cxk265nw7awm"; + }; + meta.homepage = "https://github.com/gaoDean/autolist.nvim/"; + }; + autoload_cscope-vim = buildVimPlugin { pname = "autoload_cscope.vim"; version = "2011-01-28"; @@ -1003,12 +1015,12 @@ final: prev: bamboo-nvim = buildVimPlugin { pname = "bamboo.nvim"; - version = "2024-01-30"; + version = "2024-02-13"; src = fetchFromGitHub { owner = "ribru17"; repo = "bamboo.nvim"; - rev = "b79d540b251a2085d439f5a7c0fe12b9ed54bab6"; - sha256 = "1qs0fw9f17x7xyqgx0911q3szrnqfrn77q2ja5pcf8vhq1hk4f1y"; + rev = "2c5a7442f8db3dcc3f5175f0bed73675e26e3931"; + sha256 = "0ana0pad4lcqg6mcava4mvvi0c9bwkcgfql1xgmcxmz1svgrqkqg"; }; meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; }; @@ -1171,12 +1183,12 @@ final: prev: bluloco-nvim = buildVimPlugin { pname = "bluloco.nvim"; - version = "2024-01-22"; + version = "2024-02-13"; src = fetchFromGitHub { owner = "uloco"; repo = "bluloco.nvim"; - rev = "e97a9d61fad847a8d98c280181dde1c228be422b"; - sha256 = "04qbp7chz009kma6lv2zvqkj9z5hv3c45h0zzyc0w145450isqv7"; + rev = "c585fa3b1b892453b1f68df4c52b4f684a7ed7fe"; + sha256 = "17q3dwkhdx74xrxzl3069ia4fl0fj2n8k57s56k59v7f1v1l753i"; }; meta.homepage = "https://github.com/uloco/bluloco.nvim/"; }; @@ -1339,24 +1351,24 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2023-12-16"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "ec6e23fd2c0bf4ffcf71c1271acdcee6e2c6f49c"; - sha256 = "1y3ns91ysx684ryxv1zjaw8ghrm2ry4rswhm87im4rwghnwvnrwx"; + rev = "392ef0640b96684e88b3965f32f3bc42530f66c3"; + sha256 = "124chgrnznl75wmkk6slrjld3mc0q7ycpcb507iimyyw70vc3gm3"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-02-16"; + version = "2024-02-20"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "326830f797f38edefa9691cb9de35833b9571b95"; - sha256 = "14s3lcp0pyd9dqi5jhnlv0rd51qia4p5sg7p6hxrdzi86mmkz1b6"; + rev = "9212d5469aba3f0c7a9021640d4535be8fa90af7"; + sha256 = "1y52b8b2yz6wphqgh2gy9fddrha0xxi2nv04gyksr84riiwrpm12"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1411,12 +1423,12 @@ final: prev: citruszest-nvim = buildVimPlugin { pname = "citruszest.nvim"; - version = "2024-01-30"; + version = "2024-02-13"; src = fetchFromGitHub { owner = "zootedb0t"; repo = "citruszest.nvim"; - rev = "6c090d537c4fcc5d187632e7e47943e41a218ba8"; - sha256 = "0x09gz17436fmybr40l69ph0r8k6abxi5jaksn058gh0s6wiq8ic"; + rev = "60e6cec400cd857ffd69d582794c3ce5571c0049"; + sha256 = "0mbs4v35v6xwi44dh8isgp66n6x10q6jkvj3ygvpqanwff6bp89s"; }; meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; }; @@ -2443,12 +2455,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-02-13"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "61cff430c9f15770d0c5e68c1b08067223bd94ab"; - sha256 = "0b6syg14d1bs57nbikiwmragj2ac8nnjk1ns46nbvhc82ixsbr09"; + rev = "192a6d2ddace343f1840a8f72efe2315bd392243"; + sha256 = "0lcg301wkf9whm1gaybi6q7vw0yc7pkh32fj5zs95v2jm0glnkpb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2516,24 +2528,24 @@ final: prev: copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-02-17"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "79e1a892ca9b4fa6234fd25f2930dba5201700bd"; - sha256 = "11awdp6gmbiy9vp2bpd05x1aj7z5c3x6gkbbx4kjgk613589x7kg"; + rev = "4d32b064fedbdbf8f3fa83afa1b19ebafd3a035c"; + sha256 = "1rh246zdczrcdgicq5a848wd1sc71409qkpaj4w205czvxa21f6n"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPlugin { pname = "coq.artifacts"; - version = "2024-02-16"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "de9d71b7fbf29ec8dc06adadb18621c55556a59b"; - sha256 = "16vwf4rvbv00xg12spi8p48ciwkk1w4rlf70vnapl955r08mfwqh"; + rev = "1b7915035e1cc6b40d27c69051fd81e8fe6b62db"; + sha256 = "076n62rnr9gahw1n8j94xgrab5q1d09sf98p4nhh32gc1z4w2hd1"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; @@ -2564,12 +2576,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-02-16"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "cddbe83386efbce2a33373df1f98b3bd0b9c10a8"; - sha256 = "0v7lib5mb1washicqqzl1m3gm4wd6bi3ivygfd5j0j7kxvv6f0hw"; + rev = "6ce3cf79d66a47f368d173a2806fe107ac28f877"; + sha256 = "1pvrkckfzwsbbmrd8b08kr4jbl3fcbspg6kjnzqy9hc7yxvq90kh"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2696,12 +2708,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2024-01-16"; + version = "2024-02-15"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "5eacf2e0a36c6c44645d66ab7950a126af15dfc2"; - sha256 = "0a4v1xakcq6sc3kshl45r6iy0y881fv8zc2nyylqgy9xh5p37vzl"; + rev = "7b83422a9318e036ac21df6a63c0ab1ca745e54f"; + sha256 = "0dhp2726drdvx63vqcm3kmlk6bi7mwjr40fgwz9zspj8jg8gj40n"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -2744,12 +2756,12 @@ final: prev: debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-01-21"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "0c81cd2bab372bba99815f505eb1fe759d38dd88"; - sha256 = "1vyn98y3mnhdpa1yvlarqrs4wzfkgn1g70n5s0x3h1kvs1256g8c"; + rev = "4432f917be7e0c95a21af17b31b216fba60fb131"; + sha256 = "0q21kdch8ksb7i94160w5fmja30yvz6rpxkpls0g3ijaafxyk6w3"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -2852,12 +2864,12 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-02-06"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "ebda886f724fa2eb8aaa51d569903d5c359f0887"; - sha256 = "01ln1yp9ymryc5fps1w91a99fn8bdm2gc56k9cmb07mc868p20ll"; + rev = "113c492120e5549aec8c271be2c977024544e4ce"; + sha256 = "0vp7cb7pppd0zb0c60h5h5v4bhg4c7h0gn50p072rf8bs5yb1qv7"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -3214,12 +3226,12 @@ final: prev: doom-one-nvim = buildVimPlugin { pname = "doom-one.nvim"; - version = "2022-12-24"; + version = "2024-02-14"; src = fetchFromGitHub { owner = "NTBBloodbath"; repo = "doom-one.nvim"; - rev = "a43528cbd7908ccec7af4587ec8e18be149095bd"; - sha256 = "0zv40jrr9d65kny43bxcfx6hclrsnhirsb9cz87z08qbz9jkbywm"; + rev = "6d05890f8677d6074037ad4e7faac3f2c892a66e"; + sha256 = "05c0sjfbi72i54cwc5q57w5aggb8jgws4cjxqsibk20r5yn4wny7"; }; meta.homepage = "https://github.com/NTBBloodbath/doom-one.nvim/"; }; @@ -3250,12 +3262,12 @@ final: prev: dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-02-17"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "da63ca9b24f18b814ac75881b1e36199a7676047"; - sha256 = "125caxl299svj1lnfr718ahcsg2d2aia9mhm3jx4753piha07bsw"; + rev = "a133a7deed7431496d8e87e8e4cc9c09a9d78945"; + sha256 = "1ai1fhwlrvr0p8brqapfrdd7rlkarwf78f6plannydd58zlc4j7p"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3564,12 +3576,12 @@ final: prev: fidget-nvim = buildNeovimPlugin { pname = "fidget.nvim"; - version = "2024-02-14"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "4e854f3299e21d1c18279add340428a97520fc44"; - sha256 = "1519w7hb5xh1cgpcgi323if1wiq6n0vyfilza1wqpbbk6801rlfy"; + rev = "60404ba67044c6ab01894dd5bf77bd64ea5e09aa"; + sha256 = "16wf6jk18r5grg0l0pqmq45nkchj5jdbdqil5v1jrvwpf7d37yki"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3661,12 +3673,12 @@ final: prev: flit-nvim = buildVimPlugin { pname = "flit.nvim"; - version = "2024-01-13"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "39e3399ed2cbc328778258ac0d497ece9ed8fe32"; - sha256 = "0pmaymd1n8k829h2pb392xbnm9qgbsxxnzgjzv84ylmrvr6r83sq"; + rev = "94419242ba07170b0009514d745e617b120964f4"; + sha256 = "17zzabbn5f7sk0sq0j4df15jmy3q30j851gxzwf2ahrwbzh2v36z"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3721,12 +3733,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-02-14"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "28482c71537bb748ccede91facc93a2ea2803a8c"; - sha256 = "16qa5hlj1a1aff89hfmg1my3k60rvxdibhx3ian3vrh5zmmf4762"; + rev = "01d72d9c1bdf2d454a60c5ba450f83e5ea783f6a"; + sha256 = "13xw7vh9ad6ipldxk7q48fd8gwfr88i1n0j3ny18mz3cwg1mldzk"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3877,12 +3889,12 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2024-02-11"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "91ec17b4fd0d810599f054eef08db967a0457fbf"; - sha256 = "1i3qb43mfkn32lkqkql9vrka68ljxc99slns4wp2mvc2x6xamdj7"; + rev = "3b3cc17c7bb91f6bbef7166c0756f89a189c4db4"; + sha256 = "0214vy5sid8kw8c65cr795039wchnvayhnij0vryj905m40d9f2c"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -4081,12 +4093,12 @@ final: prev: gleam-vim = buildVimPlugin { pname = "gleam.vim"; - version = "2020-06-24"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "gleam.vim"; - rev = "847a5ef57c2faef2774242c87f711d1131b89fe6"; - sha256 = "17kjby64zdnmhyia1cx9jnk4mss0gca1jz1m4hff9rl63i56bql1"; + rev = "d2f6d0b0399ab6d76b4a17b77ffec590fb2ec1c2"; + sha256 = "1pimv8cj4a1avxhnv687a9dlf0lvpny9q588lk8xr2dx1fxkcm2a"; }; meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; }; @@ -4380,12 +4392,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-02-11"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "48bd9e6581ff9442f1ca81995df2f1c3acba24a0"; - sha256 = "1bknval844d889vbsivd1ydz2bm60hmqhbh2xlb8rqbr1w8g1sz4"; + rev = "217cb7958ebbebf360f7c43efd5129e66d748042"; + sha256 = "14nk6jyq2y4q93ij56bdjy17h3jlmjwsspw3l6ahvjsl6yg1lv75"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4559,12 +4571,12 @@ final: prev: hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2024-01-25"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "4deb08235bfccfbba8b0c031b1cfc8189883cdb4"; - sha256 = "0p3q671s1wca9qnyssbigafh7ylbf6yg2rxn1s9gxgmksvmj0d1a"; + rev = "b18d3d82e8545d9f765870c1d8f0da041bd61097"; + sha256 = "1jb2wbkrx4cdncwz991lxhgvfsqkx6zq004ig7jpw8hbkxd6db3z"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -4655,12 +4667,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-02-13"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "4c6cb5ad93ee93d8d7b7c84e1eb291cee99f0a0e"; - sha256 = "0z3c7l12rjabb70rrlagj2j6cilvmqhws2dn0fp8s2mnapgcj7cs"; + rev = "b0e24e6f4b2c8a7a5656e8418bbfd2200cabc9b9"; + sha256 = "1wnhl0lkl6vzwvkas13bp5pi1j3zdyhfqclm248czxp9kxi4y1zl"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -5004,12 +5016,12 @@ final: prev: knap = buildVimPlugin { pname = "knap"; - version = "2023-07-25"; + version = "2024-02-20"; src = fetchFromGitHub { owner = "frabjous"; repo = "knap"; - rev = "503010f541696e99ed5c62f658620e546cebf8b0"; - sha256 = "1aqfy1c4h95p94npdvyd7dhkr19f4qbnmr05sg1wbvqd9lfkslym"; + rev = "cf478b707eea4eaa775b2977b816a5d567c0209e"; + sha256 = "0pz0kdx62msjhdfmy52hg6sdh6kn1p79khisggnj7ljjp73dmcbb"; }; meta.homepage = "https://github.com/frabjous/knap/"; }; @@ -5100,24 +5112,24 @@ final: prev: lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; - version = "2023-12-15"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "1e08e3f5ac1152339690140e61a4a32b3bdc7de5"; - sha256 = "1rs3sva578j28hy6881w2wjxixl7g7rirard0fljxz460wfnr0vx"; + rev = "10a5f30536dc2d4abe36d410d83149272ea457fa"; + sha256 = "16cf52l4di8pi8b8h7fqnq75spsxv3xvhcqhrq8arcl9zz2pwcbf"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-02-04"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "1a2a2dfbc7e6775e9ec8b84e5eadaf31fde1894e"; - sha256 = "1lnwsiam4wkqjaamkdb34y1mgy5pir38kssm41v3w83n4gnn8g6f"; + rev = "dd37e1d2e320fb8a0948bf6ca3f7703c98b80ecb"; + sha256 = "1n9477lfd12x76vah2p25q36djjf9vmxlqimzdjfl6xs2c3vbcsr"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -5148,12 +5160,12 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-02-16"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "52f7ce4fcc1764caac77cf4d43c2c4f5fb42d517"; - sha256 = "1dpgj7pmq76mc0vg1ahxnh3scl3zdydyfvrhb8gjmdhh32lzwi13"; + rev = "b41f48643b483bb0881c0f7804f6f0be7bb95155"; + sha256 = "07jf66bwq5n2xjgkf05983k7y08g547xry6114wcsvjkn98qrxj3"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -5232,12 +5244,12 @@ final: prev: lh-vim-lib = buildVimPlugin { pname = "lh-vim-lib"; - version = "2023-12-27"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "ec13cd3f042d35c87bddba6c727f5d98091ffe95"; - sha256 = "0c41cj9f2wc13sh3blby8mpmvqrq7qaz3kq1araxm2p1np4spql1"; + rev = "8f01365d045f46900c506b99ea1a401f45482619"; + sha256 = "1pkx161bkpdbb9kj8nz510zb7yf6axnsqsh9wsqylp8s5j3grrxs"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -5724,12 +5736,12 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-02-14"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "fe4cce44dec93c69be17dad79b21de867dde118a"; - sha256 = "0p788r8k6dj8w5kxkhg8jwzrgyspvlbwd48lhday1gvqxbgfrcb8"; + rev = "21d33d69a81f6351e5a5f49078b2e4f0075c8e73"; + sha256 = "1dxx7b5aadhws58dzxh7am0rcnzzzhfxbsnkcl5hp9d221wkvi3q"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5844,12 +5856,12 @@ final: prev: midnight-nvim = buildVimPlugin { pname = "midnight.nvim"; - version = "2024-01-30"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "dasupradyumna"; repo = "midnight.nvim"; - rev = "13d812355db1e535ba5c790186d301e1fe9e7e1b"; - sha256 = "1ynwivjw4kn4zz4ahpinvdyd5ndcss308nbqap5pnqzza2k8a7qh"; + rev = "b5a1dd02a3c2ddc56de8466da45895b19981584a"; + sha256 = "1ajpkw12ff7xhzl3axl5y3q13zsrjm24mydwr166x3lba6ccqif2"; }; meta.homepage = "https://github.com/dasupradyumna/midnight.nvim/"; }; @@ -5858,22 +5870,22 @@ final: prev: pname = "mind.nvim"; version = "2023-03-22"; src = fetchFromGitHub { - owner = "phaazon"; + owner = "hadronized"; repo = "mind.nvim"; rev = "002137dd7cf97865ebd01b6a260209d2daf2da66"; sha256 = "1p7gb8p1jrb2wx3x67lv7am3k1a14kvwsq89fdpb8b060s2l1214"; }; - meta.homepage = "https://github.com/phaazon/mind.nvim/"; + meta.homepage = "https://github.com/hadronized/mind.nvim/"; }; mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-02-16"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "1d49300d50a2c8ee7faecceb151084f207ff65ba"; - sha256 = "1md4wbydbnwmyw72pj1w67a0ljcgx4qam2a41ka3bxcr2hr2n5nw"; + rev = "b7403ad0c2a4dab777244171ca1b7e8c89696584"; + sha256 = "0xxli77cs0q2mk3ykvirvfs10dk8ydx9j9fprmgvvis98d4ir14j"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5964,12 +5976,12 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-01-26"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "21d766c2d60e5f6e03f507e7f3e382a2a927ad41"; - sha256 = "15bnp062hxjh477pr5rqs4w9wpqy6rf2h64l9hsaijamrk19qd4y"; + rev = "8346bba69e0de96278dad2038e9be74605908b7d"; + sha256 = "08f3zxzka43f87fks56594476h57yq01x7a1zdsn4acc278xg1nb"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; @@ -6012,12 +6024,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2023-11-27"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "8e876fe9db46c1b76c151202b418df21eca07bad"; - sha256 = "0jva5l38ikzgy0nw2il6yfpm9z7ibi99ijfqnwcy7zq9kryysnmy"; + rev = "8b3e14682eed06a532b155c7eae33e174846b3fd"; + sha256 = "02ar7m9g92lg7rhz7l1vm2sn8c353wk1rvl32wdbqsbi70ac8pi7"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -6276,12 +6288,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2024-02-16"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "db178f4a49c19f8e4ed5a01dafa9d79e76f0081e"; - sha256 = "1kzbz3163mw70cbxwf0kpb5dhz3qh68ywx23n7m4mzrg4anwlhkb"; + rev = "7d3b02073e59ed9ef271795787de76d0de8f5294"; + sha256 = "0xqy1lxs450w21688a8190jsda8az9745pxyb5l6lbl60r9m9fkh"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -6300,12 +6312,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-02-17"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "4ef6c6c5882e7e16209173fb8c47414202843384"; - sha256 = "0shaipc3nnm3gr19ivxcyqydihlryr07axs1sqvhy0x0x02y37jp"; + rev = "faab415b0ba57f0a15a82210f346f662e6551e1a"; + sha256 = "0malbx94g0rf4r068yl3whlwcxyy41i1z1j2pgajxbrg7w03bymy"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -6336,12 +6348,12 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2024-02-16"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "de3685b8c1cd439dd96b7958793f6f381f98652d"; - sha256 = "184v1zxbcrndkzbqa9v9mc82vy0mjjwkww62n6nqqvf316dklzwf"; + rev = "f7f249b361e9fb245eea24cbcd9f5502e796c6ea"; + sha256 = "1ajya6chj85mzn4k94y2ihbnq4z6fwpa61k04rlz45n9diaczai6"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -6372,12 +6384,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-02-12"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "1c0369a39587054ff473179c1c04e793fb3d6378"; - sha256 = "12viin5g409ac5d6p62hz9kyvzrjiyg0l04m28i1hxh5qn719k3q"; + rev = "0d0879b0045fb213c328126969a3317c0963d34a"; + sha256 = "1nflx2kk2q0kwwxafbvdfa92pn4vzvynr4jqd5jni9h7n5xvg9dl"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6444,12 +6456,12 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-02-15"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "7b3e794aa8722826418501608c8a3ffe4e19ea30"; - sha256 = "1cr8hxwyzcca5kwajadvsmi0v1hzr8lfi3gcyhilxjnmaiiqaing"; + rev = "a157ab3ee86a125a6f83ea9fa6e1f8f1c7ac6da2"; + sha256 = "02j77kdjaqlhbfcp00q4yl4fr7k2c5773s25kdwnwkkv81pvpnrh"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -6552,12 +6564,12 @@ final: prev: neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2024-02-07"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "cc387cbd39fd7455ea0a3e0348ccd0da35aa3443"; - sha256 = "0fndhlgwngvm5dnxxkpv8cbrf1qk5pla2ys9pmgabf3q7js7lq0f"; + rev = "c19df2a139d88c5b4130b830d2cbe63a2c6c6c0c"; + sha256 = "1bb9dv6g7x793hgbg20lf8igjym2ixcxk8ymrrhlcn0489sx79rb"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; @@ -6577,12 +6589,12 @@ final: prev: neotest-go = buildVimPlugin { pname = "neotest-go"; - version = "2024-02-12"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-go"; - rev = "ba5d536304ed6971f00d16b48ec26997622ffb43"; - sha256 = "0adbz26anv3qnwjw018bkxcf3syjxjdkv71zw3lnal34k5xp6x27"; + rev = "6a2f996d89fe4631942e035b1c114544ee045043"; + sha256 = "1jnsgkmsm2jmjd5zhkf3dhrbc04ysz3n0n28frsbvh839n3cdm7f"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; }; @@ -6601,12 +6613,12 @@ final: prev: neotest-jest = buildVimPlugin { pname = "neotest-jest"; - version = "2024-02-12"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-jest"; - rev = "c2118446d770fedb360a91b1d91a7025db86d4f1"; - sha256 = "0wzgwx4mdwhrj77bf0wv6rv4qjii118hayavdamwsszpm1ddyvaz"; + rev = "959d45b133de938c79e3f064db188680eaf69055"; + sha256 = "12mkqbz5qg59nc3lqn5sl7dyi5631xpish8i4c5xaaxn3k5b9pss"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; }; @@ -6625,12 +6637,12 @@ final: prev: neotest-phpunit = buildVimPlugin { pname = "neotest-phpunit"; - version = "2023-12-28"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-phpunit"; - rev = "c0f398a239b24a5960ab6f76094bd535866451da"; - sha256 = "0f97fr27yvvykyzvpv07azsaa1ik5aci5vn6xk48xzy74ha1njr1"; + rev = "2f01e83eedbcf6f0257934b32b5d4fda404a9f11"; + sha256 = "0yqi7n6ljr3drgng9yj7im6x35fjb9ap5p0svv1n7lwcbnnbywai"; }; meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; }; @@ -6661,12 +6673,12 @@ final: prev: neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2023-11-02"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "8630acad9e84b8267646bc8712a4365af7a12f2b"; - sha256 = "13s3im555wz66z1hmmn8zlpy6vsry0xi87yxfm7hjpfcb56lqncc"; + rev = "3f08e43dade616dc271963af94ce5ddd13b61159"; + sha256 = "12jb71d760z4myd78w3i2cccbbabbyiq8m1s3yfpvz1cvbqwfwqg"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; @@ -6709,12 +6721,12 @@ final: prev: neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "2024-02-09"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "75bb96b8b18adcf5152fdb8a9342373a20a463ce"; - sha256 = "1k459x2dyw2gr3i9ayqwldbad6zwbr6sp7js1bz9i4ily8wn5y7y"; + rev = "c0ea475596483eb02fa8e92c6be65c0536d55630"; + sha256 = "0ksja6zr6l9jcww33sy72g4s82gbkvryh0wm98jfbdsiybjffb50"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; @@ -6805,12 +6817,12 @@ final: prev: netman-nvim = buildVimPlugin { pname = "netman.nvim"; - version = "2024-01-05"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "miversen33"; repo = "netman.nvim"; - rev = "6f1e2687d6e534e588d8281b987f33c3f0870e8a"; - sha256 = "0grdfvd222b4992c3g6wj86jpy73v29ihbz4k8qs23wqgmz7x9r2"; + rev = "d0ec9d4ca195b2c87bf46ab050130a2c806310c4"; + sha256 = "0043r66vr10qwdd305q4ckizk8lkm0xy4wazm0yfhq37jwrbhh7d"; }; meta.homepage = "https://github.com/miversen33/netman.nvim/"; }; @@ -6841,12 +6853,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-01-21"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "7ef3da23c5b7f9e08ca7e1f9807c1a5a93e2f33f"; - sha256 = "0p0cfds0z409c5ydn8j7ycsh9jmaz0a7izakgkmg8lpqihvw6dc2"; + rev = "92f03c01405477fc61e410bb75d4387781a493dc"; + sha256 = "02ih6pjapws1j62mxa02dljjzm82bzms4ccjldsz5l02ks0k8vcr"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -6949,12 +6961,12 @@ final: prev: no-clown-fiesta-nvim = buildVimPlugin { pname = "no-clown-fiesta.nvim"; - version = "2024-01-30"; + version = "2024-02-20"; src = fetchFromGitHub { owner = "aktersnurra"; repo = "no-clown-fiesta.nvim"; - rev = "dae9bbb61223218d0043baffb3ede4cee9568872"; - sha256 = "0dg6pk8p7gc18nf17yxbs0c4pv1ng44n41jppi71dgv6xb481mbz"; + rev = "667d51fd990d52f7ba80d9f76baa217dd79c6b11"; + sha256 = "17kg08fx15fn94073ppnmga3npr8ba9qjxnmhfccph49i90q7d95"; }; meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/"; }; @@ -6997,12 +7009,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-02-13"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "34b1311bd07bd3741e60e06b34d0709d6e5a9f0f"; - sha256 = "07bxv7xcjgyzvmh4lpdqn2350awi2ah5bjrimqvcm0hrak7b204x"; + rev = "0f7e1094d06c9d0fa31f545db7f00a0c518397ef"; + sha256 = "0c970nk32grmc3syw6rqf9szfkxnkjpj1jjajh3c02rjlid56w7y"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -7141,12 +7153,12 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-02-17"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "2e8a10c5fc0dcaf8296a5f1a7077efcd37065cc8"; - sha256 = "1d02klx0fhacg1ighmz84176rrm0a28dv19fnryhd0086b8ykrr9"; + rev = "1efb4f2e754d282762a1413ea0528d9a45143cdd"; + sha256 = "11mxb1xj5m24hgc52cdns2cndnn1m3m5gsv7yzd2zy4iqdjf9y1g"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -7177,12 +7189,12 @@ final: prev: nvim-bqf = buildVimPlugin { pname = "nvim-bqf"; - version = "2023-12-06"; + version = "2024-02-20"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748"; - sha256 = "1kla734nj2q6bin9d1gzm4kml0bl89q2hfr0l9ly2lw3s506nynb"; + rev = "654c904d5ad9dc4846445056086168e25bd8ba2d"; + sha256 = "03gy2qnx7r6h0kk6h1x4pshwh08q5zaw5pxdpwnyfi9fkgdidcyc"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -7345,24 +7357,24 @@ final: prev: nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2023-10-07"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "a5cc8dcad43f0732585d4793deb02a25c4afb766"; - sha256 = "00nm95dpbmjnndvh8kapbgmrbfjqg3dd8hhrwgd3rmk30d777zxq"; + rev = "64f73400761e2d19459e664a52ea478f3a4420e7"; + sha256 = "1r6cqvz6kfmkfq6a5vv9kqqqs8sfwhmr26wilrd18sgya58hbdvn"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2024-02-01"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "f5b6f3a90aae0284b61fb3565e575267c19a16e6"; - sha256 = "0drz7gmlg5kyz8a3xhczwlg2bc7lpdwph4q3acjm9skv67cp5bfj"; + rev = "66560f0ebddf96604f7037e1efad3ba6942761e6"; + sha256 = "0yc96r53iy0iim2nkl3rz5fza148fs6wk9y9k19k90ilzhh2ay3k"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; @@ -7465,24 +7477,24 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2024-01-25"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "cb3bdad6501d6314fe0ed00eee883b98fc0ec8db"; - sha256 = "0hh6cccs32g7b1ashz7kjmrcgfdjrd5dw3as0b3d5v04shm0vd17"; + rev = "6ec3af16ba9110a95513ab0527053410663b10c0"; + sha256 = "1jgifrzmzv4f3vaw60xmjwjzihpc2qz90qidqzls02swmh84vada"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-02-17"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "6c177613d5de2962c4d5b79d96894d77b7b55c31"; - sha256 = "1563bbwz2szy0gc7i17dii5y1bq0s78dh8k9z5xbb2a415s3qr1s"; + rev = "44525161735e6e5726c9e3eb0a504b2c975b7a64"; + sha256 = "0z95473fx8ys4yd5j6nhn5v24bj8sfzv8rb9hl581a7zp2fmwxif"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -7513,12 +7525,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2024-02-17"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "01b57f75b00e71541aa328398d5e10ba5ca3ea18"; - sha256 = "0mfaim31n99j7jd9q1i67ri5a8jkkfkndyhqvl6dcybziyj86l8w"; + rev = "382b9f625861f47d95876bcfb4c261f3b96077cb"; + sha256 = "1c65a12w1lmh16f6rwpq5nf5xqr3sna7arbwywh0bnxg6i3lhbgf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -7596,12 +7608,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-02-16"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "31be66c27214174a28fc092ffcf4bb3e8f6cfd43"; - sha256 = "0n1rkxddmz4q7isf49cigr0viyny758ds8bj3g1rcgd7qd7x4s3m"; + rev = "85fe14d080d902dcc566461f0205495d0c153372"; + sha256 = "1xs45spp4j65hxmja1jpcqsmw4sr32vxmhhqwaza7b54z9pb82qy"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7632,12 +7644,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-02-16"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d1bab4cf4b69e49d6058028fd933d8ef5e74e680"; - sha256 = "10sfqf97v2cr9l6fb1i9zvv5srlc0hzm3k74ivb9vwvj6d3c2kfn"; + rev = "b8751ff9ac9fd6ce253e0653d898de02e54040d5"; + sha256 = "1ak2fdsp2rbv69swzxw8x8ki5c03alzzamkdz1m3jpjd5x1x62hn"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7692,12 +7704,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2024-02-14"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "94c8d4d3b13bbf51594cfb940454af33e1149f8b"; - sha256 = "1p6rpap752y0y42xhl5jkmv08fx1aggjnqyb9adsm11p351yqm1r"; + rev = "9f498a5f74771cedaa05871a79df91aa09ad6bd9"; + sha256 = "1ll7nihbwl8rk0l9zrl55rapnc7h1hwcgmvgm6595zjba30sjazn"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -7860,12 +7872,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-02-13"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "1852d8927e3e4c53df8c675a8a271175483c6ede"; - sha256 = "0cq9q2q7lmbcq0xcrr9wxvkhb36vsbjg9bm84rqga740db1az1da"; + rev = "7ef112edde3355cb50c3b7bf1e8909c8d2bc3186"; + sha256 = "146ljp5gh7vypr7hj6xxkzhlsg7dja4f0b1651clsi0sarxd59s9"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7884,12 +7896,12 @@ final: prev: nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2024-01-14"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "8e4e39a4bf5f8939fcf4898d1fba48d1d1f72303"; - sha256 = "0ib8vlh2v3s93b15iv49yzx68bz4rhcgbapdp9cjxdlnvqzyf27y"; + rev = "6295b6cb30725c343a8986096c9f04b0e7646c52"; + sha256 = "1rplgghm6xr803xhgshrnbs4qvda4331znywsfwycxqyl7zvynsf"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -7908,12 +7920,12 @@ final: prev: nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2024-02-07"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "6a0785ef64c839d935a2f92e20988e962fb6537e"; - sha256 = "1qn1w0n209fhi160mr2jknvly53zj2njcy34cszw0v7sal3achlw"; + rev = "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf"; + sha256 = "1112r1qz44mgvqda98a1ch4w262n5hs9ylgp9fdvgz62nhgxgl5m"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -7980,36 +7992,36 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-02-20"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "030defdb6522f5f716d8201d20ca1a2baa57ca66"; - sha256 = "sha256-eWqm1Vk3KQspImy/k2aMXFmsXkVQkMjrVidUVmEJzek="; + rev = "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677"; + sha256 = "0dngnviq36z9jsm1p6w4b3xg31k6fj05xdk6qn0cxjjharrskazi"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-02-17"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "17d68ac13c902f55253b7facb47df4c0ae532575"; - sha256 = "1m77s8va6h6g2xvjfjw3adigyg09z0qnrwbfkbymksa36y4jgc11"; + rev = "9896ef5f701cc8258c4f04c6944b77e7cfa244e3"; + sha256 = "0qgvxhhkamkj55nxy7hhyykjpw8jb1gphay5pxnlkayj05rjklih"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-02-17"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "23b699ac40091d8c729f024b3f1400bc7e26e0c5"; - sha256 = "0mrc0ilamj956wmymr2cc6zjjfxcrzp32iwhy1gmj9hxwacllvw4"; + rev = "e4a259f05032983c8611ca150ac25f1df62c0871"; + sha256 = "1f4fv4ip7p4db416cijfx6li7k3pvpc9y0gbkad3q2i2ax5cyw8c"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -8124,12 +8136,12 @@ final: prev: nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-02-10"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "7f30f2da3c3641841ceb0e2c150281f624445e8f"; - sha256 = "1srssx18fgipznnl6b3lk17jkv0acsx6cw86m6x788nawl6qhsv7"; + rev = "14ac5887110b06b89a96881d534230dac3ed134d"; + sha256 = "1l02wpzxac4ykghficsdhgn7ix2896qhaisxm4f7xbl72jl77h44"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -8208,12 +8220,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-02-14"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "0a6739d2229c8eb30396db550f3818e092088c27"; - sha256 = "1d1xihqkb1fcaqbkdx4pr7xa35g66v9z4bqdv2pk89pa1jm3k1sl"; + rev = "a53ed63a493b54e4ed90281a2d69aa1d2dd896f3"; + sha256 = "010a9sxzam788nswma1ln88h08a9i8lskdvzgq7zcqhv9lcawzhf"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -8256,12 +8268,12 @@ final: prev: oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-01-22"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "bf753c3e3f8736939ad5597f92329dfe7b1df4f5"; - sha256 = "02wjsfhhq8lrai18m3khv7sln070cmwgr7jqp537dwl47v4pq4z3"; + rev = "132b4ea0740c417b9d717411cab4cf187e1fd095"; + sha256 = "085n2mfsv0gmz4f31wpzld804033h73mm7zfhni6xa8ffd7vvldj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8353,12 +8365,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-02-13"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "bbe613372548ef8fa1a1f67d50f55795727ac432"; - sha256 = "0dd2wrr25cj7k6zp0zdhqks3xdg9kivh3m5z4wnkdxv8mwssm31n"; + rev = "3fbb6e8c35589e6373fcb8d49b6318f794740343"; + sha256 = "07iz851rczafvi44bdbcijbahcwjwljsypl80g5zdc0q9i9s313y"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8437,12 +8449,12 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-02-17"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "5a238a2880bc57c156cb23c12ff4af0a0c8181c7"; - sha256 = "02b7zm570b394ynzr47jik3q3basfm8rz4vm99d8xvrjq7vkjjil"; + rev = "80314dfa195da5bb52bf92b749ba669b45eda04b"; + sha256 = "13c15nr0pxq6vizrcvransb770zrjfdqbv0w913kjhvggwc3r679"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -8461,24 +8473,24 @@ final: prev: otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-02-12"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "05cc5ee31fb20e3dd5b4a3a150b0aabf20c86826"; - sha256 = "1vnc1p7949jx53070zl15lpdn3gid4s3c7510ncs1npbwhyh9p4d"; + rev = "216b927dcf6e6b798f7cc5abc9ccd130adb02b04"; + sha256 = "1r7w8r9f01jl07651s3lbqzx5d202g9vz2bvk8zcwfd2lzsj6n8r"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-02-13"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "792aeb6d834a11585ea5d667e3e3f05bc6aa4ecc"; - sha256 = "1s34jqg8p0crrbsv037m9b6gjv0vlvfhrp1acvacwxx9fqbmciik"; + rev = "4855aefcf335bbac71eea9c6a888958fb1ed1e1a"; + sha256 = "1p5cr628qcla3ad1nfnpk9vmaxxspvfjiimyw5n81giywlf136sg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -8498,12 +8510,12 @@ final: prev: package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; - version = "2023-11-12"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "18f8126dd8e65b2e21804c9107785af4abbb5bfc"; - sha256 = "0b9s9a3nz0449sl8zzf55xk12hrkksvnrnbc38i1la234xhrfpsw"; + rev = "45acce5b12ce824332d8000cc2c91805b6710446"; + sha256 = "19aaswkjx7q85c091p80zypx6az0m5z2jccapng5clvh2j4qw7qf"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -8666,12 +8678,12 @@ final: prev: plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; - version = "2022-08-26"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "845abb56dcd3f12afa6eb47684ef5ba3055802b8"; - sha256 = "0d2frv6knkj4bjavq2c2kx8qdnmcq0d8l04a5z7bpqwkmrrhd31f"; + rev = "309c15c77794433f276fb09eb4e3b8f381003cfd"; + sha256 = "0g7yprik607gy01lamql1kpk25sdl54ckfrc9p11rrimal7rms38"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -8896,12 +8908,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2024-02-10"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "e70a207ede642ccb910540ee36480dcefb67ad6c"; - sha256 = "1j5yxfmxzc2zimp508r769vgcr4hhn671r4fmwi3nnsrjgp9rq55"; + rev = "a6e7452de5944f7f38a4b12f1d50e460c1dccd95"; + sha256 = "0l2qgz51yh4pvx494k8p34xrda4mg38m9dwhy9sdxw01qy910xp8"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -8968,11 +8980,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-02-12"; + version = "2024-02-22"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "586f44d21ef687a4d41b5b24c1566d686ae84250"; - sha256 = "0bvnypwlp688024iaswd9p5d6viyf7p65q09fjlkip28rq50a4cy"; + rev = "161eb67a82ee269d1037df64c6d5a05bd5860d32"; + sha256 = "1fg45g6dlnxv9684q3na2kfr5w1m6cbrsjraiap4q7dmndsjxbbr"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -9051,12 +9063,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-02-05"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "fb4990a0546c59136930ea624b8640d07957f281"; - sha256 = "14d33lc0a7r5k7i8x2nzy86xgy6p003cjxv9nc827q1g9jv55r7z"; + rev = "1b593e7203b31c7bde3fa638e6869144698df3b6"; + sha256 = "0q0xbn5xxh4fyjm5v2c2pvai9djyk67xk2brqn209sx3qq8drs5n"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -9111,12 +9123,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-02-12"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "9741f827bd88b588e5136d67c7963e1904f8f1f7"; - sha256 = "0k16kxz31cxgvsq1341r4gwlyjnavizib3hw2c43x7nw7yxj5mr2"; + rev = "c27a0bcb84ab5534d89065d638119ed2dbbae189"; + sha256 = "078w4zr4h302i3d5vd31qypxr2yxhnz0yxkpgvam2z0l3mp07qz0"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -9231,12 +9243,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-02-15"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "ec3288d52ed581ee63a10e41a226297801fa6ee8"; - sha256 = "1nxdyxz416srz4fgpkrnw65kxg6am9ak0yd824667ygsilbcqi2s"; + rev = "9dbc65d890820ca56fff1ea3e0ecef64f2158140"; + sha256 = "0r0j4gp1dks77k8b2644xf3v27qmniam5rk8hgklwcab6wf14r9y"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -9472,12 +9484,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-02-17"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "33c85072ac7901b0f4a68dec7f7d6175f4182377"; - sha256 = "182i7ak4m4bbxgaipc2kqca5i57qw1p244hgra8sv6xgd3qqjhj0"; + rev = "e1e1e6ca3754bd8ef971fb69673cc17965eb9e37"; + sha256 = "12wa0a6igw7hmnmgaspcf2h09vvmcmw49wif77i39bl2asfdblkr"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -9688,12 +9700,12 @@ final: prev: splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2024-02-15"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "3e60a0b460b5bff086b880727392c71276c2c286"; - sha256 = "063lbb56h9slryp5pk6f5s66dzaiyaq3znp3jxc2qrw0h82657dw"; + rev = "1aa617d15a9904107a68f95ebf5036b7d4abf64d"; + sha256 = "1yjygjjiiv5572ccqn00wk7dc7q30r6jnvxv85qrz5bnvvfymvvs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -9701,24 +9713,24 @@ final: prev: sqlite-lua = buildVimPlugin { pname = "sqlite.lua"; - version = "2023-04-19"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "b7e28c8463254c46a8e61c52d27d6a2040492fc3"; - sha256 = "0dx4d29zfp7psp2x42lpag0midadk51fcjiyw4hq570sd0j44jaw"; + rev = "40701b6151f8883980c1548647116de39b763540"; + sha256 = "106j1zzsr97jr0pk6ri2jxdpvqc2ci7g8rlsbb5s30lsqr4ix0ah"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2024-02-08"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "2e9b1d46bf28cf390950c586d5d1c688a009c8ec"; - sha256 = "0wiz6q8fw9af825knpv5rbmk8qdq9p2b42hcybmj0m9jic288qwd"; + rev = "289c6a1499b074c15e30cf437364837dd4966f83"; + sha256 = "1k14nwndx7z3hy7d81zghrrl641bfgpq61n5j0nsrd0kk2xiym61"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -9821,12 +9833,12 @@ final: prev: statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2024-02-15"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "eca428c8df8549fe7a480dd0da0ccc1634f16a4b"; - sha256 = "1p6h5mmz2lz13ghdyva5as1wqh5ysd5d1zgpyvark7w1a10pp616"; + rev = "d954893262a57a92e46edd87de67e2b3fe72305e"; + sha256 = "1i8nvhbrcsinydd1ppnrw6lr3izh1dwp860hr7axyfjgqxgx39f8"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; @@ -10051,12 +10063,12 @@ final: prev: tabout-nvim = buildVimPlugin { pname = "tabout.nvim"; - version = "2023-03-29"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "abecodes"; repo = "tabout.nvim"; - rev = "0d275c8d25f32457e67b5c66d6ae43f26a61bce5"; - sha256 = "11zly7bfdz110a7ififylzgizin06ia0i3jipzp12n2n2paarp1f"; + rev = "6a8f4e67a9bfc9bfc9989cc45253180598cc4339"; + sha256 = "0j4n6f8k2054v77pm458q0qf36ipyk31lplm2m4fszxq0sq0kmwp"; }; meta.homepage = "https://github.com/abecodes/tabout.nvim/"; }; @@ -10171,12 +10183,12 @@ final: prev: telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2023-12-11"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "renerocksai"; repo = "telekasten.nvim"; - rev = "8c2b3889eb31009ae510a43384d1957b37654176"; - sha256 = "1isbz68lbdm50x9mid0l1jid8q11msfsaayw8ravac0z5ybdb8k3"; + rev = "872b83f619ddfe4312acdc658d129b6828e1f418"; + sha256 = "0zcsfzw4gk8jn656l7q850v98r255kcfrbs982ncf2mj7rwrpywy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; @@ -10329,12 +10341,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-02-11"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "47d8bf6c447db33dc059577bd7715665220e79e8"; - sha256 = "0xxvhi1jp3hfaa06f4jzzqxgk79alkvi2vli59j2j7vj0zvkpm53"; + rev = "d8f10c235fa153e3de17bf32e886806c3ed382c4"; + sha256 = "0xrgxgyidz0y7i513vl8ryhsyf3nf9r8408fhhk97ahwdg4kid39"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10474,12 +10486,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-02-17"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "b744cf59752aaa01561afb4223006de26f3836fd"; - sha256 = "1fnzr97xkrg9j713pwi9093nw772xabxs9cxdaa61jy4qlxsnkfz"; + rev = "2e1e382df42467029b493c143c2e727028140214"; + sha256 = "1f4paibs644zwbz7xi0v0h83w6g2rdxqlf4qajcy8lgh1ig1d59y"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10582,12 +10594,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2024-02-11"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "5d85b7495c3cf8e842e4d2528edc68e6fe7c92c8"; - sha256 = "1ri4vp260mvjqkldw9qyp5l31qnks716gz9z2l9vf01wwmxxk76i"; + rev = "d62c63a4e9a996c7321885937ab89920fca2c1c8"; + sha256 = "027cgrh0xwnfgakzibzxj3wh8n8q0x5yqjsvhjgcg53pq0yfdss4"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -10907,12 +10919,12 @@ final: prev: ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-02-07"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "07c9da3e7722107163b68ecc5e0141fdd825449d"; - sha256 = "16aizsf86cg5l131y2lszlfkdz1b998js89fja8yk25mwa79lsaf"; + rev = "6ecf7461d44513af89f8257f057fcc99e9297612"; + sha256 = "01dj9fdzaliwpxh358dql0ndvnykqn8v9w20b7pkn09p1airq937"; }; meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; @@ -10955,12 +10967,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-02-13"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "9d1c75a443fd94efdfa36ec4aa106e0894e03bd1"; - sha256 = "0g99a224v6brxm15r88chffx1cd009yiix3352h0xd9cl3sf88pv"; + rev = "5e51fab2004ecfed1fa03adc24faa29b2cb813c2"; + sha256 = "0y2gkrj026w7kaf3sm62x5fy172gvmkmfg3nlsiwzgm4mlhgsxh8"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11399,12 +11411,12 @@ final: prev: vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2024-02-10"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "20a49bd494a87a40b815289693c8b7505f0074c0"; - sha256 = "1nyjgsjs5n0wkw4419fa1p1dpgrbcxpvxgjg7w0zmkm9s4bifyl4"; + rev = "d9f42cb46710e31962a9609939ddfeb0685dd779"; + sha256 = "1a4pcyzvqsmsvz7fxf2h5b4v3xlsqv15qyr35xniji44196aaajc"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -12215,12 +12227,12 @@ final: prev: vim-dirvish = buildVimPlugin { pname = "vim-dirvish"; - version = "2024-01-24"; + version = "2024-02-20"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "0966b866580ec5cc8fbc26ee396a516d72600db5"; - sha256 = "0jmpjrx4kl11hgdaiw5wxfznmn5apl38ykih0mm01hcg49gzirsw"; + rev = "b660af1fa07fe1d44d4eb3ea5242334f6c2766ca"; + sha256 = "1h0ypp7fp47dk8sj1xgrm9113cgsvdczmfilbrix5rmm9b0jph2i"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -12239,12 +12251,12 @@ final: prev: vim-dispatch = buildVimPlugin { pname = "vim-dispatch"; - version = "2024-02-11"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "b84d00f11567abfcfec82a6838c7d41dfa49a447"; - sha256 = "1gfvlki411i090rjww2nx3jn6z609g6d64xrn2hryjxyqykfnr9s"; + rev = "4c695bc052cad2ae6b980aebbe48d046466e27ae"; + sha256 = "13c63n7gylny2s84k05cpl4cjn070d3qk6yagxny23yanz29hc15"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -12671,12 +12683,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-02-12"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "011cf4fcb93a9649ffc6dcdff56ef948f5d0f7cc"; - sha256 = "0dmfy7dzfv201fm0l1x18pg8rbjqflg1js6g8f36nlaqn5fvr3bl"; + rev = "4bc9d989930e37989b038540cc49e63728d3f220"; + sha256 = "11xskz5qkld0fqgp7a4rrsrzwphf0jzil0vx7j6yy91adhvqbzqr"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -12707,12 +12719,12 @@ final: prev: vim-gh-line = buildVimPlugin { pname = "vim-gh-line"; - version = "2022-11-25"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "ruanyl"; repo = "vim-gh-line"; - rev = "fbf368bdfad7e5478009a6dc62559e6b2c72d603"; - sha256 = "0phxvn08z5bwdq0hkan9l1rl94ylsjc2hhv1ahzqvda0rk8lqxj9"; + rev = "731751fdfa4f64a061dbc7088cb7b2f12e0828ad"; + sha256 = "06malyx56zswpzf399y7bsxw45fx2ys9ravdqqxgssvgsslq87fb"; }; meta.homepage = "https://github.com/ruanyl/vim-gh-line/"; }; @@ -13802,12 +13814,12 @@ final: prev: vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2024-02-02"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "7f81ae12542b2a35819f0324895df9bd8626c8ba"; - sha256 = "10bbp2hshxghimzlvg6avfqi503skfnjlvxv3aar8rclznxd628z"; + rev = "2d660e4aa7c566014c667af2cda0458043527902"; + sha256 = "0a5527gmwf0chdn91s2s8pa7iny3qa5a88c413g4vwch12mn2vrj"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -14054,12 +14066,12 @@ final: prev: vim-nix = buildVimPlugin { pname = "vim-nix"; - version = "2024-01-09"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "048c71f1ed2c679cd55acd2c807c2c96aea82e65"; - sha256 = "1s75divbphd7qgkljj2bl32gb1q7a23r4g023x6v83qzkfxwl8i3"; + rev = "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0"; + sha256 = "15k08hl1xls2zxa9sgsjygb6j8643pc0s0fpi05bfldf9z4mxzyv"; }; meta.homepage = "https://github.com/LnL7/vim-nix/"; }; @@ -14426,12 +14438,12 @@ final: prev: vim-plug = buildVimPlugin { pname = "vim-plug"; - version = "2024-02-15"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "eee20c7e795c9268ce36cb30adb66711af868941"; - sha256 = "01szxcbdvlh2ki6drmpp3yh8m1a7290w5p997gam63s4y8qvbx8r"; + rev = "2f8f04cf79f424aab8c2372d8e0b89099e3dba65"; + sha256 = "03jvf9fcz5894g990jbmn7mr9afl07fkglph2lz3b5015i6ywy08"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -15074,12 +15086,12 @@ final: prev: vim-sneak = buildVimPlugin { pname = "vim-sneak"; - version = "2024-02-16"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "1f8702bdee0d19e9354ce26735e5d87865b55dc0"; - sha256 = "1qkyd43kxc5i8bxmfipf2jkb1wah9jfskdnwvwbkn2bpw8cblf94"; + rev = "c13d0497139b8796ff9c44ddb9bc0dc9770ad2dd"; + sha256 = "06dlfp0bdnbb75didd52f03r9y8r7g6wh5bc10m2g00zbnfs3mcx"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; @@ -15098,12 +15110,12 @@ final: prev: vim-snippets = buildVimPlugin { pname = "vim-snippets"; - version = "2024-01-24"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "9bd88e07865bd4fa982d46356c227b07de66412a"; - sha256 = "0xy0arqhcndasd4gmh7qbr8aw0ssxgaqy261nzib7f0gd21ig6j4"; + rev = "393d980157b8149b3ff65a48bc4aae24dca9c846"; + sha256 = "0fkygzr5srgyyv59glawi9a2j47b57sp20ak9q4qa3izf0z8pk94"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -15555,12 +15567,12 @@ final: prev: vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2024-01-27"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "86be2d4d7719db34d651df4690ab5f49274c646a"; - sha256 = "1lh8dvh8din5qnm0icmrvsph4aa4nfh91zf1nf8l5kf5yfr3zy68"; + rev = "649f079a0bee19565978b82b672d831c6641d952"; + sha256 = "16lyavpy8qh06l03jqs7klyja3nqs3ynjfy7y8xjmlqa4mgfcffn"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -15699,12 +15711,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2024-02-16"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "cff14071098de5279743b009c496303995fe4df9"; - sha256 = "0v5fzdkihlbwmplfs44mjm08j2qvkq2h6zx0dxn628v7dzqfxcy3"; + rev = "fe1ec7e430013b83c8c2dee85ae496251b71e253"; + sha256 = "0mvirqq1gmp2270bm92fk3c4d96r2jlkl2s36pm1d00b7vd3vpll"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -15795,12 +15807,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-02-07"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "a4c66faea1eca47dce7c7c3586332f75cfbe9edf"; - sha256 = "0ji718y9dkpvqz5r5zkvirksgc4nan5xng53flzjnwdiyfzgz5j2"; + rev = "285c2e4e48fb0c63ced233c00fb10a2edb3b6c94"; + sha256 = "1f7jqmsr7b9103g9fif3p8fglrqlgk5nf3ckhkjpwfy6355vk41h"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -16107,12 +16119,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2024-02-16"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "da7fc248dc699bf423378bd6e48eaa446f674ca7"; - sha256 = "0r241p9h48c7hdiwfx382dpfnmjz78phw2vx0cmbc3mvsjqi71pk"; + rev = "def092693ea33eb2055fb2cfbcabb8e56ea77963"; + sha256 = "0b4md13a4mdf2knmb0p3c83k3v04hl5y4z2sa2kci3shq41v694x"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -16120,24 +16132,24 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-02-11"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "9df79e15bf035d1cfb32c11fffed38dd7b6a0501"; - sha256 = "06k407g6bs3msvvq8715bk21pj80ybgdhhl84zwf9gxrdrl7yapd"; + rev = "01c4c167338b74dc0c30621841bc548b52e96330"; + sha256 = "0gf3ifnyw2207s1r4a0zasx9qdgyymja6nj0dhnys6k3rvax0spp"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPlugin { pname = "vimux"; - version = "2022-09-26"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "616fcb4799674a7a809b14ca2dc155bb6ba25788"; - sha256 = "00lxrajyvg6vl6d87r85wn8swhxq1q2754vs0hnrgxqx6gw4rfga"; + rev = "f7c41607d9246ec4b6cc28587cce84d75d106e3e"; + sha256 = "0df041kccvdgn82qqxbwzamc3g1zs5agyyg2xfkqz4ibayq7z5d7"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -16192,24 +16204,24 @@ final: prev: vista-vim = buildVimPlugin { pname = "vista.vim"; - version = "2023-11-24"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "290b815cd5a5ff1fb65a48936633d93e2bf14dbd"; - sha256 = "1hqnczyyg21lsv4j3kvp0w84xm0fxzvdmgakwx2q1wg3x1g4ybcf"; + rev = "f76cecc430003968e6174cae899c2cb2953219b7"; + sha256 = "0hq41f91f97885vx1rcl981vhwariiwbz2hs0dzryka2ycy5lvy4"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-02-01"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "380c1068612b1bfbe35d70a4f2e58be5030a0707"; - sha256 = "1lq1j6wlh8xxzikpab2gciw6gg88hya92bswz0kk75l6fphp41kl"; + rev = "e4eb84baf3a2b0b761780bc54b726461d23d4d3e"; + sha256 = "1w85w68xsjzi9cp78f24wl3p9pq9wcaf7mxczxc7mgnyzpfm7az3"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -16613,12 +16625,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-02-16"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "9703f227bfab20d04bcee62d2f08f1795723b4ae"; - sha256 = "1sgz7m8gdaam87dw5k609jbihyad9hqmlxplv9xwkp76z7nja6kj"; + rev = "c0de3b46811fe1ce3912e2245a9dfbea6b41c300"; + sha256 = "12m5jzp2xyv0hyndscnj7708b8rczsmqqr0kd4ng7kh5ll0xr8br"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -16637,12 +16649,12 @@ final: prev: dracula-vim = buildVimPlugin { pname = "dracula-vim"; - version = "2023-10-29"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "6495b4ff40479ec7705addb4ea800ec308026648"; - sha256 = "116gnd891v3rqaxk2dki1ril6j2y7f6vcdh421i0xwnvbj91pfc6"; + rev = "9fa89296884e47bbadc49ad959e37b9d1c24cafb"; + sha256 = "0911akib9ys9vyxnalbmyip7m1ahpnsn89km2hrgj0fc9s5m75ky"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -16661,12 +16673,12 @@ final: prev: gbprod-nord = buildVimPlugin { pname = "gbprod-nord"; - version = "2024-01-28"; + version = "2024-02-01"; src = fetchFromGitHub { owner = "gbprod"; repo = "nord.nvim"; - rev = "fb40d5b19205bc821964f795637250911a9fde0a"; - sha256 = "10sswfgcl05wpj98m9qlqdbx16ypvmszpipkqhm1n59j43441m0v"; + rev = "4ae9eb96e9ee65493d4ade102dec7e4b4d4b8b21"; + sha256 = "1pipplqpmif0wmb9w782bq89dlqidjpi0l8dn1fddr3r7zn7xj48"; }; meta.homepage = "https://github.com/gbprod/nord.nvim/"; }; @@ -16733,24 +16745,24 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2024-02-16"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "a0d3fd0adc5fd81dc5128ca3b33949196eb1fee8"; - sha256 = "1kkrffjhr9w8f7qjvzyr82ndqy42w4m542brjvngqd3ykg8ihsgs"; + rev = "7b3225264af17a9e0aff0b4fd2a0fac90b73db53"; + sha256 = "00frh2f0vgz9h3ajbig2df6a6jj1sarbwxnxzr232vi25azysy2z"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; phha-zenburn = buildVimPlugin { pname = "phha-zenburn"; - version = "2024-01-07"; + version = "2024-01-31"; src = fetchFromGitHub { owner = "phha"; repo = "zenburn.nvim"; - rev = "512d5192214000a1ddb430d31df2e2a80c88fa8a"; - sha256 = "1bx0c1xssmvr4ly01gs67241f9wb30k9z8ykwyqicbid2abx2jga"; + rev = "f5ee12b30119499c7fa7f95719cd7c5aab9f9f29"; + sha256 = "10wn4b1awk4bzb7isfqbp3pqzi2ifnmcs7zyrwhna1dpwwdpgvbr"; }; meta.homepage = "https://github.com/phha/zenburn.nvim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 0ccbc9564e74b..7b4653ebf02e2 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -50,12 +50,12 @@ }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=2372f16"; + version = "0.0.0+rev=a282270"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "2372f163b8416eeea674686fe0222e39fa06bad5"; - hash = "sha256-nX0JXEP+fAADlKqMA1rrhKlUS4JMrOtFTQ/wxoOxcIY="; + rev = "a282270857b7be447b8be91411468349a31d73b7"; + hash = "sha256-NAE/E3glGz509nOKO5xsJIwe1Q2OSh6Aj5krUOVhqvw="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -116,14 +116,14 @@ }; bass = buildGrammar { language = "bass"; - version = "0.0.0+rev=27f110d"; + version = "0.0.0+rev=c9ba456"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "vito"; repo = "tree-sitter-bass"; - rev = "27f110dfe79620993f5493ffa0d0f2fe12d250ed"; - hash = "sha256-OmYtp2TAsAjw2fgdSezHUrP46b/QXgCbDeJa4ANrtvY="; + rev = "c9ba4568af24cd3403029730687c0a43d1350a43"; + hash = "sha256-F131TkIt2mW2n8Da3zI1/B0yoT9Ezo2hWoptpsdMrb4="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-bass"; + meta.homepage = "https://github.com/vito/tree-sitter-bass"; }; beancount = buildGrammar { language = "beancount"; @@ -182,12 +182,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=72a60ea"; + version = "0.0.0+rev=652433f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "72a60ea888fb59a8e143883661f021139c905b74"; - hash = "sha256-huEi/PEzjG9mtwL30mJ2oVy+D64d8I9Z/LZc856qlbw="; + rev = "652433fce487d8c3943207da38e3e65e4550e288"; + hash = "sha256-Ld8ufwdOVqRYb9YpOa6z6fWoA+gj0w0nlq3dqhFCap8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -226,12 +226,12 @@ }; chatito = buildGrammar { language = "chatito"; - version = "0.0.0+rev=308b591"; + version = "0.0.0+rev=7162ec1"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-chatito"; - rev = "308b5913fd2ae6b527183ba1b3a490f90da32012"; - hash = "sha256-oD49Rc1J/CkIAqEFI87efdzGLYl73se0ekpQll/Mpxs="; + rev = "7162ec1e8e9154fb334e84aa7637a4af051dfe42"; + hash = "sha256-phvENW6wEqhKQakeXxsTclhSmFWFgfK9ztCszOGuaYY="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito"; }; @@ -248,12 +248,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=73ab4b8"; + version = "0.0.0+rev=f8de25f"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "73ab4b8e9522f014a67f87f585e820d36fa47408"; - hash = "sha256-5X4ho6tqPZFQWqoQ6WBsfuA+RbxTX5XzX7xzyFSTifw="; + rev = "f8de25f30757a2def006a7c144354710fe63dcf3"; + hash = "sha256-J8Ro3J9kkH7k/v+nwekCotoS/l28yInhk9p/xaSbegc="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -314,12 +314,12 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=3d98832"; + version = "0.0.0+rev=e0c1678"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "3d988327a1cfd724c0d195b37a1056174fae99bc"; - hash = "sha256-s7+dRY3OWE7iz9nlqHEOyLlrWaDPF0buDSIjsRYPc7s="; + rev = "e0c1678a78731e78655b7d953efb4daecf58be46"; + hash = "sha256-CdNCVDMAmeJrHgPb2JLxFHj/tHnUYC8flmxj+UaVXTo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; @@ -348,12 +348,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=2c6e806"; + version = "0.0.0+rev=221179d"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "2c6e806949197e7898910c78f514a3b7ff679068"; - hash = "sha256-JAShJo+jDv4kzFCPID0C3EokmeiWxMVcJoEsVOzKBEw="; + rev = "221179d4287a2c24c08e4c67ff383ef67dc32156"; + hash = "sha256-e01PTB+SduikiiDvOW411v0pBXCqOFBWlu3HgmM6jFg="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -370,12 +370,12 @@ }; d = buildGrammar { language = "d"; - version = "0.0.0+rev=d9a1a2e"; + version = "0.0.0+rev=a33d400"; src = fetchFromGitHub { owner = "gdamore"; repo = "tree-sitter-d"; - rev = "d9a1a2ed77017c23f715643f4739433a5ea7ab6f"; - hash = "sha256-GgecDpsZMBTEqHjSbNyUUA6HzGuYEgtqZ9AB+6+fsDo="; + rev = "a33d400f025d6bbd37b4c681c93054976f579890"; + hash = "sha256-LUb+1dTj1IP5ZtWaWBT8UWnGEqb0DJodgbkwnT7xywk="; }; meta.homepage = "https://github.com/gdamore/tree-sitter-d"; }; @@ -469,12 +469,12 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=2743ff8"; + version = "0.0.0+rev=52b3783"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "2743ff864eac85cec830ff400f2e0024b9ca588b"; - hash = "sha256-wuj3Q+LAtAS99pwJUD+3BzndVeNhzvQlaugzTHRvUjI="; + rev = "52b3783d0c89a69ec64b2d49eee95f44a7fdcd2a"; + hash = "sha256-DVx/JwQXFEgY3XXo2rOVIWBRHdqprNgja9lAashkh5g="; }; location = "dtd"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; @@ -526,12 +526,12 @@ }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=c26afd7"; + version = "0.0.0+rev=09dbf22"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "c26afd7f2316f689410a1622f1780eff054994b1"; - hash = "sha256-vYN1E49IpsvTUmxuzRyydCmhYZYGndcZPMBYgSMudrE="; + rev = "09dbf221d7491dc8d8839616b27c21b9c025c457"; + hash = "sha256-Bq2oWtqEAsKyV0iHNKC+hXW4fh4yUwbfUhPtZWg5pug="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -592,25 +592,36 @@ }; faust = buildGrammar { language = "faust"; - version = "0.0.0+rev=9e514af"; + version = "0.0.0+rev=f3b9274"; src = fetchFromGitHub { owner = "khiner"; repo = "tree-sitter-faust"; - rev = "9e514af33bfe061d0ccf1999dbcc93fca91f133c"; - hash = "sha256-FZ5wl6Pl2Y86dNpaRMTh8Q7TEx/s0YoV9/H1J+qwlwo="; + rev = "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"; + hash = "sha256-JwR8LCEptgQmEG/ruK5ukIGCNtvKJw5bobZ0WXF1ulY="; }; meta.homepage = "https://github.com/khiner/tree-sitter-faust"; }; fennel = buildGrammar { language = "fennel"; - version = "0.0.0+rev=15e4f8c"; + version = "0.0.0+rev=215e391"; src = fetchFromGitHub { - owner = "travonted"; + owner = "alexmozaidze"; repo = "tree-sitter-fennel"; - rev = "15e4f8c417281768db17080c4447297f8ff5343a"; - hash = "sha256-BdhgDS+yJ/DUYJknVksLSNHvei+MOkqVW7gp6AffKhU="; + rev = "215e3913524abc119daa9db7cf6ad2f2f5620189"; + hash = "sha256-myh0+ZNDzdUZFAdsw8uVGyo0VYh0wKNZ11vlJKTSZnA="; + }; + meta.homepage = "https://github.com/alexmozaidze/tree-sitter-fennel"; + }; + fidl = buildGrammar { + language = "fidl"; + version = "0.0.0+rev=bdbb635"; + src = fetchFromGitHub { + owner = "google"; + repo = "tree-sitter-fidl"; + rev = "bdbb635a7f5035e424f6173f2f11b9cd79703f8d"; + hash = "sha256-+s9AC7kAfPumREnc7xCSsYiaDwLp3uirLntwd2wK6Wo="; }; - meta.homepage = "https://github.com/travonted/tree-sitter-fennel"; + meta.homepage = "https://github.com/google/tree-sitter-fidl"; }; firrtl = buildGrammar { language = "firrtl"; @@ -702,12 +713,12 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "0.0.0+rev=03f20b9"; + version = "0.0.0+rev=b5dea4d"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; - rev = "03f20b94707a21bed90bb95101684bc4036139ce"; - hash = "sha256-im87Rws9PPcBWNN0M8PNqnthJZlWKzn3iPLMGR+jtGo="; + rev = "b5dea4d852db65f0872d849c24533eb121e03c76"; + hash = "sha256-/fmg7DfVX62F3sEovFaMs4dTA4rvPexOdQop3257op4="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; @@ -735,12 +746,12 @@ }; gitattributes = buildGrammar { language = "gitattributes"; - version = "0.0.0+rev=3d03b37"; + version = "0.0.0+rev=0750b59"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gitattributes"; - rev = "3d03b37395f5707b6a2bfb43f62957fe0e669c0c"; - hash = "sha256-+DvxhL+m3Nagv0GXWWWYsIIDuWNzlK1vNVLOO0qBl2E="; + rev = "0750b5904f37d6b2f47f6e4655001c2c35a172ec"; + hash = "sha256-BXsF++uut1WWxe67E+CUh3e6VWrezNJaPfYJhXB0VlY="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes"; }; @@ -999,23 +1010,23 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=840fd07"; + version = "0.0.0+rev=f820ee8"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "840fd07f09304bca415b93a15483e9ab1e44bc3f"; - hash = "sha256-GPY6udz0YZawmQ6WcItXchUeag9EO+eMMGoYSaRsdrY="; + rev = "f820ee8417451f69020791cf691904ec1b63f20d"; + hash = "sha256-d80vNrZGaPWlST5tgvf25CliuzS+zSZ60f49cRuucZ4="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; hlsplaylist = buildGrammar { language = "hlsplaylist"; - version = "0.0.0+rev=ff121d3"; + version = "0.0.0+rev=5be34b0"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-hlsplaylist"; - rev = "ff121d397cf7cc709e3bbc928107fc25529e11e0"; - hash = "sha256-FItkJbxWfpRne27OPRq5fCHUCX35fxmiT6k1eX8UkhI="; + rev = "5be34b0f6ea01b24f017c2c715729a3a919f57fd"; + hash = "sha256-3ZFaIc4BrfR7dLxftbSLuFdErjYrJgi0Cd8jp9PB19U="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist"; }; @@ -1043,12 +1054,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=438d694"; + version = "0.0.0+rev=b5d9758"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "438d694a1f51e1704cb779ad4fec2517523b1d7f"; - hash = "sha256-NL1tOr7V3QVsVu2OfzLzFpe/FpYVD6MCgdSV0I6AkRY="; + rev = "b5d9758e22b4d3d25704b72526670759a9e4d195"; + hash = "sha256-v3BD36OKkzJ1xqQV87HAyQpnQzi/4+PuyEAM1HfkW3U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1175,12 +1186,12 @@ }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=ac6ddfa"; + version = "0.0.0+rev=3b12920"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "ac6ddfa7775795a3d8f5edab4a71e3a49f932b6a"; - hash = "sha256-T/y1xfHv3G3cTD2xw43tMiW8agKwE5CV/uwThSHkd84="; + rev = "3b129203f4b72d532f58e72c5310c0a7db3b8e6d"; + hash = "sha256-dVErHgsUDEN42wc/Gd68vQfVc8+/r/8No9KZk2GFzmY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; @@ -1351,12 +1362,12 @@ }; lua = buildGrammar { language = "lua"; - version = "0.0.0+rev=9668709"; + version = "0.0.0+rev=04c9579"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; - rev = "9668709211b2e683f27f414454a8b51bf0a6bda1"; - hash = "sha256-5t5w8KqbefInNbA12/jpNzmky/uOUhsLjKdEqpl1GEc="; + rev = "04c9579dcb917255b2e5f8199df4ae7f587d472f"; + hash = "sha256-kzyn6XF4/PN8civ/0UV+ancCMkh7DF2B7WUYxix6aaM="; }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; @@ -1417,24 +1428,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=23d9cb2"; + version = "0.0.0+rev=2821521"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "23d9cb2ce2f4d0914e7609b500c5fc8dfae0176f"; - hash = "sha256-Z42w7gSUV9/9Q1jtCrd03cjlMUjHC5Vjie1x8m8K5uw="; + rev = "2821521a4e6eab37b63dff6a8e169cd88554047d"; + hash = "sha256-JoZ/CKIMHVowwqTMFdys+Qu1CHMsP+8Wr2LJo5h30B4="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=23d9cb2"; + version = "0.0.0+rev=2821521"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "23d9cb2ce2f4d0914e7609b500c5fc8dfae0176f"; - hash = "sha256-Z42w7gSUV9/9Q1jtCrd03cjlMUjHC5Vjie1x8m8K5uw="; + rev = "2821521a4e6eab37b63dff6a8e169cd88554047d"; + hash = "sha256-JoZ/CKIMHVowwqTMFdys+Qu1CHMsP+8Wr2LJo5h30B4="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1474,35 +1485,35 @@ }; meson = buildGrammar { language = "meson"; - version = "0.0.0+rev=3d6dfbd"; + version = "0.0.0+rev=d6ec8ce"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; - rev = "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1"; - hash = "sha256-NRiecSr5UjISlFtmtvy3SYaWSmXMf0bKCKQVA83Jx+Y="; + rev = "d6ec8ce0963c3c8180161391f15d8f7d415f650d"; + hash = "sha256-SwcBhg6luPAOtaL5dhvLxCpJcwlGhZxhvVmn5pa6ecA="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=650a8fb"; + version = "0.0.0+rev=117cbbc"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "650a8fb72013ba8d169bdb458e480d640fc545c9"; - hash = "sha256-Xmn5WaOgvAVyr1Bgzr+QG9G/kymtl4CUvLL5SPZdikU="; + rev = "117cbbc46bbf82ae30b24f8939573655017226da"; + hash = "sha256-c0+Pvhe++fHmRL9Ptri+vsdRN3MCb2Z/7EqWmFaK/CE="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; muttrc = buildGrammar { language = "muttrc"; - version = "0.0.0+rev=0af0e0d"; + version = "0.0.0+rev=67d9e23"; src = fetchFromGitHub { owner = "neomutt"; repo = "tree-sitter-muttrc"; - rev = "0af0e0d8c8cf59dc21cfe565489da0c247374b9f"; - hash = "sha256-AB8c2mV2sTNwN8sZkv3RbRKdxZW467P6epX+Z4LWqbU="; + rev = "67d9e23ca7aa22d9bce9d16c53d2c927dff5159a"; + hash = "sha256-B3/VoPq8h7TiwOP0nhsuPmFtkLsucpDm9RnUNXkfKpo="; }; meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc"; }; @@ -1519,23 +1530,23 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=091b5dc"; + version = "0.0.0+rev=19fb551"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "091b5dcc7d138901bcc162da9409c0bb626c0d27"; - hash = "sha256-HyHdameEgET5UXKMgw7EJvZsJxToc9Qz26XHvc5qmU0="; + rev = "19fb551196d18b75160631f5e3a8a006b3875276"; + hash = "sha256-NXyagRPUT3h8G6R+eE4YrTnWtfB3AT/piXeun5ETU6s="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; nim = buildGrammar { language = "nim"; - version = "0.0.0+rev=70ceee8"; + version = "0.0.0+rev=c5f0ce3"; src = fetchFromGitHub { owner = "alaviss"; repo = "tree-sitter-nim"; - rev = "70ceee835e033acbc7092cd7f4f6a251789af121"; - hash = "sha256-9+ADYNrtdva/DkkjPwavyU0cL6eunqq4TX9IUQi9eKw="; + rev = "c5f0ce3b65222f5dbb1a12f9fe894524881ad590"; + hash = "sha256-KzAZf5vgrdp33esrgle71i0m52MvRJ3z/sMwzb+CueU="; }; meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; }; @@ -1698,46 +1709,46 @@ }; pem = buildGrammar { language = "pem"; - version = "0.0.0+rev=7905a16"; + version = "0.0.0+rev=db307bb"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-pem"; - rev = "7905a168036e23605160a0d32a142f58ab5eaa06"; - hash = "sha256-6gEOrpJ/5UDMMVqKh0XQX+K3JOPiOk5H6CWZgB59h00="; + rev = "db307bbb7dc4f721bf2f5ba7fcedaf58feeb59e0"; + hash = "sha256-uBZo16QtZtbYc4jHdFt1w/zMx9F+WKBB+ANre8IURHA="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pem"; }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=a30394f"; + version = "0.0.0+rev=fd8b951"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "a30394f61b607f48c841c6e085d5219f23872816"; - hash = "sha256-3aWBh5jKXUYXxOv+RKyEpwJVOoP7QuaRQZHw0yOy6tQ="; + rev = "fd8b951cf6f72d48dfd07679de8cf0260836b231"; + hash = "sha256-ejbpska3Ar0cjqDGZXXjRkpDLNsnDUJD0TBsb2cZfY4="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=caf4d67"; + version = "0.0.0+rev=710754c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "caf4d67d55386d3e4f85d29450b8d9cacbb02d19"; - hash = "sha256-L0M9v/T3W3v+pES2AytZ6V4jHfnSklFBRGPW3/oB2Aw="; + rev = "710754c879435178b7643e525c84cd53f32c510c"; + hash = "sha256-vOvuctPCcKs5iQ88Tv3Euxk7fDg06o1leRWUic4qzLQ="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=caf4d67"; + version = "0.0.0+rev=710754c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "caf4d67d55386d3e4f85d29450b8d9cacbb02d19"; - hash = "sha256-L0M9v/T3W3v+pES2AytZ6V4jHfnSklFBRGPW3/oB2Aw="; + rev = "710754c879435178b7643e525c84cd53f32c510c"; + hash = "sha256-vOvuctPCcKs5iQ88Tv3Euxk7fDg06o1leRWUic4qzLQ="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; @@ -1788,12 +1799,12 @@ }; poe_filter = buildGrammar { language = "poe_filter"; - version = "0.0.0+rev=99ce487"; + version = "0.0.0+rev=bf912df"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-poe-filter"; - rev = "99ce487804eab781e1e1cb39de82aea236346c96"; - hash = "sha256-kMk0gCb2/FExKyGPeRDCd6rW/R3eH1iuE7udnFoI5UY="; + rev = "bf912df70f60b356c70631d9cbb317b41c1ea319"; + hash = "sha256-EHftq35YJzElvYiJxiu7iIcugoXME7CXuQSo1ktG584="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; }; @@ -1810,12 +1821,12 @@ }; printf = buildGrammar { language = "printf"; - version = "0.0.0+rev=ddff4ce"; + version = "0.0.0+rev=0e0acea"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-printf"; - rev = "ddff4ce4d630d1f1a3b591d77b2618a4169b36b9"; - hash = "sha256-MIj4tP2+zb43pcnSBSVjPpKxjbxKFJTcz8AJphEvh6k="; + rev = "0e0aceabbf607ea09e03562f5d8a56f048ddea3d"; + hash = "sha256-y/7CDnHpT3D6hL0f+52mReCphn+lvElfQQKJwY4fr9c="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-printf"; }; @@ -1843,14 +1854,14 @@ }; properties = buildGrammar { language = "properties"; - version = "0.0.0+rev=74e5d3c"; + version = "0.0.0+rev=189b3cc"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-properties"; - rev = "74e5d3c63d0da17c0800b3cf9090b24637ef6b59"; - hash = "sha256-oB5TA8dZtuFop7Urggv2ZWWi8s6wDsIL+ZG5+sCQgq8="; + rev = "189b3cc18d36871c27ebb0adcf0cddd123b0cbba"; + hash = "sha256-5cA2DDMiP8axu8Jl1M+CoxHoB+Jc/VMy3vXME+yxH9o="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-properties"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-properties"; }; proto = buildGrammar { language = "proto"; @@ -1899,12 +1910,12 @@ }; puppet = buildGrammar { language = "puppet"; - version = "0.0.0+rev=9ce9a5f"; + version = "0.0.0+rev=3641b9e"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-puppet"; - rev = "9ce9a5f7d64528572aaa8d59459ba869e634086b"; - hash = "sha256-YEjjy9WLwITERYqoeSVrRYnwVBIAwdc4o0lvAK9wizw="; + rev = "3641b9e854ac9c84c7576e71c4c9a357bcfd9550"; + hash = "sha256-J1DBjQRdV4R85NTyg/qmwbjm1bryKe3UOdp4XyH6BQc="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-puppet"; }; @@ -2042,12 +2053,12 @@ }; readline = buildGrammar { language = "readline"; - version = "0.0.0+rev=f2f98d4"; + version = "0.0.0+rev=e436eae"; src = fetchFromGitHub { owner = "ribru17"; repo = "tree-sitter-readline"; - rev = "f2f98d4263949d696e69a425f65326c59d1ceedc"; - hash = "sha256-+T4HS2QqoXFRgBfY61NHK4EyQ/HF26eeMt9KV2Ud0Ug="; + rev = "e436eaef452266a3d00c195f0eb757d6502c767a"; + hash = "sha256-y38TDQ+7wBzEKol/UQ5Xk6f15wUW7hJxByDuhx9d0hQ="; }; meta.homepage = "https://github.com/ribru17/tree-sitter-readline"; }; @@ -2141,12 +2152,12 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=a70daac"; + version = "0.0.0+rev=85a21c9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "a70daac064145c84e9d51767c2575bb68d51df58"; - hash = "sha256-2Y7sQ5bhKEpbDAHd5zJMGAlDWH32tJXxAgFOYY8S7o8="; + rev = "85a21c96d31b2a5c4369e5836a7f4ab059268fea"; + hash = "sha256-uxOjdB65+HjNuOybbYb2N9R0I+bt909bIBOzmh9vfVc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -2197,23 +2208,23 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=130b2f5"; + version = "0.0.0+rev=0cdfb17"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "130b2f5c7a1d5c24645c3518db4bc2b22dd90718"; - hash = "sha256-gDN8nyQjxE7Hko3MJJj2Le0Ey0pd3GlG5QWkDf8c7Q0="; + rev = "0cdfb1741323f38e9a33798674145c22cfc0092b"; + hash = "sha256-1xSnb3n9u45B2gEBApZpZlb1VvbJOrmgQwrPL2OuGro="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=68405a4"; + version = "0.0.0+rev=3c82235"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "68405a45f7a5311cd1f77e40ba84199573303f52"; - hash = "sha256-zmmxXU7w5N8XjKn2Uu/nAc/FjCAprdKyJ0c75CGUgpk="; + rev = "3c82235f41b63f35a01ae3888206e93585cbb84a"; + hash = "sha256-D3X2YwvxvseIGnKzaSocr3Ak7qoASZhxyRS+rtpir0g="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; @@ -2287,12 +2298,12 @@ }; sourcepawn = buildGrammar { language = "sourcepawn"; - version = "0.0.0+rev=846ec64"; + version = "0.0.0+rev=39ce73a"; src = fetchFromGitHub { owner = "nilshelmig"; repo = "tree-sitter-sourcepawn"; - rev = "846ec647109a1f3dfab17c025c80ecdf6fd56581"; - hash = "sha256-3yRBrzuzjWKKpLO+58P/JdNvjPj2o1HuBZOKkFh2RCs="; + rev = "39ce73ad42b2c4f52848d16093c24feddaa7d226"; + hash = "sha256-CyCUGGycWpgQl/BGDjRHwYoa9Mess49jUf9WUkRaliE="; }; meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn"; }; @@ -2397,23 +2408,23 @@ }; svelte = buildGrammar { language = "svelte"; - version = "0.0.0+rev=bd60db7"; + version = "0.0.0+rev=04a126d"; src = fetchFromGitHub { - owner = "Himujjal"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-svelte"; - rev = "bd60db7d3d06f89b6ec3b287c9a6e9190b5564bd"; - hash = "sha256-FZuzbTOP9LokPb77DSUwIXCFvMmDQPyyLKt7vNtEuAY="; + rev = "04a126d9210def99f06d9ab84a255110b862d47c"; + hash = "sha256-F6AC72IHMKs1jTwshwNkAXFfiBGEbBn7m83xedCoDsA="; }; - meta.homepage = "https://github.com/Himujjal/tree-sitter-svelte"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte"; }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=dabbcf9"; + version = "0.0.0+rev=e1ac0c3"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "dabbcf9a2311e08c1b020e1258849b8359e9de1a"; - hash = "sha256-U4r2uEDqBXeDC0NkOvSwkKreJnFSStxJisNPLJ4CTZs="; + rev = "e1ac0c3b48f4c42c40f92f400f14c6561369d4dd"; + hash = "sha256-7MXH3ZDMH3Im/t5FPMGw6MGKMS+hKaHKUvTXXCrvgtI="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2552,6 +2563,17 @@ }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; + tmux = buildGrammar { + language = "tmux"; + version = "0.0.0+rev=10737f5"; + src = fetchFromGitHub { + owner = "Freed-Wu"; + repo = "tree-sitter-tmux"; + rev = "10737f5dc4d8e68c9667f11a6996688a1185755f"; + hash = "sha256-7MQYyWu1Rw3Vwmp3nbuorn9rD0xcEU5nRXPuTVpOqkM="; + }; + meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux"; + }; todotxt = buildGrammar { language = "todotxt"; version = "0.0.0+rev=3937c5c"; @@ -2643,6 +2665,17 @@ }; meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript"; }; + typst = buildGrammar { + language = "typst"; + version = "0.0.0+rev=c757be0"; + src = fetchFromGitHub { + owner = "uben0"; + repo = "tree-sitter-typst"; + rev = "c757be0898e2a58f4e9761aa164dc413bf5beaf8"; + hash = "sha256-z0x47Qrr8mYroDtXapRmzOMHOxlYmQmonN0P7VSCBu0="; + }; + meta.homepage = "https://github.com/uben0/tree-sitter-typst"; + }; udev = buildGrammar { language = "udev"; version = "0.0.0+rev=15d89be"; @@ -2746,23 +2779,23 @@ }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=32c76f1"; + version = "0.0.0+rev=bc1364d"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vim"; - rev = "32c76f150347c1cd044e90b8e2bc73c00677fa55"; - hash = "sha256-14lkrGZ5JpbPvb5Pm2UzLodhO1IEz5rBETTU0RZDFc4="; + rev = "bc1364d922952138957a62105171ed68e73fbb6c"; + hash = "sha256-5h1GYjyYMJd5GS0zXh0LP1wBs60fYohpFv89gcdZ4vU="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vim"; }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=ed8695a"; + version = "0.0.0+rev=40fcd50"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "ed8695ad8de39c3f073da130156f00b1148e2891"; - hash = "sha256-q5Ln8WPFrtKBfZnaAAlMh3Q/eczEt6wCMZAtx+ISCKg="; + rev = "40fcd50a2c7b5a3ef98294795116773b24fb61ab"; + hash = "sha256-i/O8vIjiyOoFECS1nmKfL/8hofzSvwg5cJo7JooJGOY="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -2790,23 +2823,23 @@ }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "0.0.0+rev=a041228"; + version = "0.0.0+rev=cbd58ee"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; - rev = "a041228ae64632f59b9bd37346a0dbcb7817f36b"; - hash = "sha256-bBGunOcFPrHWLsP1ISgdFBNDIBbB0uhwxKAwmQZg7/k="; + rev = "cbd58ee33e24f46d16b9882b001eefb25a958ee2"; + hash = "sha256-EPpI4UJ/5GB2iDQGoSziUOcP1TVf7VU4FMTKvrujcAY="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=f7965a9"; + version = "0.0.0+rev=52ef462"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "f7965a947d2eaa8b5b9bba1c42a0e1891f1a0b2a"; - hash = "sha256-qQ74aj7pccc3gvmeNoa0BBTMdNTmcc0h8aWNcLvpMRY="; + rev = "52ef462f76e199845a5df4834b838339e0a6efdb"; + hash = "sha256-eZEyk285EyfduzrVH3Ojbwu8mbRFfZY6lrQQQT1kWM8="; }; location = "libs/tree-sitter-wing"; generate = true; @@ -2814,23 +2847,23 @@ }; xcompose = buildGrammar { language = "xcompose"; - version = "0.0.0+rev=8898238"; + version = "0.0.0+rev=7fd1494"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-xcompose"; - rev = "8898238fca7e143760386448093392b87e58002e"; - hash = "sha256-1U3FFO6j4jdynDTRQlD8kfTYTiKvC7ZjxSECMW9NYGY="; + rev = "7fd14940e0478fce79ea195067ed14a2c42c654a"; + hash = "sha256-elnm1HjE4hLFMR/XhCPhOcGjqS9FbCULPRb/IntpQ3U="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xcompose"; }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=2743ff8"; + version = "0.0.0+rev=52b3783"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "2743ff864eac85cec830ff400f2e0024b9ca588b"; - hash = "sha256-wuj3Q+LAtAS99pwJUD+3BzndVeNhzvQlaugzTHRvUjI="; + rev = "52b3783d0c89a69ec64b2d49eee95f44a7fdcd2a"; + hash = "sha256-DVx/JwQXFEgY3XXo2rOVIWBRHdqprNgja9lAashkh5g="; }; location = "xml"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; @@ -2870,12 +2903,12 @@ }; zathurarc = buildGrammar { language = "zathurarc"; - version = "0.0.0+rev=fe37e85"; + version = "0.0.0+rev=353bdf2"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-zathurarc"; - rev = "fe37e85db355c737573315f278672534c40fe140"; - hash = "sha256-lQFCJhyJTCa+zdsobMutgbQqJ9mhehaIbRLbds0riEo="; + rev = "353bdf25e7af9c2830e254977fd3fb57ccaa8203"; + hash = "sha256-vFDz4X0ujqM9GbrpGt3dRjvo0SR07E2qXrT/ppTegBQ="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 68ce88387fa92..da1b4b6bea203 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -998,7 +998,7 @@ inherit (old) version src; sourceRoot = "source/spectre_oxi"; - cargoHash = "sha256-822+3s6FJVqBRYJAL/89bJfGv8fNhSN3nQelB29mXvQ="; + cargoHash = "sha256-gCGuD5kipgfR0Le8npNmyBxNsUq0PavXvKkxkiPx13E="; preCheck = '' diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4565ca91925ad..7a316fcdfc339 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -75,6 +75,7 @@ https://github.com/jiangmiao/auto-pairs/,, https://github.com/pocco81/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, https://github.com/m4xshen/autoclose.nvim/,HEAD, +https://github.com/gaoDean/autolist.nvim/,, https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/nullishamy/autosave.nvim/,HEAD, https://github.com/rafi/awesome-vim-colorschemes/,, diff --git a/pkgs/applications/file-managers/projectable/default.nix b/pkgs/applications/file-managers/projectable/default.nix index 8f2a131ce7c9d..c5b6009bf22f2 100644 --- a/pkgs/applications/file-managers/projectable/default.nix +++ b/pkgs/applications/file-managers/projectable/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_5 +, libgit2 , openssl , zlib , stdenv @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_5 + libgit2 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ @@ -35,6 +35,7 @@ rustPlatform.buildRustPackage rec { ]; env = { + LIBGIT2_NO_VENDOR = 1; OPENSSL_NO_VENDOR = true; }; diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 378d83f8c1ac7..308a1d0d2cee1 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.24"; + version = "0.9.25"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "refs/tags/v${version}"; - hash = "sha256-qd2fnGdpHXX35ZtNGe59GnmhYGn6VJibc0KEr60VIJM="; + hash = "sha256-dTBV2OckPJNA707PNz/jmfUPpufhItt4EEDHAI79kxQ="; }; # No tests diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index a9643e707e5a3..f05aa8fd93450 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -39,6 +39,9 @@ stdenv.mkDerivation (finalAttrs: rec { hash = "sha256-7O+DX4uuncUqx5zEKQprZE6tctteT6NU01V2EBHiFqA="; }; + # build pkg-config is required to locate the native `scdoc` input + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ bash-completion # cmake # currently conflicts with meson @@ -50,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: rec { pkg-config python3 sassc - pantheon.granite scdoc vala wrapGAppsHook @@ -68,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: rec { libhandy libpulseaudio librsvg + pantheon.granite # systemd # ends with broken permission ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 4995a5b9340e1..ada3dc518efc6 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.5.3206.55"; + version = "6.5.3206.63"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-lr+9+w1vRZSG/2dP5K3mcKLCQijckPdkM/I2DgjO4wg="; - x86_64-linux = "sha256-ElkuuaZfK8F6CVA5xbKszkbqdcPACFR+xd0pRxnd6+U="; + aarch64-linux = "sha256-MyKTihImCd1/4UwnC/GqyeQcYnJNvKW5UfIIRN45r8E="; + x86_64-linux = "sha256-RbGoOKQyAaNY+y+jCT+r7GI9vymTT9kPDrwl9/bhaNw="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 94ba7a3c08fa1..e214a4a9d1f49 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix {} rec { pname = "signal-desktop"; dir = "Signal"; - version = "6.48.1"; + version = "7.0.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-3FJdgWmpfHAy5Hd97bH1DAbXYLsabom22tUKNK2bF2c="; + hash = "sha256-xwKisiOE2g+pg1P9mX6AlwYU1JWXIWSSygwauoU05E8="; } diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 61a728d983b36..12cd9f9d04e7d 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, fetchYarnDeps, mkYarnPackage, nixosTests, writeText, python3 }: let - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "PowerDNS-Admin"; repo = "PowerDNS-Admin"; rev = "v${version}"; - hash = "sha256-AwqEcAPD1SF1Ma3wtH03mXlTywM0Q19hciCmTtlr3gk="; + hash = "sha256-q9mt8wjSNFb452Xsg+qhNOWa03KJkYVGAeCWVSzZCyk="; }; python = python3; @@ -29,7 +29,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-3ebT19LrbYuypdJaoB3tClVVP0Fi8tHx3Xi6ge/DpA4="; + hash = "sha256-rXIts+dgOuZQGyiSke1NIG7b4lFlR/Gfu3J6T3wP3aY="; }; # Copied from package.json, see also diff --git a/pkgs/applications/version-management/git-dive/default.nix b/pkgs/applications/version-management/git-dive/default.nix index 983d7b3dd672c..c0209c38cfa9e 100644 --- a/pkgs/applications/version-management/git-dive/default.nix +++ b/pkgs/applications/version-management/git-dive/default.nix @@ -2,8 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config - # libgit2-sys doesn't support libgit2 1.6 yet -, libgit2_1_5 +, libgit2 , oniguruma , zlib , stdenv @@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_5 + libgit2 oniguruma zlib ] ++ lib.optionals stdenv.isDarwin [ @@ -54,7 +53,10 @@ rustPlatform.buildRustPackage rec { git config --global user.email nixbld@example.com ''; - RUSTONIG_SYSTEM_LIBONIG = true; + env = { + LIBGIT2_NO_VENDOR = 1; + RUSTONIG_SYSTEM_LIBONIG = true; + }; meta = with lib; { description = "Dive into a file's history to find root cause"; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index d4dece40ebdef..5e5732a01145d 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_5 +, libgit2 , openssl , zlib , stdenv @@ -28,13 +28,17 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libgit2_1_5 + libgit2 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "Minimalist set of hooks to aid pairing and link commits to issues"; homepage = "https://github.com/PurpleBooth/git-mit"; diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 874263f7b2d20..5287c7f21108d 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -2,13 +2,13 @@ buildLua rec { pname = "mpv-playlistmanager"; - version = "unstable-2023-11-28"; + version = "unstable-2024-02-26"; src = fetchFromGitHub { owner = "jonniek"; repo = "mpv-playlistmanager"; - rev = "579490c7ae1becc129736b7632deec4f3fb90b99"; - hash = "sha256-swOtoB8UV/HPTpQRGXswAfUYsyC2Nj/QRIkGP8X1jk0="; + rev = "1911dc053951169c98cfcfd9f44ef87d9122ca80"; + hash = "sha256-pcdOMhkivLF5B86aNuHrqj77DuYLAFGlwFwY7jxkDkE="; }; passthru.updateScript = unstableGitUpdater {}; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 1fe0ef18aa99f..0583f522bda31 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -64,6 +64,8 @@ let # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 export USER=nobody ${buildPackages.nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration + # Reset registration times to make the image reproducible + ${buildPackages.sqlite}/bin/sqlite3 nix/var/nix/db/db.sqlite "UPDATE ValidPaths SET registrationTime = ''${SOURCE_DATE_EPOCH}" mkdir -p nix/var/nix/gcroots/docker/ for i in ${lib.concatStringsSep " " contentsList}; do diff --git a/pkgs/by-name/be/bemoji/package.nix b/pkgs/by-name/be/bemoji/package.nix index 1747d8934c262..37e2155ca1d3b 100644 --- a/pkgs/by-name/be/bemoji/package.nix +++ b/pkgs/by-name/be/bemoji/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "bemoji"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "marty-oehme"; repo = "bemoji"; rev = "refs/tags/v${version}"; - hash = "sha256-DhsJX5HlyTh0QLlHy1OwyaYg4vxWpBSsF71D9fxqPWE="; + hash = "sha256-HXwho0vRI9ZrUuDMicMH4ZNExY+zJfbrne2LMQmmHww="; }; strictDeps = true; diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/by-name/ch/chrysalis/package.nix index 0852e886c54b5..ab4b5b5f3f8f1 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -2,13 +2,13 @@ let pname = "chrysalis"; - version = "0.13.2"; + version = "0.13.3"; name = "${pname}-${version}-binary"; src = fetchurl { url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}-x64.AppImage"; hash = - "sha512-WuItdQ/hDxbZZ3zulHI74NUkuYfesV/31rA1gPakCFgX2hpPrmKzwUez2vqt4N5qrGyphrR0bcelUatGZhOn5A=="; + "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw=="; }; appimageContents = appimageTools.extract { inherit name src; }; in appimageTools.wrapType2 rec { @@ -38,11 +38,13 @@ in appimageTools.wrapType2 rec { install -Dm444 ${appimageContents}/usr/share/icons/hicolor/256x256/chrysalis.png -t $out/share/pixmaps ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "A graphical configurator for Kaleidoscope-powered keyboards"; homepage = "https://github.com/keyboardio/Chrysalis"; license = licenses.gpl3Only; - maintainers = with maintainers; [ aw ]; + maintainers = with maintainers; [ aw eclairevoyant nshalman ]; platforms = [ "x86_64-linux" ]; mainProgram = "chrysalis"; }; diff --git a/pkgs/by-name/ch/chrysalis/update.sh b/pkgs/by-name/ch/chrysalis/update.sh new file mode 100644 index 0000000000000..182d47a9285a5 --- /dev/null +++ b/pkgs/by-name/ch/chrysalis/update.sh @@ -0,0 +1,16 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash --pure -p curl cacert jq + +set -euo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" +DRV_DIR="$PWD" + +relinfo=$(curl -sL 'https://api.github.com/repos/keyboardio/chrysalis/releases' | jq 'map(select(.prerelease == false)) | max_by(.tag_name)') +newver=$(echo "$relinfo" | jq --raw-output '.tag_name' | sed 's|^v||') +hashurl=$(echo "$relinfo" | jq --raw-output '.assets[] | select(.name == "latest-linux.yml").browser_download_url') +newhash=$(curl -sL "$hashurl" | grep -Po '^sha512: \K.*') + +sed -i package.nix \ + -e "/^ version =/ s|\".*\"|\"$newver\"|" \ + -e "/sha512-/ s|\".*\"|\"sha512-$newhash\"|" \ diff --git a/pkgs/applications/editors/edbrowse/0001-small-fixes.patch b/pkgs/by-name/ed/edbrowse/0001-small-fixes.patch index 433b884cc5deb..433b884cc5deb 100644 --- a/pkgs/applications/editors/edbrowse/0001-small-fixes.patch +++ b/pkgs/by-name/ed/edbrowse/0001-small-fixes.patch diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/by-name/ed/edbrowse/package.nix index 0f51e016c0ea7..154095e57cc8c 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/by-name/ed/edbrowse/package.nix @@ -1,8 +1,7 @@ { lib -, stdenv -, fetchFromGitHub , curl , duktape +, fetchFromGitHub , html-tidy , openssl , pcre @@ -10,24 +9,45 @@ , pkg-config , quickjs , readline +, stdenv +, unixODBC , which +, withODBC ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "edbrowse"; version = "3.8.0"; src = fetchFromGitHub { owner = "CMB"; - repo = pname; - rev = "v${version}"; + repo = "edbrowse"; + rev = "v${finalAttrs.version}"; hash = "sha256-ZXxzQBAmu7kM3sjqg/rDLBXNucO8sFRFKXV8UxQVQZU="; }; + sourceRoot = "${finalAttrs.src.name}/src"; + + patches = [ + # Fixes some small annoyances on src/makefile + ./0001-small-fixes.patch + ]; + + patchFlags = [ + "-p2" + ]; + + postPatch = '' + for file in $(find ./tools/ -type f ! -name '*.c'); do + patchShebangs $file + done + ''; + nativeBuildInputs = [ pkg-config which ]; + buildInputs = [ curl duktape @@ -37,27 +57,23 @@ stdenv.mkDerivation rec { perl quickjs readline + ] ++ lib.optionals withODBC [ + unixODBC ]; - patches = [ - # Fixes some small annoyances on src/makefile - ./0001-small-fixes.patch - ]; - - postPatch = '' - substituteInPlace src/makefile --replace\ - '-L/usr/local/lib/quickjs' '-L${quickjs}/lib/quickjs' - for i in $(find ./tools/ -type f ! -name '*.c'); do - patchShebangs $i - done - ''; - makeFlags = [ - "-C" "src" "PREFIX=${placeholder "out"}" ]; - meta = with lib; { + preBuild = '' + buildFlagsArray+=( + BUILD_EDBR_ODBC=${if withODBC then "on" else "off"} + EBDEMIN=on + QUICKJS_LDFLAGS="-L${quickjs}/lib/quickjs -lquickjs -ldl -latomic" + ) + ''; + + meta = { homepage = "https://edbrowse.org/"; description = "Command Line Editor Browser"; longDescription = '' @@ -71,10 +87,14 @@ stdenv.mkDerivation rec { send email, with no human intervention whatsoever. edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke. ''; - license = licenses.gpl1Plus; - maintainers = with maintainers; [ schmitthenner vrthra equirosa ]; - platforms = platforms.linux; + license = with lib.licenses; [ gpl1Plus ]; mainProgram = "edbrowse"; + maintainers = with lib.maintainers; [ + schmitthenner + equirosa + AndersonTorres + ]; + platforms = lib.platforms.linux; }; -} +}) # TODO: send the patch to upstream developers diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix index 8165e30c504d1..759de944a6e3d 100644 --- a/pkgs/by-name/ff/ffsubsync/package.nix +++ b/pkgs/by-name/ff/ffsubsync/package.nix @@ -1,21 +1,25 @@ { lib -, python3Packages , fetchFromGitHub +, python3 }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "ffsubsync"; version = "0.4.25"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "smacke"; repo = "ffsubsync"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-ZdKZeKfAUe/FXLOur9Btb5RgXewmy3EHunQphqlxpIc="; }; - propagatedBuildInputs = with python3Packages; [ + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ auditok charset-normalizer faust-cchardet @@ -32,9 +36,13 @@ python3Packages.buildPythonApplication rec { webrtcvad ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; - pythonImportsCheck = [ "ffsubsync" ]; + pythonImportsCheck = [ + "ffsubsync" + ]; meta = with lib; { homepage = "https://github.com/smacke/ffsubsync"; diff --git a/pkgs/by-name/fl/flottbot/package.nix b/pkgs/by-name/fl/flottbot/package.nix index 43866e947c817..ba0321fbdd5b1 100644 --- a/pkgs/by-name/fl/flottbot/package.nix +++ b/pkgs/by-name/fl/flottbot/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "flottbot"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "target"; repo = "flottbot"; rev = version; - hash = "sha256-ldWE5QcLHyIqap5Qe6OTTIJZ1sshI+CVoJoRUxWHfxM="; + hash = "sha256-Fv4ZBCQA7gwt11ULIiyFwn+QgoMNgu+1TM9yy2Jz7og="; }; patches = [ @@ -24,7 +24,7 @@ buildGoModule rec { }) ]; - vendorHash = "sha256-XRcTp3ZnoPupzI1kjoM4oF5+VlNJFV0Bu+WAwfRWl7g="; + vendorHash = "sha256-wOUQKFd2Xm/2rvLw8kw8Ejbcq/JUvup/BzZs0fllBYY="; subPackages = [ "cmd/flottbot" ]; diff --git a/pkgs/by-name/fm/fm-go/package.nix b/pkgs/by-name/fm/fm-go/package.nix new file mode 100644 index 0000000000000..204250e7c9076 --- /dev/null +++ b/pkgs/by-name/fm/fm-go/package.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, stdenv +}: + +let + finalAttrs = { + pname = "fm"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "mistakenelf"; + repo = "fm"; + rev = "v${finalAttrs.version}"; + hash = "sha256-wiACaszbkO9jBYmIfeQpcx984RY41Emyu911nkJxUFY="; + }; + + vendorHash = "sha256-AfRGoKiVZGVIbsDj5pV1zCkp2FpcfWKS0t+cTU51RRc="; + + meta = { + homepage = "https://github.com/mistakenelf/fm"; + description = "A terminal based file manager"; + changelog = "https://github.com/mistakenelf/fm/releases/tag/${finalAttrs.src.rev}"; + license = with lib.licenses; [ mit ]; + mainProgram = "fm"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; + }; +in +buildGoModule finalAttrs diff --git a/pkgs/by-name/go/go-errorlint/package.nix b/pkgs/by-name/go/go-errorlint/package.nix new file mode 100644 index 0000000000000..5c67519c4ea5f --- /dev/null +++ b/pkgs/by-name/go/go-errorlint/package.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "go-errorlint"; + version = "1.4.5"; + + src = fetchFromGitHub { + owner = "polyfloyd"; + repo = "go-errorlint"; + rev = "v${version}"; + hash = "sha256-BU+3sLUGBCFA1JYFxTEyIan+iWB7Y7SaMFVomfNObMg="; + }; + + vendorHash = "sha256-xn7Ou4l8vbPD44rsN0mdFjTzOvkfv6QN6i5XR1XPxTE="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "A source code linter that can be used to find code that will cause problems with Go's error wrapping scheme"; + homepage = "https://github.com/polyfloyd/go-errorlint"; + changelog = "https://github.com/polyfloyd/go-errorlint/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ meain ]; + mainProgram = "go-errorlint"; + }; +} diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/by-name/ho/home-manager/package.nix index 7a427300f85ee..dce820175938d 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -1,29 +1,29 @@ { lib -, stdenvNoCC -, fetchFromGitHub , bash , coreutils +, fetchFromGitHub , findutils , gettext , gnused +, installShellFiles , less , ncurses , nixos-option +, stdenvNoCC , unixtools -, installShellFiles , unstableGitUpdater }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "unstable-2024-02-20"; + version = "0-unstable-2024-02-24"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "517601b37c6d495274454f63c5a483c8e3ca6be1"; - hash = "sha256-tgZ38NummEdnXvxj4D0StHBzXgceAw8CptytHljH790="; + rev = "4ee704cb13a5a7645436f400b9acc89a67b9c08a"; + hash = "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI="; }; nativeBuildInputs = [ @@ -40,6 +40,21 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -D -m755 home-manager/home-manager $out/bin/home-manager install -D -m755 lib/bash/home-manager.sh $out/share/bash/home-manager.sh + installShellCompletion --bash --name home-manager.bash home-manager/completion.bash + installShellCompletion --fish --name home-manager.fish home-manager/completion.fish + installShellCompletion --zsh --name _home-manager home-manager/completion.zsh + + for pofile in home-manager/po/*.po; do + lang="''${pofile##*/}" + lang="''${lang%%.*}" + mkdir -p "$out/share/locale/$lang/LC_MESSAGES" + msgfmt -o "$out/share/locale/$lang/LC_MESSAGES/home-manager.mo" "$pofile" + done + + runHook postInstall + ''; + + postFixup = '' substituteInPlace $out/bin/home-manager \ --subst-var-by bash "${bash}" \ --subst-var-by DEP_PATH "${ @@ -57,19 +72,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { --subst-var-by HOME_MANAGER_LIB '${placeholder "out"}/share/bash/home-manager.sh' \ --subst-var-by HOME_MANAGER_PATH "${finalAttrs.src}" \ --subst-var-by OUT '${placeholder "out"}' - - installShellCompletion --bash --name home-manager.bash home-manager/completion.bash - installShellCompletion --fish --name home-manager.fish home-manager/completion.fish - installShellCompletion --zsh --name _home-manager home-manager/completion.zsh - - for pofile in home-manager/po/*.po; do - lang="''${pofile##*/}" - lang="''${lang%%.*}" - mkdir -p "$out/share/locale/$lang/LC_MESSAGES" - msgfmt -o "$out/share/locale/$lang/LC_MESSAGES/home-manager.mo" "$pofile" - done - - runHook postInstall ''; passthru.updateScript = unstableGitUpdater { @@ -86,8 +88,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { (non global) packages and dotfiles. ''; license = lib.licenses.mit; + mainProgram = "home-manager"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - mainProgram = "home-manager"; }; }) diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix index 5bba91c285846..9fb744fa6570f 100644 --- a/pkgs/by-name/no/nosql-workbench/package.nix +++ b/pkgs/by-name/no/nosql-workbench/package.nix @@ -4,7 +4,7 @@ fetchurl, jdk21, stdenv, - undmg + _7zz }: let pname = "nosql-workbench"; @@ -39,30 +39,19 @@ if stdenv.isDarwin then stdenv.mkDerivation { sourceRoot = "."; + nativeBuildInputs = [ _7zz ]; + buildInputs = [ jdk21 ]; # DMG file is using APFS which is unsupported by "undmg". - # Fix found: https://discourse.nixos.org/t/help-with-error-only-hfs-file-systems-are-supported-on-ventura/25873/8 + # Instead, use "7zz" to extract the contents. # "undmg" issue: https://github.com/matthewbauer/undmg/issues/4 unpackCmd = '' - echo "Creating temp directory" - mnt=$(TMPDIR=/tmp mktemp -d -t nix-XXXXXXXXXX) - - function finish { - echo "Ejecting temp directory" - /usr/bin/hdiutil detach $mnt -force - rm -rf $mnt - } - # Detach volume when receiving SIG "0" - trap finish EXIT - - # Mount DMG file - echo "Mounting DMG file into \"$mnt\"" - /usr/bin/hdiutil attach -nobrowse -mountpoint $mnt $curSrc - - # Copy content to local dir for later use - echo 'Copying extracted content into "sourceRoot"' - cp -a $mnt/NoSQL\ Workbench.app $PWD/ + runHook preUnpack + + 7zz x $curSrc + + runHook postUnpack ''; installPhase = '' diff --git a/pkgs/tools/misc/outils/default.nix b/pkgs/by-name/ou/outils/package.nix index 065d641f4f304..e29e6440edcb7 100644 --- a/pkgs/tools/misc/outils/default.nix +++ b/pkgs/by-name/ou/outils/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "outils"; - version = "0.10"; + version = "0.13"; src = fetchFromGitHub { owner = "leahneukirchen"; - repo = pname; + repo = "outils"; rev = "v${version}"; - sha256 = "sha256-xYjILa0Km57q/xNP+M34r29WLGC15tzUNoUgPzQTtIs="; + hash = "sha256-FokJytwQsbGsryBzyglpb1Hg3wti/CPQTOfIGIz9ThA="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/sc/scitokens-cpp/package.nix b/pkgs/by-name/sc/scitokens-cpp/package.nix index 691e89fa2b80a..56cc5ba18bb8d 100644 --- a/pkgs/by-name/sc/scitokens-cpp/package.nix +++ b/pkgs/by-name/sc/scitokens-cpp/package.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "scitokens-cpp"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "scitokens"; repo = "scitokens-cpp"; - rev = "v1.1.0"; - hash = "sha256-g97Ah5Oob0iOvMQegpG/AACLZCW37kA0RpSIcKOyQnE="; + rev = "v1.1.1"; + hash = "sha256-G3z9DYYWCNeA/rufNHQP3SwT5WS2AvUWm1rd8lx6XxA="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index c0d6cd63036d7..6f541d8a3b38f 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -73,6 +73,7 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/searxng/searxng"; description = "A fork of Searx, a privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; + mainProgram = "searxng-run"; maintainers = with maintainers; [ SuperSandro2000 _999eagle ]; }; }) diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index efd58e171c7d7..3baa252aa5d4e 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -75,9 +75,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540" dependencies = [ "anstyle", "anstyle-parse", @@ -147,9 +147,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "assert_cmd" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467" +checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" dependencies = [ "anstyle", "bstr", @@ -1587,25 +1587,21 @@ dependencies = [ "data-encoding", "distribution-filename", "fs-err", - "fs2", - "goblin", "indoc", "mailparse", "once_cell", + "pathdiff", "pep440_rs", "platform-host", "platform-info", "plist", - "pyo3", "pypi-types", - "rayon", "reflink-copy", "regex", "rustc-hash", "serde", "serde_json", "sha2", - "target-lexicon", "tempfile", "thiserror", "tracing", @@ -2194,6 +2190,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] name = "pep440_rs" version = "0.5.0" dependencies = [ @@ -3189,18 +3191,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", @@ -3209,9 +3211,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -3496,9 +3498,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.13" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "task-local-extensions" @@ -4131,7 +4133,7 @@ checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "uv" -version = "0.1.11" +version = "0.1.12" dependencies = [ "anstream", "anyhow", @@ -4151,6 +4153,7 @@ dependencies = [ "fs-err", "futures", "gourgeist", + "indexmap 2.2.3", "indicatif", "indoc", "insta", @@ -4493,12 +4496,15 @@ dependencies = [ "pep508_rs", "platform-tags", "pypi-types", + "pyproject-toml", "rayon", "requirements-txt", "rustc-hash", + "serde", "tempfile", "thiserror", "tokio", + "toml", "tracing", "url", "uv-cache", @@ -4518,9 +4524,11 @@ version = "0.0.1" dependencies = [ "anyhow", "cache-key", + "configparser", "fs-err", "indoc", "insta", + "install-wheel-rs", "itertools 0.12.1", "once_cell", "pep440_rs", diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 9a4f38355da6d..be273cae89164 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -1,31 +1,25 @@ { lib -, cargo , cmake , darwin , fetchFromGitHub -, libgit2 , openssl , pkg-config -, python3 , rustPlatform -, rustc , stdenv -, zlib }: -python3.pkgs.buildPythonApplication rec { +rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.1.11"; - pyproject = true; + version = "0.1.12"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = version; - hash = "sha256-0J6m/DgalYA+GGmgjFrNoo9KAv6WgMcx+gasgqG5v1Q="; + hash = "sha256-tM8NX4BPGm8Xxlau+qpKSljTdSJutipsYFsZAdtmZuo="; }; - cargoDeps = rustPlatform.importCargoLock { + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.16" = "sha256-M94ceTCtyQc1AtPXYrVGplShQhItqZZa/x5qLiL+gs0="; @@ -34,25 +28,20 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - cargo cmake pkg-config - rustPlatform.cargoSetupHook - rustPlatform.maturinBuildHook - rustc ]; buildInputs = [ - libgit2 openssl - zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; - dontUseCmakeConfigure = true; + cargoBuildFlags = [ "--package" "uv" ]; - pythonImportsCheck = [ "uv" ]; + # Tests require network access + doCheck = false; env = { OPENSSL_NO_VENDOR = true; @@ -61,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "An extremely fast Python package installer and resolver, written in Rust"; homepage = "https://github.com/astral-sh/uv"; - changelog = "https://github.com/astral-sh/uv/releases/tag/${version}"; + changelog = "https://github.com/astral-sh/uv/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ marsam ]; mainProgram = "uv"; diff --git a/pkgs/by-name/zc/zcfan/package.nix b/pkgs/by-name/zc/zcfan/package.nix index 4534a71fa3e4d..c6bb42c286fbd 100644 --- a/pkgs/by-name/zc/zcfan/package.nix +++ b/pkgs/by-name/zc/zcfan/package.nix @@ -6,13 +6,13 @@ # Testing this requires a Thinkpad or the presence of /proc/acpi/ibm/fan stdenv.mkDerivation (finalAttrs: { pname = "zcfan"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "cdown"; repo = "zcfan"; rev = finalAttrs.version; - hash = "sha256-XngchR06HP2iExKJVe+XKBDgsv98AEYWOkl1a/Hktgs="; + hash = "sha256-zpYQEHXt8LBNX+luM4YxP0dKH+hb2c8Z0BEeGP09oZo="; }; postPatch = '' diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix index 36ab88861ae41..34450f55cbdf7 100644 --- a/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.110"; + version = "1.120"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-6KeKz8lJBCc/sc5pCkS2mSwMAQ8XpwDIMCjSbVXuyH4="; + hash = "sha256-rQ+gbmUYr+iWm5WCUSqb+8+aMD5JZUsbPXZ0Nio2cl8="; }; dontUnpack = true; diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix index d5225cc899370..d5fbc03b63016 100644 --- a/pkgs/data/themes/alacritty-theme/default.nix +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (self: { name = "alacritty-theme"; - version = "unstable-2024-02-25"; + version = "unstable-2024-02-28"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "07c10441dae4d0490145a0f40178f8846b24e800"; - hash = "sha256-aZlsKbFcm1bswx7k0cjwhj1MudR0Q0rD8sdHa7kQ0rY="; + rev = "4aefb7c079721474078b28bbf9f582b592749ca6"; + hash = "sha256-+35S6eQkxLBuS/fDKD5bglQDIuz2xeEc5KSaK6k7IjI="; }; dontConfigure = true; diff --git a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix index 796dc05d819aa..32b2cef1f0212 100644 --- a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix +++ b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "suru-icon-theme"; - version = "20.05.1"; + version = "2024.02.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/suru-icon-theme"; rev = finalAttrs.version; - hash = "sha256-jJ6J+SjSABZCgnCF9cIFBpeSXX2LMnV+nPLPpoXQv30="; + hash = "sha256-7T9FILhZrs5bbdBEV/FszCOwUd/C1Rl9tbDt77SIzRk="; }; strictDeps = true; @@ -50,6 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = with lib; { description = "Suru Icon Theme for Lomiri Operating Environment"; homepage = "https://gitlab.com/ubports/development/core/suru-icon-theme"; + changelog = "https://gitlab.com/ubports/development/core/suru-icon-theme/-/blob/${finalAttrs.version}/ChangeLog"; license = licenses.cc-by-sa-30; maintainers = teams.lomiri.members; platforms = platforms.all; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 906df89b2117c..a848accf16669 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -1,20 +1,16 @@ { lib -, stdenv -, fetchFromRepoOrCz , copyPkgconfigItems +, fetchFromRepoOrCz , makePkgconfigItem , perl +, stdenv , texinfo , which }: -let - # avoid "malformed 32-bit x.y.z" error on mac when using clang - isCleanVer = version: builtins.match "^[0-9]\\.+[0-9]+\\.[0-9]+" version != null; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tcc"; - version = "unstable-2022-07-15"; + version = "0.9.27-unstable-2022-07-15"; src = fetchFromRepoOrCz { repo = "tinycc"; @@ -22,6 +18,8 @@ stdenv.mkDerivation rec { hash = "sha256-jY0P2GErmo//YBaz6u4/jj/voOE3C2JaIDRmo0orXN8="; }; + outputs = [ "out" "info" "man" ]; + nativeBuildInputs = [ copyPkgconfigItems perl @@ -29,23 +27,27 @@ stdenv.mkDerivation rec { which ]; - pkgconfigItems = [ - (makePkgconfigItem rec { + strictDeps = true; + + pkgconfigItems = let + libtcc-pcitem = { name = "libtcc"; - inherit version; - cflags = [ "-I${variables.includedir}" ]; + inherit (finalAttrs) version; + cflags = [ "-I${libtcc-pcitem.variables.includedir}" ]; libs = [ - "-L${variables.libdir}" - "-Wl,--rpath ${variables.libdir}" + "-L${libtcc-pcitem.variables.libdir}" + "-Wl,--rpath ${libtcc-pcitem.variables.libdir}" "-ltcc" ]; - variables = rec { + variables = { prefix = "${placeholder "out"}"; - includedir = "${prefix}/include"; - libdir = "${prefix}/lib"; + includedir = "${placeholder "dev"}/include"; + libdir = "${placeholder "lib"}/lib"; }; description = "Tiny C compiler backend"; - }) + }; + in [ + (makePkgconfigItem libtcc-pcitem) ]; postPatch = '' @@ -64,17 +66,19 @@ stdenv.mkDerivation rec { "--config-musl" ]; - preConfigure = '' + preConfigure = let + # To avoid "malformed 32-bit x.y.z" error on mac when using clang + versionIsClean = version: + builtins.match "^[0-9]\\.+[0-9]+\\.[0-9]+" version != null; + in '' ${ - if stdenv.isDarwin && ! isCleanVer version + if stdenv.isDarwin && ! versionIsClean finalAttrs.version then "echo 'not overwriting VERSION since it would upset ld'" - else "echo ${version} > VERSION" + else "echo ${finalAttrs.version} > VERSION" } configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") ''; - outputs = [ "out" "info" "man" ]; - # Test segfault for static build doCheck = !stdenv.hostPlatform.isStatic; @@ -84,7 +88,7 @@ stdenv.mkDerivation rec { rm tests/tests2/{108,114}* ''; - meta = with lib; { + meta = { homepage = "https://repo.or.cz/tinycc.git"; description = "Small, fast, and embeddable C compiler and interpreter"; longDescription = '' @@ -108,13 +112,13 @@ stdenv.mkDerivation rec { With libtcc, you can use TCC as a backend for dynamic code generation. ''; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ joachifm AndersonTorres ]; - platforms = platforms.unix; + license = with lib.licenses; [ lgpl21Only ]; + mainProgram = "tcc"; + maintainers = with lib.maintainers; [ joachifm AndersonTorres ]; + platforms = lib.platforms.unix; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html broken = stdenv.isDarwin && stdenv.isAarch64; }; -} +}) # TODO: more multiple outputs # TODO: self-compilation -# TODO: provide expression for stable release diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index 4a4a0ee6bf21f..c0f4577078e23 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.36"; + version = "1.1.37"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-QTlOiZG6qpNeicMJpOTMSTk2WwKbOzkaLulgmsxYaVI="; + sha256 = "sha256-/XxWOaT2f6+0apv0NzMsPoYBf3GLuaXyPkmTMTDtOes="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index 4722781c19334..9639ac34a01b7 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { sha256 = "+h0dKLECtvfsxwD5aRTIgiNI9jG/tortUJYFiYMe60g="; }; + depsBuildBuild = [ + # required to find native gi-docgen when cross compiling + pkg-config + ]; + nativeBuildInputs = [ gi-docgen meson diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 8acc044894bca..ea65e5f3ae82c 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -42,7 +42,7 @@ let qtModule = callPackage ./qtModule.nix { }; qtbase = callPackage ./modules/qtbase.nix { - withGtk3 = true; + withGtk3 = !stdenv.hostPlatform.isMinGW; inherit (srcs.qtbase) src version; inherit developerBuild; inherit (darwin.apple_sdk_11_0.frameworks) @@ -69,47 +69,49 @@ let ]; }; env = callPackage ./qt-env.nix { }; - full = callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}" - # `with self` is ok to use here because having these spliced is unnecessary - ( with self;[ - qt3d - qt5compat - qtcharts - qtconnectivity - qtdatavis3d - qtdeclarative - qtdoc - qtgraphs - qtgrpc - qthttpserver - qtimageformats - qtlanguageserver - qtlocation - qtlottie - qtmultimedia - qtmqtt - qtnetworkauth - qtpositioning - qtsensors - qtserialbus - qtserialport - qtshadertools - qtspeech - qtquick3d - qtquick3dphysics - qtquickeffectmaker - qtquicktimeline - qtremoteobjects - qtsvg - qtscxml - qttools - qttranslations - qtvirtualkeyboard - qtwebchannel - qtwebengine - qtwebsockets - qtwebview - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwayland libglvnd ])) { }; + full = callPackage + ({ env, qtbase }: env "qt-full-${qtbase.version}" + # `with self` is ok to use here because having these spliced is unnecessary + (with self;[ + qt3d + qt5compat + qtcharts + qtconnectivity + qtdatavis3d + qtdeclarative + qtdoc + qtgraphs + qtgrpc + qthttpserver + qtimageformats + qtlanguageserver + qtlocation + qtlottie + qtmultimedia + qtmqtt + qtnetworkauth + qtpositioning + qtsensors + qtserialbus + qtserialport + qtshadertools + qtspeech + qtquick3d + qtquick3dphysics + qtquickeffectmaker + qtquicktimeline + qtremoteobjects + qtsvg + qtscxml + qttools + qttranslations + qtvirtualkeyboard + qtwebchannel + qtwebengine + qtwebsockets + qtwebview + ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ])) + { }; qt3d = callPackage ./modules/qt3d.nix { }; qt5compat = callPackage ./modules/qt5compat.nix { }; @@ -162,11 +164,14 @@ let GameController ImageCaptureCore LocalAuthentication MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz ReplayKit SecurityInterface Vision; - qtModule = callPackage ({ qtModule }: qtModule.override { - stdenv = if stdenv.hostPlatform.isDarwin - then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } - else stdenv; - }) { }; + qtModule = callPackage + ({ qtModule }: qtModule.override { + stdenv = + if stdenv.isDarwin + then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } + else stdenv; + }) + { }; xcbuild = buildPackages.xcbuild.override { productBuildVer = "20A2408"; }; @@ -176,21 +181,25 @@ let inherit (darwin.apple_sdk_11_0.frameworks) WebKit; }; - wrapQtAppsHook = callPackage ({ makeBinaryWrapper }: makeSetupHook - { - name = "wrap-qt6-apps-hook"; - propagatedBuildInputs = [ makeBinaryWrapper ]; - } ./hooks/wrap-qt-apps-hook.sh) { }; + wrapQtAppsHook = callPackage + ({ makeBinaryWrapper }: makeSetupHook + { + name = "wrap-qt6-apps-hook"; + propagatedBuildInputs = [ makeBinaryWrapper ]; + } ./hooks/wrap-qt-apps-hook.sh) + { }; - qmake = callPackage ({ qtbase }: makeSetupHook - { - name = "qmake6-hook"; - propagatedBuildInputs = [ qtbase.dev ]; - substitutions = { - inherit debug; - fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh; - }; - } ./hooks/qmake-hook.sh) { }; + qmake = callPackage + ({ qtbase }: makeSetupHook + { + name = "qmake6-hook"; + propagatedBuildInputs = [ qtbase.dev ]; + substitutions = { + inherit debug; + fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh; + }; + } ./hooks/qmake-hook.sh) + { }; } // lib.optionalAttrs config.allowAliases { # Convert to a throw on 03-01-2023 and backport the change. # Warnings show up in various cli tool outputs, throws do not. @@ -203,12 +212,13 @@ let f = addPackages; }; - bootstrapScope = baseScope.overrideScope(final: prev: { + bootstrapScope = baseScope.overrideScope (final: prev: { qtbase = prev.qtbase.override { qttranslations = null; }; qtdeclarative = null; }); - finalScope = baseScope.overrideScope(final: prev: { + finalScope = baseScope.overrideScope (final: prev: { qttranslations = bootstrapScope.qttranslations; }); -in finalScope +in +finalScope diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 26fdeceda61fb..0a16f725c4771 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -4,6 +4,7 @@ , patches ? [ ] , version , coreutils +, buildPackages , bison , flex , gdb @@ -79,6 +80,8 @@ , EventKit , GSS , MetalKit + # mingw +, pkgsBuildBuild # optional dependencies , cups , libmysqlclient @@ -96,6 +99,7 @@ let debugSymbols = debug || developerBuild; + isCrossBuild = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; in stdenv.mkDerivation rec { pname = "qtbase"; @@ -110,7 +114,6 @@ stdenv.mkDerivation rec { openssl sqlite zlib - unixODBC # Text rendering harfbuzz icu @@ -119,14 +122,16 @@ stdenv.mkDerivation rec { libpng pcre2 pcre - libproxy zstd - double-conversion libb2 md4c + double-conversion + ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ + libproxy dbus glib # unixODBC drivers + unixODBC unixODBCDrivers.psql unixODBCDrivers.sqlite unixODBCDrivers.mariadb @@ -174,11 +179,16 @@ stdenv.mkDerivation rec { EventKit GSS MetalKit - ] ++ lib.optional libGLSupported libGL; + ] ++ lib.optionals libGLSupported [ + libGL + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + vulkan-headers + vulkan-loader + ]; - buildInputs = [ + buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [ at-spi2-core - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [ libinput ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ AppKit @@ -186,9 +196,9 @@ stdenv.mkDerivation rec { ] ++ lib.optional withGtk3 gtk3 ++ lib.optional developerBuild gdb - ++ lib.optional (cups != null) cups - ++ lib.optional (libmysqlclient != null) libmysqlclient - ++ lib.optional (postgresql != null) postgresql; + ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups + ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient + ++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql; nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; @@ -203,7 +213,7 @@ stdenv.mkDerivation rec { # https://bugreports.qt.io/browse/QTBUG-97568 postPatch = '' - substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${coreutils}/bin/ls" + substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${buildPackages.coreutils}/bin/ls" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" ''; @@ -232,7 +242,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # error: 'path' is unavailable: introduced in macOS 10.15 "-DQT_FEATURE_cxx17_filesystem=OFF" - ] ++ lib.optional (qttranslations != null) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; + ] ++ lib.optionals isCrossBuild [ + "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}" + "-DQt6HostInfo_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6HostInfo" + ] + ++ lib.optional (qttranslations != null && !isCrossBuild) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" @@ -253,6 +267,8 @@ stdenv.mkDerivation rec { dontStrip = debugSymbols; + dontWrapQtApps = true; + setupHook = ../hooks/qtbase-setup-hook.sh; meta = with lib; { @@ -260,6 +276,6 @@ stdenv.mkDerivation rec { description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao LunNova ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch b/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch index 22530f453536c..cae39e879120e 100644 --- a/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch +++ b/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch @@ -1,19 +1,19 @@ -From f0c4d3860b75cb064d066045907622d536044096 Mon Sep 17 00:00:00 2001 +From 6f0e6fe1e13ca5844a93d3b97111b7ece7e60f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc> Date: Sun, 10 May 2020 12:47:28 +0200 Subject: [PATCH 11/11] qtbase: derive plugin load path from PATH --- - src/corelib/kernel/qcoreapplication.cpp | 10 ++++++++++ - 1 file changed, 10 insertions(+) + src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index a80efbb5622..8cf9e85da43 100644 +index a80efbb5622..0d41dabeed3 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2991,6 +2991,16 @@ QStringList QCoreApplication::libraryPathsLocked() - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); +@@ -3032,6 +3032,15 @@ QStringList QCoreApplication::libraryPathsLocked() + app_libpaths->append(installPathPlugins); + } + // Add library paths derived from PATH + const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(QStringLiteral(":")); @@ -24,10 +24,9 @@ index a80efbb5622..8cf9e85da43 100644 + } + } + -+ - auto setPathsFromEnv = [&](QString libPathEnv) { - if (!libPathEnv.isEmpty()) { - QStringList paths = libPathEnv.split(QDir::listSeparator(), Qt::SkipEmptyParts); + // If QCoreApplication is not yet instantiated, + // make sure we add the application path when we construct the QCoreApplication + if (self) self->d_func()->appendApplicationPathToLibraryPaths(); -- -2.42.0 +2.43.1 diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 648e053765295..1995068ebd923 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "9.0.1"; + version = "9.0.2"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - hash = "sha256-eNd6jlpW3KiRvOCKvNP5ttpgjPPXt2M2vLhk1Zn4gTE="; + hash = "sha256-wPg5A1lwtRPDO5gPbllEFkRJFRIhkqqaVd4CBdPavKE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index cd2b854d79559..05ef47ee27946 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.276"; + version = "0.6.277"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IAzsoKPFmhyBgd3jD6qEBav5ynQYrn8/cl6epsjrVKg="; + sha256 = "sha256-s80veDxN0GfHKOwDhxx1ArZXqk8OPSl+d/Ruxj0oLJA="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 63bf85273811b..edd555a96b166 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -100,6 +100,7 @@ buildPythonPackage rec { "test_plot_ppc_discrete_save_animation" # Assertion error "test_data_zarr" + "test_plot_forest" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 5523d4f5e0a21..2db51887e21f6 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.5.1"; + version = "5.6.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+eGS9GGp+PYILfKMA1sAbRU5BCE9yGQL7Ypy1yu8lHU="; + hash = "sha256-t1E8LeqIaJkfrX74iZiQ68+LGZubRGHDwR160670gg0="; }; postPatch = '' @@ -44,12 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - # https://github.com/agronholm/cbor2/issues/99 - disabledTests = lib.optionals stdenv.is32bit [ - "test_huge_truncated_bytes" - "test_huge_truncated_string" - ]; - meta = with lib; { changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}"; description = "Python CBOR (de)serializer with extensive tag support"; diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index b44188ffcc71d..b51949f73a13d 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; rev = "refs/tags/v${version}"; - hash = "sha256-RpuBKdjjSjJJ9UU7VW20gD9Rouj0oxv72sZZaUa/BfY="; + hash = "sha256-Qdv0DcdIjqz8NtyMsVNQxGTxsB3TpXUGDA3oL8QbBDc="; }; nativeBuildInputs = [ cython_3 ]; diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index 06efdac9939da..89f5ef6fbf5c2 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "cloudpathlib"; - version = "0.18.0"; + version = "0.18.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "drivendataorg"; repo = "cloudpathlib"; rev = "refs/tags/v${version}"; - hash = "sha256-4CwwCdGUKUmie9PmAmrVxpAhk3b2WG+Cmx3QAADkyYQ="; + hash = "sha256-RrdRUqQ3QyMUpTi1FEsSXK6WS37r77SdPBH1oVVvSw0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cssbeautifier/default.nix b/pkgs/development/python-modules/cssbeautifier/default.nix index 3144c5114fc29..02f1de52af7e6 100644 --- a/pkgs/development/python-modules/cssbeautifier/default.nix +++ b/pkgs/development/python-modules/cssbeautifier/default.nix @@ -1,34 +1,46 @@ { lib , buildPythonPackage +, editorconfig , fetchPypi -, setuptools , jsbeautifier +, pythonOlder +, setuptools +, six }: buildPythonPackage rec { pname = "cssbeautifier"; - version = "1.14.11"; - format = "pyproject"; + version = "1.15.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QFRMK2K7y2TKpefzegLflWVOXOG8rK2sTKHz3InDFRM="; + hash = "sha256-n3BkNirt1VnFXu7Pa2vtZeBfM0iNy+OQRPBAPCbhwAY="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ jsbeautifier ]; + propagatedBuildInputs = [ + editorconfig + jsbeautifier + six + ]; - # has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "cssbeautifier" ]; + pythonImportsCheck = [ + "cssbeautifier" + ]; meta = with lib; { description = "CSS unobfuscator and beautifier"; - homepage = "https://pypi.org/project/cssbeautifier/"; + homepage = "https://github.com/beautifier/js-beautify"; + changelog = "https://github.com/beautifier/js-beautify/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ traxys ]; }; diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index 1ab2143953b7b..41906a9362648 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.7.3"; + version = "1.7.4"; pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; repo = "dbt-redshift"; rev = "refs/tags/v${version}"; - hash = "sha256-3zj3wA1wxUjKSm1n7QE2g/VUuH3UuWlXCC68mOb2eso="; + hash = "sha256-Ny6Nnb5OhtqSQZ0BMOQrb0ic6i29GVywy3hn3UuVtxE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix index d8bb73ccdef8c..d1a66ed8f704d 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-crispy-bootstrap4"; - version = "2023.1"; + version = "2024.1"; format = "pyproject"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "crispy-bootstrap4"; rev = "refs/tags/${version}"; - hash = "sha256-4p6dlyQYZGyfBntTuzCjikL8ZG/4xDnTiQ1rCVt0Hbk="; + hash = "sha256-upHrNDhoY+8qD+aeXPcY452xUIyYjW0apf8mVo6pqY4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/docstr-coverage/default.nix b/pkgs/development/python-modules/docstr-coverage/default.nix index 2c3289c0f3931..ba0945ad15af5 100644 --- a/pkgs/development/python-modules/docstr-coverage/default.nix +++ b/pkgs/development/python-modules/docstr-coverage/default.nix @@ -8,7 +8,7 @@ , pytest-mock }: let - version = "2.3.0"; + version = "2.3.1"; in buildPythonPackage { pname = "docstr-coverage"; @@ -17,8 +17,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "HunterMcGushion"; repo = "docstr_coverage"; - rev = "v${version}"; - hash = "sha256-eYHhE5zs3hYzK3aAimF0Gx/Kyk1Ot1F/lKf1poR2er0="; + rev = "refs/tags/v${version}"; + hash = "sha256-QmQE6KZ2NdXKQun+uletxYPktWvfkrj6NPAVl/mmpAY="; }; propagatedBuildInputs = [ click pyyaml tqdm ]; diff --git a/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch b/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch index c12c85e0de254..2506a10268b20 100644 --- a/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch +++ b/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch @@ -1,17 +1,17 @@ -From 001549503eed364d4baaa5804242f67c6236f6c2 Mon Sep 17 00:00:00 2001 +From d3aed2c18cc3a1c88a8052af1f34d7f81f1be11a Mon Sep 17 00:00:00 2001 From: Flakebi <flakebi@t-online.de> -Date: Sat, 2 Dec 2023 16:55:05 +0100 +Date: Wed, 28 Feb 2024 23:24:14 +0100 Subject: [PATCH] Fix with new dependency versions - cookie_jar is private in werkzeug 2.3, so recreate the client instead - set_cookie does not take a hostname argument anymore, use domain instead - Headers need to specify a content type --- - test_seasurf.py | 63 ++++++++++++++++++++++++------------------------- - 1 file changed, 31 insertions(+), 32 deletions(-) + test_seasurf.py | 71 ++++++++++++++++++++++++------------------------- + 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/test_seasurf.py b/test_seasurf.py -index 517b2d7..501f82d 100644 +index 517b2d7..f940b91 100644 --- a/test_seasurf.py +++ b/test_seasurf.py @@ -71,18 +71,18 @@ class SeaSurfTestCase(BaseTestCase): @@ -37,6 +37,15 @@ index 517b2d7..501f82d 100644 self.assertIn(b('403 Forbidden'), rv.data) def test_json_token_validation_bad(self): +@@ -93,7 +93,7 @@ class SeaSurfTestCase(BaseTestCase): + with self.app.test_client() as client: + with client.session_transaction() as sess: + sess[self.csrf._csrf_name] = tokenA +- client.set_cookie('www.example.com', self.csrf._csrf_name, tokenB) ++ client.set_cookie(self.csrf._csrf_name, tokenB, domain='www.example.com') + + rv = client.post('/bar', data=data) + self.assertEqual(rv.status_code, 403, rv) @@ -107,7 +107,7 @@ class SeaSurfTestCase(BaseTestCase): data = {'_csrf_token': token} with self.app.test_client() as client: @@ -55,7 +64,7 @@ index 517b2d7..501f82d 100644 sess[self.csrf._csrf_name] = token # once this is reached the session was stored -@@ -144,7 +144,7 @@ class SeaSurfTestCase(BaseTestCase): +@@ -144,18 +144,18 @@ class SeaSurfTestCase(BaseTestCase): with client.session_transaction() as sess: token = self.csrf._generate_token() @@ -64,6 +73,19 @@ index 517b2d7..501f82d 100644 sess[self.csrf._csrf_name] = token # once this is reached the session was stored +- rv = client.post('/bar', ++ rv = client.post('/bar', content_type='application/json', + data={self.csrf._csrf_name: token}, + base_url='https://www.example.com', + headers={'Referer': 'https://www.example.com/foobar'}) + + self.assertEqual(rv.status_code, 200) + +- rv = client.post(u'/bar/\xf8', ++ rv = client.post(u'/bar/\xf8', content_type='application/json', + data={self.csrf._csrf_name: token}, + base_url='https://www.example.com', + headers={'Referer': 'https://www.example.com/foobar\xf8'}) @@ -167,7 +167,7 @@ class SeaSurfTestCase(BaseTestCase): with client.session_transaction() as sess: token = self.csrf._generate_token() @@ -252,6 +274,15 @@ index 517b2d7..501f82d 100644 self.assertEqual(res2.status_code, 200) def test_header_set_cookie_samesite(self): +@@ -789,7 +788,7 @@ class SeaSurfTestCaseGenerateNewToken(BaseTestCase): + client.get('/foo') + tokenA = self.csrf._get_token() + +- client.set_cookie('www.example.com', self.csrf._csrf_name, tokenA) ++ client.set_cookie(self.csrf._csrf_name, tokenA, domain='www.example.com') + with client.session_transaction() as sess: + sess[self.csrf._csrf_name] = tokenA + -- -2.42.0 +2.43.0 diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 5d27b9d490e16..46a5eb3e36912 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.19.1"; + version = "3.19.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oPDcQSWNWG9wauSVW7srXN85+UeF6Q0CRlaSyqh2W/Q="; + hash = "sha256-qodN9ALyAfzsrCAiPT3t02JJRCBqFCNVWlsQP+4d3do="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index e1631f74f94e7..7ec3da3531cf2 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -1,43 +1,59 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub - -# tests +, fetchpatch , ffmpeg-full -, python +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pydub"; version = "0.25.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; - # pypi version doesn't include required data files for tests src = fetchFromGitHub { owner = "jiaaro"; - repo = pname; - rev = "v${version}"; - sha256 = "0xskllq66wqndjfmvp58k26cv3w480sqsil6ifwp4gghir7hqc8m"; + repo = "pydub"; + rev = "refs/tags/v${version}"; + hash = "sha256-FTEMT47wPXK5i4ZGjTVAhI/NjJio3F2dbBZzYzClU3c="; }; + patches = [ + # Fix test assertions, https://github.com/jiaaro/pydub/pull/769 + (fetchpatch { + name = "fix-assertions.patch"; + url = "https://github.com/jiaaro/pydub/commit/66c1bf7813ae8621a71484fdcdf609734c0d8efd.patch"; + hash = "sha256-3OIzvTgGK3r4/s5y7izHvouB4uJEmjO6cgKvegtTf7A="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + ffmpeg-full + pytestCheckHook + ]; + pythonImportsCheck = [ "pydub" "pydub.audio_segment" "pydub.playback" ]; - nativeCheckInputs = [ - ffmpeg-full + pytestFlagsArray = [ + "test/test.py" ]; - checkPhase = '' - ${python.interpreter} test/test.py - ''; - meta = with lib; { description = "Manipulate audio with a simple and easy high level interface"; homepage = "http://pydub.com"; + changelog = "https://github.com/jiaaro/pydub/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 185250bddda56..5afa718726c85 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -23,9 +23,14 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-bOrWgZaSOXXalw251cm5JUDkAARGaxmUk+z3SY6Git8="; + hash = "sha256-tiOXbryY2TmeBVrG5cIMeDJ4alolBQ5LosdfH3tpVOA="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail ', "pytest-cov"' "" + ''; + propagatedBuildInputs = [ arviz cachetools @@ -37,11 +42,6 @@ buildPythonPackage rec { typing-extensions ]; - postPatch = '' - substituteInPlace setup.py \ - --replace ', "pytest-cov"' "" - ''; - # The test suite is computationally intensive and test failures are not # indicative for package usability hence tests are disabled by default. doCheck = false; diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix index 05c9784b367f1..7190c1e2c0ae7 100644 --- a/pkgs/development/python-modules/shazamio/default.nix +++ b/pkgs/development/python-modules/shazamio/default.nix @@ -72,6 +72,7 @@ buildPythonPackage rec { changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + # https://github.com/shazamio/ShazamIO/issues/80 broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index af3dca512c62b..2782b5eea5db7 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.27.0"; + version = "3.27.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-MA3pn6NQxzXYu/BBpOgfZWnS51dl7oXrAi43jenHhxI="; + hash = "sha256-fBHu4e6pSt8yzXbLWr5cwjRFDfvdH2jzpSNzdMBg4N0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 9917e4d3f759d..300aec7414733 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -5,12 +5,13 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "snapcast"; - version = "2.3.3"; - format = "setuptools"; + version = "2.3.4"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,9 +19,13 @@ buildPythonPackage rec { owner = "happyleavesaoc"; repo = "python-snapcast"; rev = "refs/tags/${version}"; - hash = "sha256-IFgSO0PjlFb4XJarx50Xnx6dF4tBKk3sLcoLWVdpnk8="; + hash = "sha256-qADcLrE5QwoYBDEmh7hrDJZIND2k3F0OTCEHdHDu3Y0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ construct packaging diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index 1c5bad17e8a0f..6c64ca00c5ee5 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -10,11 +10,12 @@ , numpy , h5py , pytestCheckHook +, stdenv }: buildPythonPackage rec { pname = "tensordict"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "pytorch"; repo = "tensordict"; rev = "refs/tags/v${version}"; - hash = "sha256-XTFUzPs/fqX3DPtu/qSE1hY+7r/HToPVPaTyVRzDT/E="; + hash = "sha256-eCx1r7goqOdGX/0mSGCiLhdGQTh4Swa5aFiLSsL56p0="; }; nativeBuildInputs = [ @@ -53,6 +54,18 @@ buildPythonPackage rec { pytestCheckHook ]; + # RuntimeError: internal error + disabledTests = lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + "test_add_scale_sequence" + "test_modules" + "test_setattr" + ]; + + # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "test/test_distributed.py" + ]; + meta = with lib; { description = "A pytorch dedicated tensor container"; changelog = "https://github.com/pytorch/tensordict/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index e69d9ab8e5dff..ce64a0833e043 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,12 +364,12 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.11.2"; + version = "2.12.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bnYg/u2BvG3/iBJ5xKQwiMG/n8vREpnOGHYaSlwlnRs="; + hash = "sha256-ma/pyfhqWpWFZ+V4O+mNr4SfoOC4/vn9+Hy+rYGAaG8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 938856691b7ab..e9b8e0294d808 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.18"; + version = "0.0.19"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; - rev = "v${version}"; - hash = "sha256-XUMpWzDqouhbsP+s0b13f6N0YGdXJK6qhbWQLqMzNHM="; + rev = "refs/tags/v${version}"; + hash = "sha256-VoO9B27CNY2Cnt/Q2HsU6DVYkukQMgbIHc6xqfN0P7w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix index c7f3632a08469..2f1a5da293c50 100644 --- a/pkgs/development/tools/biome/default.nix +++ b/pkgs/development/tools/biome/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_6 +, libgit2 , rust-jemalloc-sys , zlib , stdenv @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_6 + libgit2 rust-jemalloc-sys zlib ] ++ lib.optionals stdenv.isDarwin [ @@ -47,6 +47,7 @@ rustPlatform.buildRustPackage rec { env = { BIOME_VERSION = version; + LIBGIT2_NO_VENDOR = 1; }; preCheck = '' diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index b1098bd32129a..51ed01e27d589 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.112.0"; + version = "0.112.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3ad/2h9rw1BeMcr1lLEZp4fzJHfwl7y3/tTjmKKAvho="; + sha256 = "sha256-v0VYjG1GJwfXXabk9aBs99xGk6F0bFPFBBe//T7P4yQ="; }; vendorHash = "sha256-tHEbHExdbWeZm3+rwRYpRILyPYEYdeVJ91Qr/yNIKV8="; diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index b1a2fa72d4455..84470fcfe1100 100644 --- a/pkgs/development/tools/language-servers/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-Ii3c7zqMC/CeSv6X7wSgUdCkVbP+bxDuUcqPKIeE3Is="; + hash = "sha256-GJ2zc5OgZXwEq12f0PyvgOOUd7cctUbFvdp095VQb9E="; }; modRoot = "gopls"; - vendorHash = "sha256-i6Pa2cMxf97LKVy6ZVyPvjAVbQHaF84RAO0dM/dgk/Y="; + vendorHash = "sha256-Xxik0t1BHQPqzrE3Oh3VhODn+IqIVa+TCNqQSnmbBM0="; doCheck = false; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Official language server for the Go language"; homepage = "https://github.com/golang/tools/tree/master/gopls"; + changelog = "https://github.com/golang/tools/releases/tag/${src.rev}"; license = licenses.bsd3; maintainers = with maintainers; [ mic92 rski SuperSandro2000 zimbatm ]; mainProgram = "gopls"; diff --git a/pkgs/development/tools/rust/cargo-audit/default.nix b/pkgs/development/tools/rust/cargo-audit/default.nix index a1268e9fb3183..c48b34e0d668d 100644 --- a/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/pkgs/development/tools/rust/cargo-audit/default.nix @@ -2,7 +2,6 @@ , rustPlatform , fetchCrate , pkg-config -, libgit2 , openssl , zlib , stdenv @@ -26,7 +25,6 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 849aa5a8ca595..1ae11e2760560 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , curl , pkg-config -, libgit2_1_5 +, libgit2 , openssl , zlib , stdenv @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl - libgit2_1_5 + libgit2 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ @@ -40,6 +40,10 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p=cargo-codspeed" ]; cargoTestFlags = cargoBuildFlags; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "Cargo extension to build & run your codspeed benchmarks"; homepage = "https://github.com/CodSpeedHQ/codspeed-rust"; diff --git a/pkgs/development/tools/rust/cargo-dephell/default.nix b/pkgs/development/tools/rust/cargo-dephell/default.nix index 63a8cabccefa6..b01a722e5ea1d 100644 --- a/pkgs/development/tools/rust/cargo-dephell/default.nix +++ b/pkgs/development/tools/rust/cargo-dephell/default.nix @@ -6,7 +6,7 @@ , curl , openssl , darwin -, libgit2_1_3_0 +, libgit2 }: rustPlatform.buildRustPackage rec { @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.isDarwin [ curl darwin.apple_sdk.frameworks.Security - libgit2_1_3_0 + libgit2 ]; # update Cargo.lock to work with openssl 3 @@ -43,6 +43,10 @@ rustPlatform.buildRustPackage rec { ln -sf ${./Cargo.lock} Cargo.lock ''; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "A tool to analyze the third-party dependencies imported by a rust crate or rust workspace"; homepage = "https://github.com/mimoo/cargo-dephell"; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index f29943a6eada6..299bcd7ffad7f 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_6 +, libgit2 , openssl , stdenv , darwin @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2_1_6 openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -48,6 +48,10 @@ rustPlatform.buildRustPackage rec { "--skip=git::utils::should_canonicalize" ]; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "A tool to generate a new Rust project by leveraging a pre-existing git repository as a template"; homepage = "https://github.com/cargo-generate/cargo-generate"; diff --git a/pkgs/development/tools/rust/cargo-ui/default.nix b/pkgs/development/tools/rust/cargo-ui/default.nix index 7af23346f0fb6..870b411afc9e1 100644 --- a/pkgs/development/tools/rust/cargo-ui/default.nix +++ b/pkgs/development/tools/rust/cargo-ui/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchCrate , pkg-config -, libgit2_1_5 +, libgit2 , openssl , stdenv , expat @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_5 + libgit2 openssl ] ++ lib.optionals stdenv.isLinux [ expat @@ -48,6 +48,10 @@ rustPlatform.buildRustPackage rec { --add-rpath ${lib.makeLibraryPath [ fontconfig libGL ]} ''; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "A GUI for Cargo"; homepage = "https://github.com/slint-ui/cargo-ui"; diff --git a/pkgs/development/tools/rust/cargo-unused-features/default.nix b/pkgs/development/tools/rust/cargo-unused-features/default.nix index f6e3057ecffef..70518087e0864 100644 --- a/pkgs/development/tools/rust/cargo-unused-features/default.nix +++ b/pkgs/development/tools/rust/cargo-unused-features/default.nix @@ -3,7 +3,7 @@ , fetchCrate , curl , pkg-config -, libgit2_1_5 +, libgit2 , openssl , stdenv , darwin @@ -27,13 +27,17 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl - libgit2_1_5 + libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "A tool to find potential unused enabled feature flags and prune them"; homepage = "https://github.com/timonpost/cargo-unused-features"; diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index 3b3418f38dc06..986f705455c6f 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -7,7 +7,7 @@ , ronn , stdenv , curl -, libgit2_1_5 +, libgit2 , libssh2 , openssl , zlib @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_5 + libgit2 libssh2 openssl zlib @@ -55,6 +55,10 @@ rustPlatform.buildRustPackage rec { installManPage man/*.1 ''; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "A cargo subcommand for checking and applying updates to installed executables"; homepage = "https://github.com/nabijaczleweli/cargo-update"; diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index 5cb3c4de96b19..b087ef552ca92 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -2,7 +2,6 @@ , rustPlatform , fetchCrate , pkg-config -, libgit2_1_6 , libssh2 , openssl , zlib @@ -26,7 +25,6 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_6 libssh2 openssl zlib diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix index 4f5eb0a5a6ecb..9d9c554daaeea 100644 --- a/pkgs/development/tools/rust/typeshare/default.nix +++ b/pkgs/development/tools/rust/typeshare/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typeshare"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "1password"; repo = "typeshare"; rev = "v${version}"; - hash = "sha256-Ftr0YMrY6tPpfg25swYntBXLWGKT00PEz79aOiSgLsU="; + hash = "sha256-ykrtvXPXxNYrUQNScit+REb7/6mE0FOzBQxPdbWodgk="; }; - cargoHash = "sha256-VIPIFdbyPcflqHHLkzpDugmw9+9CJRIv+Oy7PoaUZ5g="; + cargoHash = "sha256-/oIezLqd3hkWrfO2pml31de+pgpEXhXHxIxt10rPJZo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 3bbd517261859..fc557907e4df7 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vultr-cli"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-k8YaoH75U1BvC3I71e1wY2TMaCVyZyBrQxYcEv3+bu8="; + hash = "sha256-9akEDsBj2EpZtUBh0+Dck5otsmFzdvJshXxOtYVdi1o="; }; - vendorHash = "sha256-QbzKXPgUWIMVo29xGRcL+KFva8cs+2goqh9b6h29aeY="; + vendorHash = "sha256-jkl36S7h1l6FeeHEhc+PKOQO9Uq/4L5wTb8+PhG2exY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 915c006f91375..318c28aff9220 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -7,14 +7,13 @@ , luajit , makeWrapper , symlinkJoin -, disable-warnings-if-gcc13 }: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy let # raknet could also be split into dev and lib outputs - raknet = disable-warnings-if-gcc13 (stdenv.mkDerivation { + raknet = stdenv.mkDerivation { pname = "raknet"; version = "unstable-2020-01-19"; @@ -46,7 +45,7 @@ let installPhase = '' install -Dm555 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a ''; - }); + }; coreScripts = stdenv.mkDerivation { pname = "corescripts"; diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index 35516fdf0e69c..fadb9df980869 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -17,7 +17,9 @@ in stdenv.mkDerivation rec { nativeCheckInputs = [ python ]; - doCheck = true; + # reptyr needs to do ptrace of a non-child process + # It can be neither used nor tested if the kernel is not told to allow this + doCheck = false; checkFlags = [ "PYTHON_CMD=${python.interpreter}" diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 6fbda66d4cc20..2a1ba113ce196 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-TR4CyBZ+KoZRs9XDmWE5lJuUXXU1J8E2Z63nt+FS+5w="; + sha256 = "sha256-BmQO4xqd/3QnpLUitD2obVxL0UulpboT8jGNEh4ri8k="; }; strictDeps = true; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index ab71af9574818..0107e87558809 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "ibus-anthy"; - version = "1.5.15"; + version = "1.5.16"; src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-WMTm1YNqSsnjOqnoTljE3rZ62pjztUSyRAxXgyN+2Ys="; + sha256 = "sha256-FVIiFLWK2ISsydmx2hPxXbfc12w7GKiFCQRuXsYT0a4="; }; buildInputs = [ diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/tools/misc/faketty/default.nix index d05360ccffe30..228cdf7f2f2fd 100644 --- a/pkgs/tools/misc/faketty/default.nix +++ b/pkgs/tools/misc/faketty/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "faketty"; - version = "1.0.15"; + version = "1.0.16"; src = fetchCrate { inherit pname version; - hash = "sha256-f32Y9Aj4Z9y6Da9rbRgwi9BGPl4FsI790BH52cIIoPA="; + hash = "sha256-BlQnVjYPFUfEurFUE2MHOL2ad56Nu/atzRuFu4OoCSI="; }; - cargoHash = "sha256-+M1oq2CHUK6CIDFiUNLjO1UmHI19D5zdHVl8dvmQ1G8="; + cargoHash = "sha256-q9jx03XYA977481B9xuUfaaMBDbSVx4xREj4Q1Ti/Yw="; postPatch = '' patchShebangs tests/test.sh diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index a50a7fc1a0d16..1e1ef3c0d0f68 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/pkgs/tools/nix/nix-init/default.nix @@ -6,7 +6,7 @@ , installShellFiles , pkg-config , bzip2 -, libgit2_1_6 +, libgit2 , openssl , zlib , zstd @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 curl - libgit2_1_6 + libgit2 openssl zlib zstd @@ -80,6 +80,7 @@ rustPlatform.buildRustPackage rec { env = { GEN_ARTIFACTS = "artifacts"; + LIBGIT2_NO_VENDOR = 1; NIX = lib.getExe nix; NURL = lib.getExe nurl; ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/tools/security/dontgo403/default.nix b/pkgs/tools/security/dontgo403/default.nix index 79002c1cfc898..84e7667377b79 100644 --- a/pkgs/tools/security/dontgo403/default.nix +++ b/pkgs/tools/security/dontgo403/default.nix @@ -5,17 +5,22 @@ buildGoModule rec { pname = "dontgo403"; - version = "0.9.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "devploit"; - repo = pname; + repo = "dontgo403"; rev = "refs/tags/${version}"; - hash = "sha256-PKI/DqMihhMaIa9OzDKtLIs34TRUtewAbBkx89IXLU4="; + hash = "sha256-znmPXue+pzv7vAKnIYsjJQQGMeBETH+ekyVKGz9wRik="; }; vendorHash = "sha256-IGnTbuaQH8A6aKyahHMd2RyFRh4WxZ3Vx/A9V3uelRg="; + ldflags = [ + "-w" + "-s" + ]; + meta = with lib; { description = "Tool to bypass 40X response codes"; homepage = "https://github.com/devploit/dontgo403"; diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index 9c40c051bebcc..17bd273c0a304 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LT8J9s008XQtDtNdH1ungQREqQUrlTsoxnlRLKimqLY="; + sha256 = "sha256-zL+53GIGDQagWtsSHQT1Gn1hZUCpYF3uYKXmJWFGy7k="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-ImZJXdOfMepMFU1z47XyNU39NGGdiCzQji2/tKVfibQ="; + vendorHash = "sha256-B4/SIY9G5uEP+P+oSdhaMM7HRaHm5nq2jqXdIWxdP+8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index fc1a2bab79f4d..2ed24f93d4d75 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goawk"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "benhoyt"; repo = "goawk"; rev = "v${version}"; - hash = "sha256-vxDBtYrfSmYE2mCqhepeLr4u+zLfHxCrYSXGq05CEYQ="; + hash = "sha256-EJf5Qv5ICJJdGNcRQ7v/ANyxx2j9d9NsZJnzIBrwam4="; }; vendorHash = null; diff --git a/pkgs/tools/text/zim-tools/default.nix b/pkgs/tools/text/zim-tools/default.nix index e51755dd7e449..100c9e706ff78 100644 --- a/pkgs/tools/text/zim-tools/default.nix +++ b/pkgs/tools/text/zim-tools/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "zim-tools"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "openzim"; repo = "zim-tools"; rev = version; - sha256 = "sha256-kPUw13GVYZ1GLb4b4ch64GkJZtf6PW1gae8F/cgyG90="; + sha256 = "sha256-A1A0Ri2OwPyqpx0f5CPJL3zAwo2I/AiRKpmk3r4DeTc="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/tools/video/yaydl/default.nix b/pkgs/tools/video/yaydl/default.nix index 7dea97bf649e4..39e085931ddae 100644 --- a/pkgs/tools/video/yaydl/default.nix +++ b/pkgs/tools/video/yaydl/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "yaydl"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "dertuxmalwieder"; repo = pname; rev = "release-${version}"; - sha256 = "sha256-JwyWWqbUNZyH6gymeScb9tMZoPvn/Igz9iW2pp0XvEI="; + sha256 = "sha256-r0Z/dihDaiW/lBLMftLtzLELpKT2twqru1xxI9LnjU8="; }; - cargoSha256 = "sha256-jmqO0UvU6s+E5r6VFFjOvSe8oiLiTG5rPNHzoHVftWo="; + cargoHash = "sha256-FkOiMeNwYj++gZ1Kl4RZHmsRDVMZQBEYtRpogK6XSFE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd0293ca0f3c5..ed03c7d604275 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -491,8 +491,6 @@ with pkgs; banana-vera = callPackage ../development/tools/analysis/banana-vera { }; - chrysalis = callPackage ../applications/misc/chrysalis { }; - ciel = callPackage ../tools/package-management/ciel { }; circt = callPackage ../development/compilers/circt { }; @@ -5632,8 +5630,6 @@ with pkgs; hocr-tools = with python3Packages; toPythonApplication hocr-tools; - home-manager = callPackage ../tools/package-management/home-manager { }; - homepage-dashboard = callPackage ../servers/homepage-dashboard { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) IOKit; @@ -12415,8 +12411,6 @@ with pkgs; ouch = callPackage ../tools/compression/ouch { }; - outils = callPackage ../tools/misc/outils { }; - mpi = openmpi; # this attribute should used to build MPI applications mpiCheckPhaseHook = callPackage ../build-support/setup-hooks/mpi-check-hook { }; @@ -20123,7 +20117,22 @@ with pkgs; ttyd = callPackage ../servers/ttyd { }; turbogit = callPackage ../development/tools/turbogit { - libgit2 = libgit2_1_3_0; + libgit2 = libgit2.overrideAttrs rec { + version = "1.3.0"; + src = pkgs.fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + hash = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; + }; + patches = []; + # tests fail on old version + doCheck = false; + meta = libgit2.meta // { + maintainers = []; + knownVulnerabilities = [ "CVE-2024-24575" "CVE-2024-24577" "CVE-2022-29187" "CVE 2022-24765" ]; + }; + }; }; tweak = callPackage ../applications/editors/tweak { }; @@ -21346,39 +21355,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_1_3_0 = libgit2.overrideAttrs rec { - version = "1.3.0"; - src = pkgs.fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - hash = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; - }; - patches = []; - }; - - libgit2_1_5 = libgit2.overrideAttrs rec { - version = "1.5.1"; - src = pkgs.fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - hash = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM="; - }; - patches = []; - }; - - libgit2_1_6 = libgit2.overrideAttrs rec { - version = "1.6.5"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - hash = "sha256-2tgXnrB85dEfxu7giETqMuFxfm0RH5MicHZqO3ezGu0="; - }; - patches = [ ]; - }; - libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; libhsts = callPackage ../development/libraries/libhsts { }; @@ -31007,8 +30983,6 @@ with pkgs; inherit (recurseIntoAttrs (callPackage ../applications/editors/ed { })) ed edUnstable; - edbrowse = callPackage ../applications/editors/edbrowse { }; - edlin = callPackage ../applications/editors/edlin { }; orbiton = callPackage ../applications/editors/orbiton { |