diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md index 3fad872e4306..400e493d7fee 100644 --- a/doc/hooks/tauri.section.md +++ b/doc/hooks/tauri.section.md @@ -26,6 +26,7 @@ In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases. rustPlatform.buildRustPackage rec { # . . . + useFetchCargoVendor = true; cargoHash = "..."; # Assuming our app's frontend uses `npm` as a package manager diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index f1f951b9650f..d0ba09b51621 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -26,16 +26,17 @@ Rust applications are packaged by using the `buildRustPackage` helper from `rust rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "12.1.1"; + version = "14.1.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - hash = "sha256-+s5RBC3XSgb8omTbUNLywZnP6jSxZBKSS1BmXOjRF8M="; + hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg="; }; - cargoHash = "sha256-jtBw4ahSl88L0iuCXxQgZVm1EcboWRJMNtjxLVTtzts="; + useFetchCargoVendor = true; + cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4="; meta = { description = "Fast line-oriented regex search tool, similar to ag and ack"; @@ -63,18 +64,7 @@ hash using `nix-hash --to-sri --type sha256 ""`. } ``` -Exception: If the application has cargo `git` dependencies, the `cargoHash` -approach will not work by default. In this case, you can set `useFetchCargoVendor = true` -to use an improved fetcher that supports handling `git` dependencies. - -```nix -{ - useFetchCargoVendor = true; - cargoHash = "sha256-RqPVFovDaD2rW31HyETJfQ0qVwFxoGEvqkIgag3H6KU="; -} -``` - -If this method still does not work, you can resort to copying the `Cargo.lock` file into nixpkgs +If this method does not work, you can resort to copying the `Cargo.lock` file into nixpkgs and importing it as described in the [next section](#importing-a-cargo.lock-file). Both types of hashes are permitted when contributing to nixpkgs. The @@ -119,7 +109,8 @@ rustPlatform.buildRustPackage rec { hash = "sha256-aDQA4A5mScX9or3Lyiv/5GyAehidnpKKE0grhbP1Ctc="; }; - cargoHash = "sha256-tbrTbutUs5aPSV+yE0IBUZAAytgmZV7Eqxia7g+9zRs="; + useFetchCargoVendor = true; + cargoHash = "sha256-iDYh52rj1M5Uupvbx2WeDd/jvQZ+2A50V5rp5e2t7q4="; cargoDepsName = pname; # ... @@ -443,14 +434,14 @@ hooks that can be used to integrate Cargo in non-Rust packages. Since network access is not allowed in sandboxed builds, Rust crate dependencies need to be retrieved using a fetcher. `rustPlatform` -provides the `fetchCargoTarball` fetcher, which vendors all +provides the `fetchCargoVendor` fetcher, which vendors all dependencies of a crate. For example, given a source path `src` -containing `Cargo.toml` and `Cargo.lock`, `fetchCargoTarball` +containing `Cargo.toml` and `Cargo.lock`, `fetchCargoVendor` can be used as follows: ```nix { - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit src; hash = "sha256-BoHIN/519Top1NUBjpB/oEMqi86Omt3zTQcXFWqrek0="; }; @@ -482,7 +473,7 @@ In case the lockfile contains cargo `git` dependencies, you can use ``` If a `Cargo.lock` file is available, you can alternatively use the -`importCargoLock` function. In contrast to `fetchCargoTarball`, this +`importCargoLock` function. In contrast to `fetchCargoVendor`, this function does not require a hash (unless git dependencies are used) and fetches every dependency as a separate fixed-output derivation. `importCargoLock` can be used as follows: @@ -521,12 +512,13 @@ you of the correct hash. `rustPlatform` provides the following hooks to automate Cargo builds: * `cargoSetupHook`: configure Cargo to use dependencies vendored - through `fetchCargoTarball`. This hook uses the `cargoDeps` - environment variable to find the vendored dependencies. If a project - already vendors its dependencies, the variable `cargoVendorDir` can - be used instead. When the `Cargo.toml`/`Cargo.lock` files are not in - `sourceRoot`, then the optional `cargoRoot` is used to specify the - Cargo root directory relative to `sourceRoot`. + through `fetchCargoVendor` or `importCargoLock`. This hook uses the + `cargoDeps` environment variable to find the vendored + dependencies. If a project already vendors its dependencies, the + variable `cargoVendorDir` can be used instead. When the + `Cargo.toml`/`Cargo.lock` files are not in `sourceRoot`, then the + optional `cargoRoot` is used to specify the Cargo root directory + relative to `sourceRoot`. * `cargoBuildHook`: use Cargo to build a crate. If the crate to be built is a crate in e.g. a Cargo workspace, the relative path to the crate to build can be set through the optional `buildAndTestSubdir` @@ -557,7 +549,7 @@ you of the correct hash. #### Python package using `setuptools-rust` {#python-package-using-setuptools-rust} For Python packages using `setuptools-rust`, you can use -`fetchCargoTarball` and `cargoSetupHook` to retrieve and set up Cargo +`fetchCargoVendor` and `cargoSetupHook` to retrieve and set up Cargo dependencies. The build itself is then performed by `buildPythonPackage`. @@ -586,9 +578,9 @@ buildPythonPackage rec { hash = "sha256-rQ2hRV52naEf6PvRsWVCTN7B1oXAQGmnpJw4iIdhamw="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src sourceRoot; - hash = "sha256-miW//pnOmww2i6SOGbkrAIdc/JMDT4FJLqdMFojZeoY="; + hash = "sha256-RO1m8wEd5Ic2M9q+zFHeCJWhCr4Sv3CEWd08mkxsBec="; }; sourceRoot = "${src.name}/bindings/python"; @@ -609,7 +601,7 @@ directory. In such cases, the `cargoRoot` attribute can be used to specify the crate's directory relative to `sourceRoot`. In the following example, the crate is in `src/rust`, as specified in the `cargoRoot` attribute. Note that we also need to specify the correct -path for `fetchCargoTarball`. +path for `fetchCargoVendor`. ```nix @@ -629,10 +621,10 @@ buildPythonPackage rec { hash = "sha256-xGDilsjLOnls3MfVbGKnj80KCUCczZxlis5PmHzpNcQ="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; sourceRoot = "${pname}-${version}/${cargoRoot}"; - hash = "sha256-PS562W4L1NimqDV2H0jl5vYhL08H9est/pbIxSdYVfo="; + hash = "sha256-ctUt8maCjnGddKPf+Ii++wKsAXA1h+JM6zKQNXXwJqQ="; }; cargoRoot = "src/rust"; @@ -644,9 +636,9 @@ buildPythonPackage rec { #### Python package using `maturin` {#python-package-using-maturin} Python packages that use [Maturin](https://github.com/PyO3/maturin) -can be built with `fetchCargoTarball`, `cargoSetupHook`, and +can be built with `fetchCargoVendor`, `cargoSetupHook`, and `maturinBuildHook`. For example, the following (partial) derivation -builds the `retworkx` Python package. `fetchCargoTarball` and +builds the `retworkx` Python package. `fetchCargoVendor` and `cargoSetupHook` are used to fetch and set up the crate dependencies. `maturinBuildHook` is used to perform the build. @@ -669,9 +661,9 @@ buildPythonPackage rec { hash = "sha256-11n30ldg3y3y6qxg3hbj837pnbwjkqw3nxq6frds647mmmprrd20="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0="; + hash = "sha256-QsPCQhNZKYCAogQriQX6pBYQUDAIUsEdRX/63dAqTzg="; }; nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; @@ -682,7 +674,7 @@ buildPythonPackage rec { #### Rust package built with `meson` {#rust-package-built-with-meson} -Some projects, especially GNOME applications, are built with the Meson Build System instead of calling Cargo directly. Using `rustPlatform.buildRustPackage` may successfully build the main program, but related files will be missing. Instead, you need to set up Cargo dependencies with `fetchCargoTarball` and `cargoSetupHook` and leave the rest to Meson. `rust` and `cargo` are still needed in `nativeBuildInputs` for Meson to use. +Some projects, especially GNOME applications, are built with the Meson Build System instead of calling Cargo directly. Using `rustPlatform.buildRustPackage` may successfully build the main program, but related files will be missing. Instead, you need to set up Cargo dependencies with `fetchCargoVendor` and `cargoSetupHook` and leave the rest to Meson. `rust` and `cargo` are still needed in `nativeBuildInputs` for Meson to use. ```nix { lib @@ -713,9 +705,9 @@ stdenv.mkDerivation rec { hash = "sha256-PrNPprSS98yN8b8yw2G6hzTSaoE65VbsM3q7FVB4mds="; }; - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-8fa3fa+sFi5H+49B5sr2vYPkp9C9s6CcE0zv4xB8gww="; + hash = "sha256-eR1ZGtTZQNhofFUEjI7IX16sMKPJmAl7aIFfPJukecg="; }; nativeBuildInputs = [ @@ -998,16 +990,17 @@ in rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "12.1.1"; + version = "14.1.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = version; - hash = "sha256-+s5RBC3XSgb8omTbUNLywZnP6jSxZBKSS1BmXOjRF8M="; + hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg="; }; - cargoHash = "sha256-l1vL2ZdtDRxSGvP0X/l3nMw8+6WF67KPutJEzUROjg8="; + useFetchCargoVendor = true; + cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4="; doCheck = false; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 18032c354f0c..828482c1caf1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7810,6 +7810,12 @@ githubId = 24463229; name = "Forden"; }; + ForgottenBeast = { + email = "forgottenbeast@riseup.net"; + github = "ForgottenBeast"; + githubId = 5754552; + name = "ForgottenBeast"; + }; forkk = { email = "forkk@forkk.net"; github = "Forkk"; @@ -16459,6 +16465,12 @@ github = "NiklasVousten"; githubId = 24965952; }; + nikolaizombie1 = { + name = "Fabio J. Matos Nieves"; + email = "fabio.matos999@gmail.com"; + githubId = 70602908; + github = "nikolaizombie1"; + }; nikstur = { email = "nikstur@outlook.com"; name = "nikstur"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 4778365d5c9a..627d2bfe0857 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -521,6 +521,20 @@ with lib.maintainers; shortName = "Home Assistant"; }; + hyprland = { + members = [ + donovanglover + fufexan + johnrtitor + khaneliman + NotAShelf + ]; + githubTeams = [ "hyprland" ]; + scope = "Maintain Hyprland compositor and ecosystem"; + shortName = "Hyprland"; + enableFeatureFreezePing = true; + }; + infisical = { members = [ akhilmhdh ]; scope = "Maintain Infisical"; diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 443cc445ad69..a103e8bd5cff 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -836,6 +836,12 @@ "module-services-netbird-multiple-connections": [ "index.html#module-services-netbird-multiple-connections" ], + "module-services-netbird-firewall": [ + "index.html#module-services-netbird-firewall" + ], + "module-services-netbird-customization": [ + "index.html#module-services-netbird-customization" + ], "module-services-mosquitto": [ "index.html#module-services-mosquitto" ], diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 287e1a6f7ce9..9de98fbb6257 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -379,6 +379,9 @@ as before, you can use plugins like `python3Packages.jax-cuda12-plugin`. +- `services.netbird.tunnels` was renamed to [`services.netbird.clients`](#opt-services.netbird.clients), + hardened (using dedicated less-privileged users) and significantly extended. + ## Other Notable Changes {#sec-release-25.05-notable-changes} diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index d00f2a188d6d..21f8266d4292 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -139,5 +139,5 @@ in ] "Nvidia patches are no longer needed") ]; - meta.maintainers = with lib.maintainers; [ fufexan ]; + meta.maintainers = lib.teams.hyprland.members; } diff --git a/nixos/modules/programs/wayland/hyprlock.nix b/nixos/modules/programs/wayland/hyprlock.nix index 1b55c75f0852..e05d8f826a4c 100644 --- a/nixos/modules/programs/wayland/hyprlock.nix +++ b/nixos/modules/programs/wayland/hyprlock.nix @@ -26,5 +26,5 @@ in security.pam.services.hyprlock = { }; }; - meta.maintainers = with lib.maintainers; [ johnrtitor ]; + meta.maintainers = lib.teams.hyprland.members; } diff --git a/nixos/modules/services/networking/netbird.md b/nixos/modules/services/networking/netbird.md index e1f6753cbd30..876c27cb0d22 100644 --- a/nixos/modules/services/networking/netbird.md +++ b/nixos/modules/services/networking/netbird.md @@ -2,7 +2,7 @@ ## Quickstart {#module-services-netbird-quickstart} -The absolute minimal configuration for the netbird daemon looks like this: +The absolute minimal configuration for the Netbird client daemon looks like this: ```nix { @@ -13,52 +13,76 @@ The absolute minimal configuration for the netbird daemon looks like this: This will set up a netbird service listening on the port `51820` associated to the `wt0` interface. -It is strictly equivalent to setting: +Which is equivalent to: ```nix { - services.netbird.tunnels.wt0.stateDir = "netbird"; + services.netbird.clients.wt0 = { + port = 51820; + name = "netbird"; + interface = "wt0"; + hardened = false; + }; } ``` -The `enable` option is mainly kept for backward compatibility, as defining netbird -tunnels through the `tunnels` option is more expressive. +This will set up a `netbird.service` listening on the port `51820` associated to the +`wt0` interface. There will also be `netbird-wt0` binary installed in addition to `netbird`. + +see [clients](#opt-services.netbird.clients) option documentation for more details. ## Multiple connections setup {#module-services-netbird-multiple-connections} -Using the `services.netbird.tunnels` option, it is also possible to define more than +Using the `services.netbird.clients` option, it is possible to define more than one netbird service running at the same time. -The following configuration will start a netbird daemon using the interface `wt1` and -the port 51830. Its configuration file will then be located at `/var/lib/netbird-wt1/config.json`. +You must at least define a `port` for the service to listen on, the rest is optional: ```nix { - services.netbird.tunnels = { - wt1 = { - port = 51830; + services.netbird.clients.wt1.port = 51830; + services.netbird.clients.wt2.port = 51831; +} +``` + +see [clients](#opt-services.netbird.clients) option documentation for more details. + +## Exposing services internally on the Netbird network {#module-services-netbird-firewall} + +You can easily expose services exclusively to Netbird network by combining +[`networking.firewall.interfaces`](#opt-networking.firewall.interfaces) rules +with [`interface`](#opt-services.netbird.clients._name_.interface) names: + +```nix +{ + services.netbird.clients.priv.port = 51819; + services.netbird.clients.work.port = 51818; + networking.firewall.interfaces = { + "${config.services.netbird.clients.priv.interface}" = { + allowedUDPPorts = [ 1234 ]; + }; + "${config.services.netbird.clients.work.interface}" = { + allowedTCPPorts = [ 8080 ]; }; }; } ``` -To interact with it, you will need to specify the correct daemon address: +### Additional customizations {#module-services-netbird-customization} -```bash -netbird --daemon-addr unix:///var/run/netbird-wt1/sock ... -``` +Each Netbird client service by default: -The address will by default be `unix:///var/run/netbird-`. +- runs in a [hardened](#opt-services.netbird.clients._name_.hardened) mode, +- starts with the system, +- [opens up a firewall](#opt-services.netbird.clients._name_.openFirewall) for direct (without TURN servers) + peer-to-peer communication, +- can be additionally configured with environment variables, +- automatically determines whether `netbird-ui-` should be available, -It is also possible to overwrite default options passed to the service, for -example: +[autoStart](#opt-services.netbird.clients._name_.autoStart) allows you to start the client (an actual systemd service) +on demand, for example to connect to work-related or otherwise conflicting network only when required. +See the option description for more information. -```nix -{ - services.netbird.tunnels.wt1.environment = { - NB_DAEMON_ADDR = "unix:///var/run/toto.sock"; - }; -} -``` - -This will set the socket to interact with the netbird service to `/var/run/toto.sock`. +[environment](#opt-services.netbird.clients._name_.environment) allows you to pass additional configurations +through environment variables, but special care needs to be taken for overriding config location and +daemon address due [hardened](#opt-services.netbird.clients._name_.hardened) option. diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix index 9771503e14e2..1dc5267563dd 100644 --- a/nixos/modules/services/networking/netbird.nix +++ b/nixos/modules/services/networking/netbird.nix @@ -4,67 +4,187 @@ pkgs, ... }: - let inherit (lib) - attrNames + attrValues + concatLists + concatStringsSep + escapeShellArgs + filterAttrs getExe literalExpression maintainers + makeBinPath mapAttrs' + mapAttrsToList + mkAliasOptionModule mkDefault - mkEnableOption mkIf mkMerge mkOption + mkOptionDefault mkPackageOption nameValuePair optional + optionalAttrs + optionalString + toShellVars + versionAtLeast versionOlder ; inherit (lib.types) attrsOf + bool + enum + nullOr + package + path port str submodule ; - kernel = config.boot.kernelPackages; + inherit (config.boot) kernelPackages; + inherit (config.boot.kernelPackages) kernel; cfg = config.services.netbird; + + toClientList = fn: map fn (attrValues cfg.clients); + toClientAttrs = fn: mapAttrs' (_: fn) cfg.clients; + + hardenedClients = filterAttrs (_: client: client.hardened) cfg.clients; + toHardenedClientList = fn: map fn (attrValues hardenedClients); + toHardenedClientAttrs = fn: mapAttrs' (_: fn) hardenedClients; + + mkBinName = + client: name: + if client.bin.suffix == "" || client.bin.suffix == "netbird" then + name + else + "${name}-${client.bin.suffix}"; + + nixosConfig = config; in { - meta.maintainers = with maintainers; [ ]; + meta.maintainers = with maintainers; [ + nazarewk + ]; meta.doc = ./netbird.md; + imports = [ + (mkAliasOptionModule [ "services" "netbird" "tunnels" ] [ "services" "netbird" "clients" ]) + ]; + options.services.netbird = { - enable = mkEnableOption "Netbird daemon"; + enable = mkOption { + type = bool; + default = false; + description = '' + Enables backwards compatible Netbird client service. + + This is strictly equivalent to: + + ```nix + services.netbird.clients.default = { + port = 51820; + name = "netbird"; + systemd.name = "netbird"; + interface = "wt0"; + hardened = false; + }; + ``` + ''; + }; package = mkPackageOption pkgs "netbird" { }; - tunnels = mkOption { + ui.enable = mkOption { + type = bool; + default = config.services.displayManager.sessionPackages != [ ] || config.services.xserver.enable; + defaultText = literalExpression '' + config.services.displayManager.sessionPackages != [ ] || config.services.xserver.enable + ''; + description = '' + Controls presence `netbird-ui` wrappers, defaults to presence of graphical sessions. + ''; + }; + ui.package = mkPackageOption pkgs "netbird-ui" { }; + + clients = mkOption { type = attrsOf ( submodule ( { name, config, ... }: + let + client = config; + in { options = { port = mkOption { type = port; - default = 51820; + example = literalExpression "51820"; description = '' - Port for the ${name} netbird interface. + Port the Netbird client listens on. ''; }; + name = mkOption { + type = str; + default = name; + description = '' + Primary name for use (as a suffix) in: + - systemd service name, + - hardened user name and group, + - [systemd `*Directory=`](https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#RuntimeDirectory=) names, + - desktop application identification, + ''; + }; + + dns-resolver.address = mkOption { + type = nullOr str; + default = null; + example = "127.0.0.123"; + description = '' + An explicit address that Netbird will serve `*.netbird.cloud.` (usually) entries on. + + Netbird serves DNS on it's own (dynamic) client address by default. + ''; + }; + + dns-resolver.port = mkOption { + type = port; + default = 53; + description = '' + A port to serve DNS entries on when `dns-resolver.address` is enabled. + ''; + }; + + interface = mkOption { + type = str; + default = "nb-${client.name}"; + description = '' + Name of the network interface managed by this client. + ''; + apply = + iface: + lib.throwIfNot ( + builtins.stringLength iface <= 15 + ) "Network interface name must be 15 characters or less" iface; + }; + environment = mkOption { type = attrsOf str; defaultText = literalExpression '' { - NB_CONFIG = "/var/lib/''${stateDir}/config.json"; - NB_LOG_FILE = "console"; - NB_WIREGUARD_PORT = builtins.toString port; - NB_INTERFACE_NAME = name; - NB_DAMEON_ADDR = "/var/run/''${stateDir}" + NB_STATE_DIR = client.dir.state; + NB_CONFIG = "''${client.dir.state}/config.json"; + NB_DAEMON_ADDR = "unix://''${client.dir.runtime}/sock"; + NB_INTERFACE_NAME = client.interface; + NB_LOG_FILE = mkOptionDefault "console"; + NB_LOG_LEVEL = client.logLevel; + NB_SERVICE = client.service.name; + NB_WIREGUARD_PORT = toString client.port; + } // optionalAttrs (client.dns-resolver.address != null) { + NB_DNS_RESOLVER_ADDRESS = "''${client.dns-resolver.address}:''${builtins.toString client.dns-resolver.port}"; } ''; description = '' @@ -72,64 +192,311 @@ in ''; }; - stateDir = mkOption { - type = str; - default = "netbird-${name}"; + autoStart = mkOption { + type = bool; + default = true; description = '' - Directory storing the netbird configuration. + Start the service with the system. + + As of 2024-02-13 it is not possible to start a Netbird client daemon without immediately + connecting to the network, but it is [planned for a near future](https://github.com/netbirdio/netbird/projects/2#card-91718018). + ''; + }; + + openFirewall = mkOption { + type = bool; + default = true; + description = '' + Opens up firewall `port` for communication between Netbird peers directly over LAN or public IP, + without using (internet-hosted) TURN servers as intermediaries. + ''; + }; + + hardened = mkOption { + type = bool; + default = true; + description = '' + Hardened service: + - runs as a dedicated user with minimal set of permissions (see caveats), + - restricts daemon configuration socket access to dedicated user group + (you can grant access to it with `users.users."".extraGroups = [ ${client.user.group} ]`), + + Even though the local system resources access is restricted: + - `CAP_NET_RAW`, `CAP_NET_ADMIN` and `CAP_BPF` still give unlimited network manipulation possibilites, + - older kernels don't have `CAP_BPF` and use `CAP_SYS_ADMIN` instead, + + Known security features that are not (yet) integrated into the module: + - 2024-02-14: `rosenpass` is an experimental feature configurable solely + through `--enable-rosenpass` flag on the `netbird up` command, + see [the docs](https://docs.netbird.io/how-to/enable-post-quantum-cryptography) + ''; + }; + + logLevel = mkOption { + type = enum [ + # logrus loglevels + "panic" + "fatal" + "error" + "warn" + "warning" + "info" + "debug" + "trace" + ]; + default = "info"; + description = "Log level of the Netbird daemon."; + }; + + ui.enable = mkOption { + type = bool; + default = nixosConfig.services.netbird.ui.enable; + defaultText = literalExpression ''client.ui.enable''; + description = '' + Controls presence of `netbird-ui` wrapper for this Netbird client. + ''; + }; + + wrapper = mkOption { + type = package; + internal = true; + default = + let + makeWrapperArgs = concatLists ( + mapAttrsToList (key: value: [ + "--set-default" + key + value + ]) client.environment + ); + mkBin = mkBinName client; + in + pkgs.stdenv.mkDerivation { + name = "${cfg.package.name}-wrapper-${client.name}"; + meta.mainProgram = mkBin "netbird"; + nativeBuildInputs = with pkgs; [ makeWrapper ]; + phases = [ "installPhase" ]; + installPhase = concatStringsSep "\n" [ + '' + mkdir -p "$out/bin" + makeWrapper ${lib.getExe cfg.package} "$out/bin/${mkBin "netbird"}" \ + ${escapeShellArgs makeWrapperArgs} + '' + (optionalString cfg.ui.enable '' + # netbird-ui doesn't support envvars + makeWrapper ${lib.getExe cfg.ui.package} "$out/bin/${mkBin "netbird-ui"}" \ + --add-flags '--daemon-addr=${client.environment.NB_DAEMON_ADDR}' + + mkdir -p "$out/share/applications" + substitute ${cfg.ui.package}/share/applications/netbird.desktop \ + "$out/share/applications/${mkBin "netbird"}.desktop" \ + --replace-fail 'Name=Netbird' "Name=Netbird @ ${client.service.name}" \ + --replace-fail '${lib.getExe cfg.ui.package}' "$out/bin/${mkBin "netbird-ui"}" + '') + ]; + }; + }; + + # see https://github.com/netbirdio/netbird/blob/88747e3e0191abc64f1e8c7ecc65e5e50a1527fd/client/internal/config.go#L49-L82 + config = mkOption { + type = (pkgs.formats.json { }).type; + defaultText = literalExpression '' + { + DisableAutoConnect = !client.autoStart; + WgIface = client.interface; + WgPort = client.port; + } // optionalAttrs (client.dns-resolver.address != null) { + CustomDNSAddress = "''${client.dns-resolver.address}:''${builtins.toString client.dns-resolver.port}"; + } + ''; + description = '' + Additional configuration that exists before the first start and + later overrides the existing values in `config.json`. + + It is mostly helpful to manage configuration ignored/not yet implemented + outside of `netbird up` invocation. + + WARNING: this is not an upstream feature, it could break in the future + (by having lower priority) after upstream implements an equivalent. + + It is implemented as a `preStart` script which overrides `config.json` + with content of `/etc/${client.dir.baseName}/config.d/*.json` files. + This option manages specifically `50-nixos.json` file. + + Consult [the source code](https://github.com/netbirdio/netbird/blob/88747e3e0191abc64f1e8c7ecc65e5e50a1527fd/client/internal/config.go#L49-L82) + or inspect existing file for a complete list of available configurations. + ''; + }; + + suffixedName = mkOption { + type = str; + default = if client.name != "netbird" then "netbird-${client.name}" else client.name; + description = '' + A systemd service name to use (without `.service` suffix). + ''; + }; + dir.baseName = mkOption { + type = str; + default = client.suffixedName; + description = '' + A systemd service name to use (without `.service` suffix). + ''; + }; + dir.state = mkOption { + type = path; + default = "/var/lib/${client.dir.baseName}"; + description = '' + A state directory used by Netbird client to store `config.json`, `state.json` & `resolv.conf`. + ''; + }; + dir.runtime = mkOption { + type = path; + default = "/var/run/${client.dir.baseName}"; + description = '' + A runtime directory used by Netbird client. + ''; + }; + service.name = mkOption { + type = str; + default = client.suffixedName; + description = '' + A systemd service name to use (without `.service` suffix). + ''; + }; + user.name = mkOption { + type = str; + default = client.suffixedName; + description = '' + A system user name for this client instance. + ''; + }; + user.group = mkOption { + type = str; + default = client.suffixedName; + description = '' + A system group name for this client instance. + ''; + }; + bin.suffix = mkOption { + type = str; + default = if client.name != "netbird" then client.name else ""; + description = '' + A system group name for this client instance. ''; }; }; - config.environment = builtins.mapAttrs (_: mkDefault) { - NB_CONFIG = "/var/lib/${config.stateDir}/config.json"; - NB_LOG_FILE = "console"; - NB_WIREGUARD_PORT = builtins.toString config.port; - NB_INTERFACE_NAME = name; - NB_DAEMON_ADDR = "unix:///var/run/${config.stateDir}/sock"; - }; + config.environment = + { + NB_STATE_DIR = client.dir.state; + NB_CONFIG = "${client.dir.state}/config.json"; + NB_DAEMON_ADDR = "unix://${client.dir.runtime}/sock"; + NB_INTERFACE_NAME = client.interface; + NB_LOG_FILE = mkOptionDefault "console"; + NB_LOG_LEVEL = client.logLevel; + NB_SERVICE = client.service.name; + NB_WIREGUARD_PORT = toString client.port; + } + // optionalAttrs (client.dns-resolver.address != null) { + NB_DNS_RESOLVER_ADDRESS = "${client.dns-resolver.address}:${builtins.toString client.dns-resolver.port}"; + }; + + config.config = + { + DisableAutoConnect = !client.autoStart; + WgIface = client.interface; + WgPort = client.port; + } + // optionalAttrs (client.dns-resolver.address != null) { + CustomDNSAddress = "${client.dns-resolver.address}:${builtins.toString client.dns-resolver.port}"; + }; } ) ); default = { }; description = '' - Attribute set of Netbird tunnels, each one will spawn a daemon listening on ... + Attribute set of Netbird client daemons, by default each one will: + + 1. be manageable using dedicated tooling: + - `netbird-` script, + - `Netbird - netbird-` graphical interface when appropriate (see `ui.enable`), + 2. run as a `netbird-.service`, + 3. listen for incoming remote connections on the port `51820` (`openFirewall` by default), + 4. manage the `netbird-` wireguard interface, + 5. use the `/var/lib/netbird-/config.json` configuration file, + 6. override `/var/lib/netbird-/config.json` with values from `/etc/netbird-/config.d/*.json`, + 7. (`hardened`) be locally manageable by `netbird-` system group, + + With following caveats: + + - multiple daemons will interfere with each other's DNS resolution of `netbird.cloud`, but + should remain fully operational otherwise. + Setting up custom (non-conflicting) DNS zone is currently possible only when self-hosting. + ''; + example = lib.literalExpression '' + { + services.netbird.clients.wt0.port = 51820; + services.netbird.clients.personal.port = 51821; + services.netbird.clients.work1.port = 51822; + } ''; }; }; config = mkMerge [ (mkIf cfg.enable { - # For backwards compatibility - services.netbird.tunnels.wt0.stateDir = "netbird"; + services.netbird.clients.default = { + port = mkDefault 51820; + interface = mkDefault "wt0"; + name = mkDefault "netbird"; + hardened = mkDefault false; + }; }) + { + boot.extraModulePackages = optional ( + cfg.clients != { } && (versionOlder kernel.version "5.6") + ) kernelPackages.wireguard; - (mkIf (cfg.tunnels != { }) { - boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard; + environment.systemPackages = toClientList (client: client.wrapper) + # omitted due to https://github.com/netbirdio/netbird/issues/1562 + #++ optional (cfg.clients != { }) cfg.package + # omitted due to https://github.com/netbirdio/netbird/issues/1581 + #++ optional (cfg.clients != { } && cfg.ui.enable) cfg.ui.package + ; - environment.systemPackages = [ cfg.package ]; + networking.dhcpcd.denyInterfaces = toClientList (client: client.interface); + networking.networkmanager.unmanaged = toClientList (client: "interface-name:${client.interface}"); - networking.dhcpcd.denyInterfaces = attrNames cfg.tunnels; + networking.firewall.allowedUDPPorts = concatLists ( + toClientList (client: optional client.openFirewall client.port) + ); systemd.network.networks = mkIf config.networking.useNetworkd ( - mapAttrs' ( - name: _: - nameValuePair "50-netbird-${name}" { + toClientAttrs ( + client: + nameValuePair "50-netbird-${client.interface}" { matchConfig = { - Name = name; + Name = client.interface; }; linkConfig = { Unmanaged = true; ActivationPolicy = "manual"; }; } - ) cfg.tunnels + ) ); - systemd.services = mapAttrs' ( - name: - { environment, stateDir, ... }: - nameValuePair "netbird-${name}" { + environment.etc = toClientAttrs ( + client: + nameValuePair "${client.dir.baseName}/config.d/50-nixos.json" { + text = builtins.toJSON client.config; + mode = "0444"; + } + ); + + systemd.services = toClientAttrs ( + client: + nameValuePair client.service.name { description = "A WireGuard-based mesh network that connects your devices into a single private network"; documentation = [ "https://netbird.io/docs/" ]; @@ -137,17 +504,19 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ openresolv ]; - - inherit environment; + path = optional (!config.services.resolved.enable) pkgs.openresolv; serviceConfig = { - ExecStart = "${getExe cfg.package} service run"; + ExecStart = "${getExe client.wrapper} service run"; Restart = "always"; - RuntimeDirectory = stateDir; - StateDirectory = stateDir; + + RuntimeDirectory = client.dir.baseName; + RuntimeDirectoryMode = mkDefault "0755"; + ConfigurationDirectory = client.dir.baseName; + StateDirectory = client.dir.baseName; StateDirectoryMode = "0700"; - WorkingDirectory = "/var/lib/${stateDir}"; + + WorkingDirectory = client.dir.state; }; unitConfig = { @@ -157,7 +526,124 @@ in stopIfChanged = false; } - ) cfg.tunnels; + ); + } + # Hardening section + (mkIf (hardenedClients != { }) { + users.groups = toHardenedClientAttrs (client: nameValuePair client.user.group { }); + users.users = toHardenedClientAttrs ( + client: + nameValuePair client.user.name { + isSystemUser = true; + home = client.dir.state; + group = client.user.group; + } + ); + + systemd.services = toHardenedClientAttrs ( + client: + nameValuePair client.service.name ( + mkIf client.hardened { + serviceConfig = { + RuntimeDirectoryMode = "0750"; + + User = client.user.name; + Group = client.user.group; + + # settings implied by DynamicUser=true, without actully using it, + # see https://www.freedesktop.org/software/systemd/man/latest/systemd.exec.html#DynamicUser= + RemoveIPC = true; + PrivateTmp = true; + ProtectSystem = "strict"; + ProtectHome = "yes"; + + AmbientCapabilities = + [ + # see https://man7.org/linux/man-pages/man7/capabilities.7.html + # see https://docs.netbird.io/how-to/installation#running-net-bird-in-docker + # + # seems to work fine without CAP_SYS_ADMIN and CAP_SYS_RESOURCE + # CAP_NET_BIND_SERVICE could be added to allow binding on low ports, but is not required, + # see https://github.com/netbirdio/netbird/pull/1513 + + # failed creating tunnel interface wt-priv: [operation not permitted + "CAP_NET_ADMIN" + # failed to pull up wgInterface [wt-priv]: failed to create ipv4 raw socket: socket: operation not permitted + "CAP_NET_RAW" + ] + # required for eBPF filter, used to be subset of CAP_SYS_ADMIN + ++ optional (versionAtLeast kernel.version "5.8") "CAP_BPF" + ++ optional (versionOlder kernel.version "5.8") "CAP_SYS_ADMIN" + ++ optional ( + client.dns-resolver.address != null && client.dns-resolver.port < 1024 + ) "CAP_NET_BIND_SERVICE"; + }; + } + ) + ); + + # see https://github.com/systemd/systemd/blob/17f3e91e8107b2b29fe25755651b230bbc81a514/src/resolve/org.freedesktop.resolve1.policy#L43-L43 + # see all actions used at https://github.com/netbirdio/netbird/blob/13e7198046a0d73a9cd91bf8e063fafb3d41885c/client/internal/dns/systemd_linux.go#L29-L32 + security.polkit.extraConfig = mkIf config.services.resolved.enable '' + // systemd-resolved access for Netbird clients + polkit.addRule(function(action, subject) { + var actions = [ + "org.freedesktop.resolve1.revert", + "org.freedesktop.resolve1.set-default-route", + "org.freedesktop.resolve1.set-dns-servers", + "org.freedesktop.resolve1.set-domains", + ]; + var users = ${builtins.toJSON (toHardenedClientList (client: client.user.name))}; + + if (actions.indexOf(action.id) >= 0 && users.indexOf(subject.user) >= 0 ) { + return polkit.Result.YES; + } + }); + ''; }) + # migration & temporary fixups section + { + systemd.services = toClientAttrs ( + client: + nameValuePair client.service.name { + preStart = '' + set -eEuo pipefail + ${optionalString (client.logLevel == "trace" || client.logLevel == "debug") "set -x"} + + PATH="${ + makeBinPath ( + with pkgs; + [ + coreutils + jq + diffutils + ] + ) + }:$PATH" + export ${toShellVars client.environment} + + # merge /etc/${client.dir.baseName}/config.d' into "$NB_CONFIG" + { + test -e "$NB_CONFIG" || echo -n '{}' > "$NB_CONFIG" + + # merge config.d with "$NB_CONFIG" into "$NB_CONFIG.new" + jq -sS 'reduce .[] as $i ({}; . * $i)' \ + "$NB_CONFIG" \ + /etc/${client.dir.baseName}/config.d/*.json \ + > "$NB_CONFIG.new" + + echo "Comparing $NB_CONFIG with $NB_CONFIG.new ..." + if ! diff <(jq -S <"$NB_CONFIG") "$NB_CONFIG.new" ; then + echo "Updating $NB_CONFIG ..." + mv "$NB_CONFIG.new" "$NB_CONFIG" + else + echo "Files are the same, not doing anything." + rm "$NB_CONFIG.new" + fi + } + ''; + } + ); + } ]; } diff --git a/nixos/modules/services/wayland/hypridle.nix b/nixos/modules/services/wayland/hypridle.nix index 83a081aa6741..4ccb126b56f2 100644 --- a/nixos/modules/services/wayland/hypridle.nix +++ b/nixos/modules/services/wayland/hypridle.nix @@ -28,5 +28,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ johnrtitor ]; + meta.maintainers = lib.teams.hyprland.members; } diff --git a/nixos/modules/services/web-apps/calibre-web.nix b/nixos/modules/services/web-apps/calibre-web.nix index c0fdbaa23435..8f61a8ac9e97 100644 --- a/nixos/modules/services/web-apps/calibre-web.nix +++ b/nixos/modules/services/web-apps/calibre-web.nix @@ -2,6 +2,7 @@ let cfg = config.services.calibre-web; + dataDir = if lib.hasPrefix "/" cfg.dataDir then cfg.dataDir else "/var/lib/${cfg.dataDir}"; inherit (lib) concatStringsSep mkEnableOption mkIf mkOption optional optionalString types; in @@ -32,9 +33,10 @@ in dataDir = mkOption { type = types.str; - default = "/var/lib/calibre-web"; + default = "calibre-web"; description = '' - The directory where Calibre-Web stores its data. + Where Calibre-Web stores its data. + Either an absolute path, or the directory name below {file}`/var/lib`. ''; }; @@ -107,14 +109,16 @@ in }; config = mkIf cfg.enable { - systemd.tmpfiles.settings."10-calibre-web".${cfg.dataDir}.d = { - inherit (cfg) user group; - mode = "0700"; + systemd.tmpfiles.settings = lib.optionalAttrs (lib.hasPrefix "/" cfg.dataDir) { + "10-calibre-web".${dataDir}.d = { + inherit (cfg) user group; + mode = "0700"; + }; }; systemd.services.calibre-web = let - appDb = "${cfg.dataDir}/app.db"; - gdriveDb = "${cfg.dataDir}/gdrive.db"; + appDb = "${dataDir}/app.db"; + gdriveDb = "${dataDir}/gdrive.db"; calibreWebCmd = "${cfg.package}/bin/calibre-web -p ${appDb} -g ${gdriveDb}"; settings = concatStringsSep ", " ( @@ -151,6 +155,8 @@ in ExecStart = "${calibreWebCmd} -i ${cfg.listen.ip}"; Restart = "on-failure"; + } // lib.optionalAttrs (!(lib.hasPrefix "/" cfg.dataDir)) { + StateDirectory = cfg.dataDir; }; }; diff --git a/nixos/tests/netbird.nix b/nixos/tests/netbird.nix index 887747437c22..f684a3104265 100644 --- a/nixos/tests/netbird.nix +++ b/nixos/tests/netbird.nix @@ -1,19 +1,59 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: -{ - name = "netbird"; +import ./make-test-python.nix ( + { pkgs, lib, ... }: + { + name = "netbird"; - meta.maintainers = with pkgs.lib.maintainers; [ ]; + meta.maintainers = with pkgs.lib.maintainers; [ + nazarewk + ]; - nodes = { - node = { ... }: { - services.netbird.enable = true; + nodes = { + clients = + { ... }: + { + services.netbird.enable = true; + services.netbird.clients.custom.port = 51819; + }; }; - }; - testScript = '' - start_all() - node.wait_for_unit("netbird-wt0.service") - node.wait_for_file("/var/run/netbird/sock") - node.succeed("netbird status | grep -q 'Daemon status: NeedsLogin'") - ''; -}) + # TODO: confirm the whole solution is working end-to-end when netbird server is implemented + testScript = '' + start_all() + def did_start(node, name): + node.wait_for_unit(f"{name}.service") + node.wait_for_file(f"/var/run/{name}/sock") + output = node.succeed(f"{name} status") + + # not sure why, but it can print either of: + # - Daemon status: NeedsLogin + # - Management: Disconnected + expected = [ + "Disconnected", + "NeedsLogin", + ] + assert any(msg in output for msg in expected) + + did_start(clients, "netbird") + did_start(clients, "netbird-custom") + ''; + + /* + `netbird status` used to print `Daemon status: NeedsLogin` + https://github.com/netbirdio/netbird/blob/23a14737974e3849fa86408d136cc46db8a885d0/client/cmd/status.go#L154-L164 + as the first line, but now it is just: + + Daemon version: 0.26.3 + CLI version: 0.26.3 + Management: Disconnected + Signal: Disconnected + Relays: 0/0 Available + Nameservers: 0/0 Available + FQDN: + NetBird IP: N/A + Interface type: N/A + Quantum resistance: false + Routes: - + Peers count: 0/0 Connected + */ + } +) diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index faa298c06f63..b35fdd3013c7 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -9,17 +9,19 @@ SDL2, libXext, Cocoa, + utf8proc, + nix-update-script, }: stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20240809"; + version = "20241226"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = version; - sha256 = "sha256-J4al7XU+vvehDnp2fRrVesWyUN4i63g5btUkjarpXbk="; + owner = "schismtracker"; + repo = "schismtracker"; + tag = version; + hash = "sha256-CZc5rIAgEydb8JhtkRSqEB9PI7TC58oJZg939GIEiMs="; }; # If we let it try to get the version from git, it will fail and fall back @@ -30,9 +32,21 @@ stdenv.mkDerivation rec { --replace-fail 'git log' 'echo ${version} #' ''; - configureFlags = [ - "--enable-dependency-tracking" - ] ++ lib.optional stdenv.hostPlatform.isDarwin "--disable-sdltest"; + configureFlags = + [ + (lib.enableFeature true "dependency-tracking") + (lib.withFeature true "sdl2") + (lib.enableFeature true "sdl2-linking") + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + (lib.enableFeature true "alsa") + (lib.enableFeature true "alsa-linking") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.enableFeature false "sdltest") + ]; + + strictDeps = true; nativeBuildInputs = [ autoreconfHook @@ -41,7 +55,10 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ SDL2 ] + [ + SDL2 + utf8proc + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libXext @@ -56,12 +73,14 @@ stdenv.mkDerivation rec { --replace '-lSDL2main' '-lSDL2' ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "https://schismtracker.org/"; - license = licenses.gpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ ftrvxmtrx ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ftrvxmtrx ]; mainProgram = "schismtracker"; }; } diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 0ffda870d8f5..64588ad27d93 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.2.4"; + version = "1.2.6"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-acTFJS8E0hQNbiiOi8DfPyTiUcKjXwg5trk3Q2mYYmQ="; + hash = "sha256-FfyvSNaO8dE6zz/PNKp/2kJHbauJjmQAhTriRE5lXEk="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix index f9a586b23b8d..9282ff5cd497 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix @@ -8,13 +8,13 @@ melpaBuild { pname = "edraw"; - version = "1.2.0-unstable-2025-01-06"; + version = "1.2.0-unstable-2025-01-16"; src = fetchFromGitHub { owner = "misohena"; repo = "el-easydraw"; - rev = "9a5b5e2b071be99350bfc8db6fbc2c9c667f3725"; - hash = "sha256-lQYSUQFAv6rqvZySsFbe8B7ZqEaa2L+L3HXB231D4OQ="; + rev = "449c1226f7108e1cf8b4b447a65fa053b6bd782f"; + hash = "sha256-u6lc2s4fqNWNCuICu832vAbMmV5X6FB8fIkJwgdBKfg="; }; propagatedUserEnvPkgs = [ gzip ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 4b0828a47371..29096bacf57f 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -15,7 +15,7 @@ in zlib, python3, lldb, - dotnet-sdk_8, + dotnetCorePackages, maven, openssl, expat, @@ -44,6 +44,8 @@ let products = versions.${system} or (throw "Unsupported system: ${system}"); + dotnet-sdk = dotnetCorePackages.sdk_8_0-source; + package = if stdenv.hostPlatform.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; mkJetBrainsProductCore = callPackage package { inherit vmopts; }; mkMeta = meta: fromSource: { @@ -188,7 +190,7 @@ rec { for dir in plugins/clion-radler/DotFiles/linux-*; do rm -rf $dir/dotnet - ln -s ${dotnet-sdk_8.unwrapped}/share/dotnet $dir/dotnet + ln -s ${dotnet-sdk}/share/dotnet $dir/dotnet done ) ''; @@ -352,7 +354,7 @@ rec { for dir in lib/ReSharperHost/linux-*; do rm -rf $dir/dotnet - ln -s ${dotnet-sdk_8.unwrapped}/share/dotnet $dir/dotnet + ln -s ${dotnet-sdk}/share/dotnet $dir/dotnet done ) ''; diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 71554b6c7554..8b775dd74e64 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "2024-12-14"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "2ebe591cff06018e265263e71e1dbc4c5aa8281e"; - sha256 = "1lw43yhpbi3kl6j5lmz027yhndqjp95ms123dx9lxyqpfa6zkwr0"; + rev = "1b375c24602680b5fe28c3c223a822111857dc37"; + sha256 = "19cab0n6sjmmw4p4qd3n99a677mj6fbkf7m37i8qvhzdyqli4035"; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; }; @@ -173,28 +173,40 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2025-01-18"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "4e8d75144de92e62eb58c87f61938118d3b1e37c"; - sha256 = "0kwrbsxp7sy2dw4z14abfh1mnsxr1lgv411zi5wfi8grgbc04h83"; + rev = "83bf6360a1f28a3fc1afe31ae300247fc01c7a90"; + sha256 = "1m04jryv3hi3a70im6mn7xmb1j457c1la2l62ji4k3bl6frysx4z"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2025-01-17"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "1b907fbf7717ae1244745b8ffa2b604510e713c7"; - sha256 = "0bww20hp83ahi2w66h8qmrkx49fd54xap543yf9bldj5nq5gb440"; + rev = "399c5af43755a9c09f840d892921186514171d87"; + sha256 = "0kc6plxxf48php5s44xsyhy4in7s37p4vnnigmnw45mg4d9sb6aq"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; + LuaSnip-snippets-nvim = buildVimPlugin { + pname = "LuaSnip-snippets.nvim"; + version = "2022-03-17"; + src = fetchFromGitHub { + owner = "molleweide"; + repo = "LuaSnip-snippets.nvim"; + rev = "d7e40e4cce622eab2316607dbcd8d6039bcb9fe0"; + sha256 = "063fz3f9byzmb1qavhrjdcphr3nk4l4d19h7mzj5sx4wv7cn8nl8"; + }; + meta.homepage = "https://github.com/molleweide/LuaSnip-snippets.nvim/"; + }; + MatchTagAlways = buildVimPlugin { pname = "MatchTagAlways"; version = "2017-05-20"; @@ -329,12 +341,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2025-01-17"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "b62efcb71077bfeb407dcd05fb0584e422131150"; - sha256 = "0hgfqjmrca57zy08q4hjws0326djly1jwvrfchingamm15q2g0mw"; + rev = "bb52c530698654355bbddb9f0035dc35cea401a5"; + sha256 = "0xxn7i44h4wmxhwbkn2m51jgpfa2xybrn1arhsp100mdfb2w6fa9"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -546,12 +558,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2025-01-09"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "4c959cf65c5420d54b24b61a77b681dcfca0bc57"; - sha256 = "07sl2vbwn4fk1vyaqq2yiqbp6pglqgj6qhbbzfra2cdx0jhk5v5f"; + rev = "2aeafd99937602fc40609ffffbdd2f99d77343e9"; + sha256 = "1l21zvg8zd42ssd2y28pc054m1fxq8kn4sl51mj60xxxpb2jlxlj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -1196,12 +1208,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2025-01-19"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "1b822aa37005d2cfe010dd0febfb4024fc327576"; - sha256 = "18ykwgcpvwj25aw1bca3yy6dl3n7c5mqrhly15v6z94z18rc7p8q"; + rev = "1f6b990f6ca3597d0d1cbfe6cb683b0080b17516"; + sha256 = "113qinpv6bg5c026xgm353il8qbb9kp31vqshys73jaa58khf5qp"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1292,12 +1304,12 @@ final: prev: blink-compat = buildVimPlugin { pname = "blink.compat"; - version = "2024-12-25"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.compat"; - rev = "5ca8848c8cc32abdc980e5db4f0eb7bb8fbf84dc"; - sha256 = "0g53dkcsl2y77yvsnhsdw523i4jfl495n9ynlsppk8wx58miwm5l"; + rev = "d375d838042dbef34114139839fdda16b2485d63"; + sha256 = "1qgscw95iicnkki6mw5c9akyjrvsgdc9lyqi0srsybpw90i68mxl"; }; meta.homepage = "https://github.com/Saghen/blink.compat/"; }; @@ -1332,8 +1344,8 @@ final: prev: src = fetchFromGitHub { owner = "mikavilpas"; repo = "blink-ripgrep.nvim"; - rev = "ccffe82ffb7a0b3967a5f5ed97d415a11a3c3a8e"; - sha256 = "1ia40cg5dv6xl7a1nxs59p86ck0q46rzix37k7m9bqc9brmdhmxi"; + rev = "a17697bba1bd351f6686b9f9285cf2fd1b03cf4a"; + sha256 = "0s2i54lqz9nzasfhiy2x6n4df3a2axzp0cyhma8jhv2y7v4pa8gi"; }; meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/"; }; @@ -1364,12 +1376,12 @@ final: prev: bluloco-nvim = buildVimPlugin { pname = "bluloco.nvim"; - version = "2025-01-16"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "uloco"; repo = "bluloco.nvim"; - rev = "d14fa758c6dc73e622384e1ee895e5f614d9d9d5"; - sha256 = "1aa59nkc1qfli6ak7lnnz4a6kvbn0rqsz5n8rxhr88hvhb4pab9p"; + rev = "6b014b473aac4bf9470f926a3f5568ebc2ce5f08"; + sha256 = "100gbjpkd6mj2k9whcji82lqg6xl4nnq2vg6nxcw5zq0lhgp2lrq"; }; meta.homepage = "https://github.com/uloco/bluloco.nvim/"; }; @@ -1676,11 +1688,11 @@ final: prev: clangd_extensions-nvim = buildVimPlugin { pname = "clangd_extensions.nvim"; - version = "2024-10-05"; + version = "2025-01-27"; src = fetchgit { url = "https://git.sr.ht/~p00f/clangd_extensions.nvim"; - rev = "8f7b72100883e0e34400d9518d40a03f21e4d0a6"; - sha256 = "1rlw3h9f9cnbniqqpv9fv2s63g7s4p8ag4n15xja1r4scfxhyrip"; + rev = "db28f29be928d18cbfb86fbfb9f83f584f658feb"; + sha256 = "16j27jwr90ixj1r6qcwfc9f90a2jdzd5104vpwwvyrdlqpgkml2x"; }; meta.homepage = "https://git.sr.ht/~p00f/clangd_extensions.nvim"; }; @@ -1747,12 +1759,12 @@ final: prev: cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "2025-01-13"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "a673bb68680197143902ec4d0a0078e4ae3d2141"; - sha256 = "0mlz6mc1zm9cby7b4vns053x0p0bzx8xb0z565nird0gg4bfrgyl"; + rev = "83268ea6f969f1e6eaa85f72118a11acb6198bf0"; + sha256 = "0m3zhdzf58fpxaywmyqm4hljkynw0wws4gk6h45w3km0cawwz6qj"; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; }; @@ -2454,12 +2466,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2024-12-24"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "4cc169449fa6fd69e5f5f0a67bda8fd74837f924"; - sha256 = "0dwag116y4dykfz3zzgqh8d59s7gc9k9xwvs5ailxi30ws8ii7qz"; + rev = "b45563656be26e518992ffede778f918dc443012"; + sha256 = "0kpx3vx4j0d4izhsljnmyliwxlhszi6hxmm1m7f75h180p5ncjda"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2502,12 +2514,12 @@ final: prev: codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "2025-01-18"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - rev = "72d95c0126c82f02d1b3f43744f7b333d3dc5d22"; - sha256 = "1p2jjsjqgg3vjg1kfmb03va83zkkn9dywfkd3h6snxjn0sbp84v7"; + rev = "d9f6ae48b9e0b1ec09594d8bd04dea49223f4f22"; + sha256 = "1i4s4prxwz94g9igl7wd19ilji3j7kard8ad7v8ngbjdxlfx3aj0"; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; }; @@ -2754,12 +2766,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2025-01-16"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "6dc21d4ce050c2e592d9635b7983d67baf216e3d"; - sha256 = "1gcc6lz7cx5vn42c82hxan61xhli891aka5775pzlrhxxc8pyd8j"; + rev = "363243c03102a531a8203311d4f2ae704c620d9b"; + sha256 = "1lf7a5b30g37ys9f4z9gq68ymzfzsw7bwzqp1bb91cx9df1bdyck"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2827,12 +2839,12 @@ final: prev: copilot-lualine = buildVimPlugin { pname = "copilot-lualine"; - version = "2024-09-03"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "AndreM222"; repo = "copilot-lualine"; - rev = "f40450c3e138766026327e7807877ea860618258"; - sha256 = "0qx9x28f0c20cz2ax1631rd7qzzkzvhbnv9ivmyw44v5nzp8jy1x"; + rev = "dc4b8ed0f75bc2557b3158c526624bf04ad233ea"; + sha256 = "062azz55qbrh07md9p610q6p278n9s60f83wwq890lvdm94x4lgc"; }; meta.homepage = "https://github.com/AndreM222/copilot-lualine/"; }; @@ -2851,12 +2863,12 @@ final: prev: coq-artifacts = buildVimPlugin { pname = "coq.artifacts"; - version = "2024-08-31"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "a1ffcee295905171d87b40ee456001d45b10329b"; - sha256 = "0ag8ryq7figzvf0693077ifwj38jwig09521v04h9jyivickiq6w"; + rev = "ef5f21d638ccc456cfa5b8d0ab37093cefe48c8b"; + sha256 = "0h7hz9p564pq116pski6q6jng1qws29brxf12gzmj0iamgb8alzp"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; @@ -2899,12 +2911,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2025-01-19"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "7db5a5f80bd2fc5f6f930acb5a3ded063463a621"; - sha256 = "036mgp9b9ynmrwv6bch9kf6xblj88llv3dxccfkr9q20yb0lc0q3"; + rev = "df646c5d39a949009d9109c1a2ec2725819726ff"; + sha256 = "1xcnbiq37sg1ipv5kjw61yli8qj5adzf0fqbhqsdvlxmfplwvv8k"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -3067,12 +3079,12 @@ final: prev: cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "2025-01-17"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - rev = "f5e9c14a3026ef7cdb26d00145baebe166b52848"; - sha256 = "18g3jjc6spzzhxcpsm5xvwv3a61yscfhrzmca8bv3frgcwp4z7wd"; + rev = "5b42c2e6764312c166c25bc79dfcbaadac2d5425"; + sha256 = "0wwd3qrbv3cdhas6vicl3m5wvxhl18r85j5khf3yslbppzjfnfr6"; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; }; @@ -3115,24 +3127,24 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2025-01-19"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "4bad0f5608b7305091e5baab2dda0b988729692e"; - sha256 = "1cmai7z99x804lkb5c7kiaw1gzgvxznq227fr93ag18rrb620z4g"; + rev = "000448d837f6e7a47f8f342f29526c4d7e49e9ce"; + sha256 = "11kh15qp819dhr2r3q78dv9pzxrswzzpjqmdpa5nlba9mvgjzzy3"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; ddc-filter-matcher_head = buildVimPlugin { pname = "ddc-filter-matcher_head"; - version = "2024-09-03"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-filter-matcher_head"; - rev = "2be49f0c547fc224f70bd4a0b354b1c1dd9c9eac"; - sha256 = "0liglv3rlag29bivsx2m5m6xnqxc6d7z5ar88zyqmrwrzs20f83h"; + rev = "2c46a670191cb883bc07a2286883a7c438f731fb"; + sha256 = "1xhdrm07xibdl100rbvpqf3m3r2c2iy0lnnaf06rhng6i7d1kn71"; }; meta.homepage = "https://github.com/Shougo/ddc-filter-matcher_head/"; }; @@ -3175,12 +3187,12 @@ final: prev: ddc-source-file = buildVimPlugin { pname = "ddc-source-file"; - version = "2024-09-24"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "LumaKernel"; repo = "ddc-source-file"; - rev = "34b362d45957183b4ec99d618a19a5f5f517c365"; - sha256 = "070k693x8di1safyrb1dbki626akmnpi25wzvjnjd4vvvknzwbj8"; + rev = "4f3cead1774e4718a91476fe883eccff1137773c"; + sha256 = "17nibc8xgl73p0cvc27v0zjn3mw89nrsch02js32070x21dj6l8v"; }; meta.homepage = "https://github.com/LumaKernel/ddc-source-file/"; }; @@ -3235,12 +3247,12 @@ final: prev: debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2025-01-15"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "1a7b2b9c08c01b975adadae540b831e11577922c"; - sha256 = "1lh0nvfc1afayryb6y6ciww3wk56lh7vwbcy0aq65lvwpryz37vh"; + rev = "91c3a7c51aafce919f1ed30e56dbb2fc62b22e13"; + sha256 = "09dc6xvrqvxqq78a90p01scinwcxnpggvqc4g6mb7da69zdbyjy2"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; @@ -3355,12 +3367,12 @@ final: prev: deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2025-01-15"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "154df2c63b5f547933e911dc6b6e3810edcce194"; - sha256 = "1cfrc5zxd8x96bz2xcy8xq4zrf1cid4x93fc74kzndiq2dsvhhl3"; + rev = "649f52aa7eb2d5ddae2f20426fcda413289b9510"; + sha256 = "0c5wgx9mvysp4a2jcs05rkn9si91ka0qb257zrn10i8wd20kk35b"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -3765,24 +3777,24 @@ final: prev: dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2024-12-21"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "3a45525bb182730fe462325c99395529308f431e"; - sha256 = "0wd9zgqh9i9f77ny7avgsnsl6rxamcqcr7qlbzmsb8p003kl321p"; + rev = "56ef6a969a4990d938c5fed40c370f65e125fc97"; + sha256 = "00wpbb4hgkngx29jn4mrcyl1d6xzd2hn6safm5vz0ydl5sxla48c"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2025-01-19"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "40ef4c492edc08090d31d12fb9b7eb2315463a7e"; - sha256 = "090s9b454lhwzy5ynsrfvp0p9r0rygafl3gxr0fjv5jhks9bgf63"; + rev = "b27bb0353cb34bded65a8911e7d232b12100568b"; + sha256 = "1wr65a41xpqvzw2yy2q8mg6yv12czb2fr4abf0zn0iyspk4vkm8c"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3801,12 +3813,12 @@ final: prev: easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "2025-01-17"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "b093bed64349e86d653fff19773f1ff3202b878f"; - sha256 = "1dny7pwd2nmvd112dag0xwbvzi3sv58hpjg2f54yh7la6843hwvb"; + rev = "65a53aa9159313f18dfa0c8ec40394b2f06e5ad8"; + sha256 = "1cblj7ivqkd09q7ap01gv0k9xq8ni4sgz0618dh4h6yf5zj7mz2g"; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; }; @@ -3934,12 +3946,12 @@ final: prev: embark-vim = buildVimPlugin { pname = "embark-vim"; - version = "2024-09-21"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "530e361aa81a8665c3a909a787b918aaf7d702e2"; - sha256 = "1fyjri2i8cg4kykx64xf4i6xwyfdgzhimmr2mpwhjwgkjh8mhlph"; + rev = "3456e3c23981aeb951e8a804ce6358569023c96e"; + sha256 = "1649606jcpfn5n64xgma0wxz907i0j4hq15l72mcadwf5zi89j7g"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; @@ -4103,12 +4115,12 @@ final: prev: feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2024-11-13"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "9f1313f61a75ec5ebe805fedd46bdc130c420963"; - sha256 = "0z8gq8hx2qn7v12lx9cjk48vx53zwpa4v6xvwpakyyink8fa0fpx"; + rev = "8184e3765d2a604b73c059f7eeab73212575fb0e"; + sha256 = "0fwsly72b9s7gjk1sval25mwp3s9v5ha8x1rks50ljcl5xvfzci6"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; @@ -4657,11 +4669,11 @@ final: prev: gitlab-vim = buildVimPlugin { pname = "gitlab.vim"; - version = "2025-01-17"; + version = "2025-01-24"; src = fetchgit { url = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; - rev = "7de00395ec13ab568b0bf50f1bf7d201ec395b1a"; - sha256 = "1bppvyvpm32jps898nrv096r5kigdsdz6kimmhiigv4xf3iwjv9j"; + rev = "aa50a927a1d92abed361442b9366f0f1cddac937"; + sha256 = "0z80wj2qhk55yk4p3gpqnssdz7znq3m8sgcln08ivknw6mlmwvxa"; }; meta.homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; }; @@ -4680,12 +4692,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2025-01-17"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "817bd848fffe82e697b4da656e3f2834cd0665c5"; - sha256 = "085d953zlaxxmv1rymmbbnclgvmccx6hzrv3amp6n5g1nh3zpp9w"; + rev = "d8918f06624dd53b9a82bd0e29c31bcfd541b40d"; + sha256 = "19j7y5z9sz967rcyk4lxb3l5z3rrk07fi6wakvxqnwqwqvag4x9x"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -4740,12 +4752,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2025-01-16"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "6e5a74b866aa4a112ed85a1169befff2ef82c027"; - sha256 = "10y12jgf6c8hcsqrp0y9zcvp1p0yvdx0jrmvvzfb65hgjxkqr5lz"; + rev = "5308b3eb07640d5aff28461048179552b7b7d015"; + sha256 = "0bd4ypb3rvypwqm0nrwyk0axkz31wrq5cj1gzgq7dkki40iasvnj"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -4860,12 +4872,12 @@ final: prev: grug-far-nvim = buildVimPlugin { pname = "grug-far.nvim"; - version = "2025-01-11"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "MagicDuck"; repo = "grug-far.nvim"; - rev = "8e8f3429038d45a6d4144c0642d92f470e5480f3"; - sha256 = "0b66744sxrsdxl9ir5pkcmq29qr8q7w5yap6ca5yna9q92wmdd4h"; + rev = "635e69adf3a714621bd0a289314bc23c5848babb"; + sha256 = "17km6zbly55c5lqahlksbxqajzg6k6xia25dfysd7nxhjf92nyg5"; }; meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/"; }; @@ -5041,23 +5053,23 @@ final: prev: hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2024-12-22"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "5d9adcbe2f12741de79e435c8b85dca69a3b22e4"; - sha256 = "11h8gbxf6fqfi7qav9w0s5ld5a6v9j52gal47svd90qn53xjncsq"; + rev = "3fef94069fe842fd43e2865334a7ff8e8139dc6b"; + sha256 = "1scl6iyla1nbzqdx69sk7avdq4z4zlrgd6kx5649d9rgc5f740y3"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; hare-vim = buildVimPlugin { pname = "hare.vim"; - version = "2025-01-15"; + version = "2025-01-24"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "e139320314611e3acf7947d0fd6f42d9b499c7ef"; - sha256 = "1fja5irszf98awi6rsrk6ws6i44xvsqa26hmcrpkw541c8s4gprg"; + rev = "1e39bb30c680756dd6b4b85af50571b5afee58cb"; + sha256 = "0ivkh0dgc6djaqjsnbsc36027w4as9k1dj4d3ja4wzxnqk2ll97p"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; @@ -5437,12 +5449,12 @@ final: prev: img-clip-nvim = buildVimPlugin { pname = "img-clip.nvim"; - version = "2024-11-26"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "HakonHarnes"; repo = "img-clip.nvim"; - rev = "5ff183655ad98b5fc50c55c66540375bbd62438c"; - sha256 = "15db3md2c822v8w3rkbfhw2jfmx31fak6b6mpvbsmjqsq89zi2s3"; + rev = "da61a81872276b75a2971b056da1b849e0c1870b"; + sha256 = "07hv24n7a9yb8b5vsiwsxq6qn33qph44c70j4hq42396bxnjfv6s"; }; meta.homepage = "https://github.com/HakonHarnes/img-clip.nvim/"; }; @@ -5473,12 +5485,12 @@ final: prev: inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; - version = "2025-01-16"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "smjonas"; repo = "inc-rename.nvim"; - rev = "e510160beefa9806751d883a5945c4fe6520b633"; - sha256 = "0lczdzkqkbsjhadvxrmqj0rhzksk4212zljv36a9bzp0jh49dv4i"; + rev = "f9b9e5b9a75074810f40881b7e254b5bbeaf122e"; + sha256 = "0ply4qyly1hsiv75y71i3scnav5z8gxjsh34nspmpk0lcldrhxpd"; }; meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; @@ -5521,12 +5533,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2025-01-14"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "7a698a1d7ed755af9f5a88733b23ca246ce2df28"; - sha256 = "1dxfp67zzqzxibapacwf5xjwpsgmx15b2v3dm5hc3n7303gqymb3"; + rev = "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78"; + sha256 = "1whsjd715rr59warfy7nmw0hzkxfkxgzx9c8r6k2vka4flifirnk"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -5641,12 +5653,12 @@ final: prev: iron-nvim = buildVimPlugin { pname = "iron.nvim"; - version = "2024-12-12"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "Vigemus"; repo = "iron.nvim"; - rev = "916538ebf75b8ede8e0feef4f4cd88d5cc82a67e"; - sha256 = "1bwg424fgrlg7c9f3r0xdmayi9a50ybrgk85idwmmhhxz99jcx90"; + rev = "46cf1a1ae664091ab13b4e794c92ebb4402512c1"; + sha256 = "04j71siin3xrjcfnlvnvlvazyfl1f70alyh0if1vq7nqb4hva1nz"; }; meta.homepage = "https://github.com/Vigemus/iron.nvim/"; }; @@ -5872,12 +5884,12 @@ final: prev: kulala-nvim = buildVimPlugin { pname = "kulala.nvim"; - version = "2025-01-18"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "mistweaverco"; repo = "kulala.nvim"; - rev = "691d68eb69afa8476fb1f42e8abb8ac9a55636e0"; - sha256 = "1jjz65ldbskw9hhsh9gf3hw88z350lwmgkbl0653l36ijb00xj0k"; + rev = "d6d3f61a58e6fcad40b91545c84afb4364e65a69"; + sha256 = "110b49n7468lg7wx4dbx4y2xljiv4wz29djkf2yhbpymkraivd3l"; }; meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; }; @@ -5956,12 +5968,12 @@ final: prev: lazydev-nvim = buildVimPlugin { pname = "lazydev.nvim"; - version = "2024-12-20"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "lazydev.nvim"; - rev = "8620f82ee3f59ff2187647167b6b47387a13a018"; - sha256 = "1z822ylm2zfg6ydwxwxfyg2k16rchpr20wm4rfiq61h47hcj9835"; + rev = "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc"; + sha256 = "1ch75kwgyzpplvlp04h6aa4yymkjcwsfkwgzwicnqpsxylsw6z9r"; }; meta.homepage = "https://github.com/folke/lazydev.nvim/"; }; @@ -5980,12 +5992,12 @@ final: prev: lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2025-01-18"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "27bfc20b0b53cade52bdd8fd2553a710f55c3afc"; - sha256 = "1bkh4h3j20gca386n22kcgs0ja196b84w5f90cz3s065cmbfsxab"; + rev = "46012b9288b50de664f5cf5a038a8771ae3d7b34"; + sha256 = "1dqldkf0633y0q0izqrl5aa6gry9hr67hscaqcs8k7ps9dj47a87"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -6016,12 +6028,12 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2025-01-17"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "67d26a13cfbf558450955ee9c76e78e03d13ee9e"; - sha256 = "15b7d28zz491lymiv8gd4x1gnl3jg8sp2fqcf1qn47x7ima2n15d"; + rev = "be8e6eee2dabc68ce810ddf2e800c14bfda09fee"; + sha256 = "0l3jmc06js1l4rarhn6h2zvc3gkvs2ziqkycy8nvca4xri9b8xy4"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -6040,12 +6052,12 @@ final: prev: legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2025-01-10"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "180dd9e59ab597a985baf912d2b2cd11181c0ca6"; - sha256 = "1hnls7m9qkd20ypiakvsmgnd15bch894gw13kgcfr5w9y6afm052"; + rev = "f0067589b9e6de063afac707451689aa13cf6aff"; + sha256 = "13kvz35jx3frp23warl9mvarjql39srfl4dzrn3hqal6ch4zks0b"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -6316,12 +6328,12 @@ final: prev: llama-vim = buildVimPlugin { pname = "llama.vim"; - version = "2025-01-24"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.vim"; - rev = "81e6802ebd00f177a8db73d62c7eeaf14a30819a"; - sha256 = "0fcg0xmdjc9z25ssjmg9pl5q0vk1h1k65ipd4dfzxchvmfzirl5j"; + rev = "a0dd85c7054c8cd70f226e43ebbfa7728de33099"; + sha256 = "01l7y76ywgkx3sk8zsglxr2xbgcafr4c3y4z0diwhv7jfqkxasiz"; }; meta.homepage = "https://github.com/ggml-org/llama.vim/"; }; @@ -6471,12 +6483,12 @@ final: prev: lspecho-nvim = buildVimPlugin { pname = "lspecho.nvim"; - version = "2024-11-30"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "deathbeam"; repo = "lspecho.nvim"; - rev = "8817eef7ebeb518341c621091c21946f547034c8"; - sha256 = "02g3b7ymgzrv95g4kxc58kydldikynw92ks519rznciw1ddl0s2d"; + rev = "936efe4c15c92fc1d4bd72b6cbc2cf3b3b1f882c"; + sha256 = "1ij8nic1mn51wrdvy5jjc286acijfg0bgiym44gpzlqz8dm303lf"; }; meta.homepage = "https://github.com/deathbeam/lspecho.nvim/"; }; @@ -6495,24 +6507,24 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2025-01-19"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "13b3cdc9a53ec821b9e693ee71501cc2d6cf206c"; - sha256 = "189jasphz3xr0alfkhpw6ha91g2ps5r8dcx04ipllv0fngdx71xq"; + rev = "b0f44305bb316552208e59bebaebbd9b9d8d5dde"; + sha256 = "0bzrg785h15fs5zd1i5ai2p0a2npf41j7gldxnxhcsv1qhmhngb8"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; ltex_extra-nvim = buildVimPlugin { pname = "ltex_extra.nvim"; - version = "2025-01-16"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "barreiroleo"; repo = "ltex_extra.nvim"; - rev = "a34d7a32f004bf65aa78a0f7ed64012fe88dcc34"; - sha256 = "1dcxx2rfck89d5cilwcri9bsg787x8a4yjpxrk8m6n8imq23zar2"; + rev = "e451d22abf664ae17037f0e0857b1c9c46716320"; + sha256 = "184p6xxv85v6py6a7yrx8z02bwbsvzy7fyvyk2jyr0pn985aphxs"; }; meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/"; }; @@ -6965,12 +6977,12 @@ final: prev: mini-bracketed = buildVimPlugin { pname = "mini.bracketed"; - version = "2025-01-16"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.bracketed"; - rev = "0091e11fabe34973fc038a8d0d0485202742e403"; - sha256 = "0yw7lmgwwvraflcwzrl33rwcdb94qsyvdi0rzq9b3ps7bla4dsyb"; + rev = "937573c7e7d9be6cb29ffd0909d9ff83c92afbf0"; + sha256 = "1yxdbsbcq3yd2838qa2bnwbim37d6jbpf13w73z30flj8xq53j28"; }; meta.homepage = "https://github.com/echasnovski/mini.bracketed/"; }; @@ -6989,12 +7001,12 @@ final: prev: mini-clue = buildVimPlugin { pname = "mini.clue"; - version = "2025-01-17"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.clue"; - rev = "63e42dad781b9ed4845d90ef1da8c52dfb6dce3f"; - sha256 = "039fq0svkgr96l3z7h750iyah6fz9n18zy8wm1dfhpp3bxjyjh7z"; + rev = "8e7681e9433766142e8c0977e7f9c31220c78cff"; + sha256 = "1h6d7mvjyfcp93hcn83rx24pafk36i37fd03kjmnhyfmbqpjsdd5"; }; meta.homepage = "https://github.com/echasnovski/mini.clue/"; }; @@ -7049,12 +7061,12 @@ final: prev: mini-deps = buildVimPlugin { pname = "mini.deps"; - version = "2024-10-18"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.deps"; - rev = "bafaa69d9054fc01ef8dbff8e4f0211c285cd840"; - sha256 = "12vahms3vpvinp362x1zi3z9si7r912bps55yp6v9vlvfdjmc9gf"; + rev = "6e6dc2b56de255b82ccd7bc78a97f9be58f95ddc"; + sha256 = "0fbhq49kj6b3x6rb3phdv0dk3jj6kxpmy7dympl6xzlfq21jg1yp"; }; meta.homepage = "https://github.com/echasnovski/mini.deps/"; }; @@ -7085,24 +7097,24 @@ final: prev: mini-extra = buildVimPlugin { pname = "mini.extra"; - version = "2025-01-07"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.extra"; - rev = "477e3dda7b597b49bc1373951ea7da4da834c352"; - sha256 = "02ydzdiiqf0ydrjiz847f6cbaxy3imvggchds9xn40i34nz6nhlm"; + rev = "6927348ae967d229fa01c5d2a0baca9ef7d30de4"; + sha256 = "1sjwnznkpfkj1dh2055zkndagq2zr1v760a22cm6fp3c77w3wlqz"; }; meta.homepage = "https://github.com/echasnovski/mini.extra/"; }; mini-files = buildVimPlugin { pname = "mini.files"; - version = "2025-01-10"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.files"; - rev = "d0f03a5c38836fd2cce3dc80734124959002078c"; - sha256 = "0k5g5l9pb3br4vb5cm1b0hv081fdn967cw00mh687281dvrbnxah"; + rev = "01001e0cfc1e79f581d055ae3f70fbac96a2f378"; + sha256 = "0pkj82qz0mpism0hzv57da78qqw24ijd49gqlbdrwq3h5phwcydh"; }; meta.homepage = "https://github.com/echasnovski/mini.files/"; }; @@ -7253,12 +7265,12 @@ final: prev: mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2025-01-19"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "fcf982a66df4c9e7ebb31a6a01c604caee2cd488"; - sha256 = "1x5a17qwmxm3j58j48yglcy04p878pp9vbfh580bqdykd4pmva0p"; + rev = "1f782e38109e3380fc339b794183019ac957fd21"; + sha256 = "157w935bjcj8mbwghbwg6p9fzc702h5kf4b735a1qzr43nzydhg3"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -7289,12 +7301,12 @@ final: prev: mini-pick = buildVimPlugin { pname = "mini.pick"; - version = "2025-01-19"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.pick"; - rev = "c71983579d1ea86158d3285a36d3a1688c75bae7"; - sha256 = "14g3lgjrj9p3hrmp73lhymbk8dpil9r8mrnh6simfvbmfv2l5g5k"; + rev = "fc0d862a044af97f7850535fc8799ab38a223fe6"; + sha256 = "0b695xsh3m3akxdqk70xj9jpkizzkrjq5v8sn4gdwjjkazwbj281"; }; meta.homepage = "https://github.com/echasnovski/mini.pick/"; }; @@ -7337,12 +7349,12 @@ final: prev: mini-starter = buildVimPlugin { pname = "mini.starter"; - version = "2025-01-14"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.starter"; - rev = "4b257cfc93241e8c8cde3f9302d1616ad4e0d036"; - sha256 = "135l18l6n88v8zrdk95dfvw2ycsgd8m4wp9430g74bry99jj95m4"; + rev = "a816f50ac99a6fa1f21e0f07ee13f975444dd4a1"; + sha256 = "1lajfi0sgy89j2zd3xd0ibbm4bfychwsvamd9ls5m32j1pgn3pqz"; }; meta.homepage = "https://github.com/echasnovski/mini.starter/"; }; @@ -7409,24 +7421,24 @@ final: prev: mini-visits = buildVimPlugin { pname = "mini.visits"; - version = "2025-01-16"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.visits"; - rev = "90f20ba6ab7d3d7cb984fffddd82f5f6c7a6bea7"; - sha256 = "00drzhrxdyrysbdj4fnxk3lzn9alg8xhwfwgrscywvjfks0vbsa3"; + rev = "daf681c297f00d9cc75233a4bd8b93986cb8232b"; + sha256 = "0n52szfan38w7z3r0p8q47pldps120nyiyq2gw4arqn9fd51kz4b"; }; meta.homepage = "https://github.com/echasnovski/mini.visits/"; }; minimap-vim = buildVimPlugin { pname = "minimap.vim"; - version = "2024-03-17"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "395378137e6180762d5b963ca9ad5ac2db5d3283"; - sha256 = "0pfzmlf36in086g83g3sdqdy57jyyh5nbh2lrfmpbr2sg401a7qr"; + rev = "57287e2dd28fa3e63276a32d11c729df14741d54"; + sha256 = "05k4cgcrz0gj92xy685bd4p6nh2jmaywc2f5sw1lap0v685h7n79"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -7841,12 +7853,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2025-01-18"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "1f2753e7ce38e47eef960a8a9f5f8f3215ec2b05"; - sha256 = "1sjkk38l38wrbzds20l3iww06yyyhixr2bjqbmdsmnvsyq7drscc"; + rev = "521bb4253b1adc2a1ff6c584bc839eba9bc99c0b"; + sha256 = "01ws7n9yzlf86706479xyb881x6lnxcigkmx1qz885gjb1v54yjs"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -7865,12 +7877,12 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2025-01-17"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "638216aa8725b06d27c315574de63ad41966a3cd"; - sha256 = "1ag7pxqjxhd9gfkqdp8m8sgq613dswncl41zljm748cqz28c7909"; + rev = "a4d1d337e23a087847f7a1d2bc4420ce7ad355f4"; + sha256 = "00h3a6il90rk96lxjjzw97bgxdjdrd3i4q3hc6dwzydr9xkk6dh7"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -7937,12 +7949,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2025-01-14"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "060a625660b2816649d83dbd6c7ab1b4345ea8bc"; - sha256 = "0vjlszykpy6wfhiy3csf3ljh22wyagvmjb5a2ngsznkxgh29bb5j"; + rev = "63124cf520ff24d09deb3b850e053908ab0fc66a"; + sha256 = "1qmwl9rfkf6aydk0sd9xmmd59f2wyw020j318gm56lhav2yg03cs"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -8167,12 +8179,12 @@ final: prev: neotest-golang = buildVimPlugin { pname = "neotest-golang"; - version = "2025-01-19"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "fredrikaverpil"; repo = "neotest-golang"; - rev = "b1c5aed508d73174d0ed98d58ec4a87a9c3375c1"; - sha256 = "1bzzci1v4wa4k36j0hcnfyfx1sw6l90zljamvbsy5ml2csv3h4yq"; + rev = "059c5754a17629c25dce61eefcea40164ee62975"; + sha256 = "0mkz9pjby8q19ib8y7ps32f0jafwlxadav9j64pjpflr7yp4ivp7"; }; meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/"; }; @@ -8204,24 +8216,24 @@ final: prev: neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2025-01-19"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "44c485e0f891778f93b0f2c7bef0217b91f1f83f"; - sha256 = "1jblvbq2k03aphw5d1ky818kmbzk1jf41s5n1q7mc4vc8r0gsj2y"; + rev = "074a6eb728ef74c35fcec0db84959e1d70471c3f"; + sha256 = "02b0jsbi9xhpaxmarfxdnp6ynsdq3c23nxyffl0xw5nws4b25xrz"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "2024-11-19"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - rev = "43b4cf9ee0d3d05f56a9a43c89c4268157cfbc79"; - sha256 = "0653fx7bcr8mn38dfza4qywia1i862zc42frwf18s51zp5jjrfqy"; + rev = "bbbad04bda7af216a8c24509d47d1f51356b37ce"; + sha256 = "0mw3q19y18nr4kn1zd5qjyk6bbkdrv4ypakxyn2gc3xf6p3zl1id"; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; }; @@ -8552,12 +8564,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2025-01-19"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "4385803056055ebc0b87e34ca334d874787eb125"; - sha256 = "0zxkk4y0ww5dxncvpnnlpxkiw297zijadzk4p7yr779w4r7sl85b"; + rev = "1105d1b755ba59df2dc663f68e0c8228ded2afe9"; + sha256 = "02fyg3hailkb4r7dazgy8fywssg6sv4zf21f2q7nlalpchppdkp1"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -8612,12 +8624,12 @@ final: prev: nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2025-01-15"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "25c2ea8f0a97bbd20318ecb912c890ee3cacc863"; - sha256 = "0gh41nrqhb0iqnvhzmynci41z7pd8arkh52scivzqx6vxbjch1fj"; + rev = "3f0f0baddb46276c71be2c6c0ea31a50f70669ed"; + sha256 = "07sld8dxvm74dv2q8r1sha4cfycc23mvgqya9cglqdqhcdsz9wpk"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -8636,24 +8648,24 @@ final: prev: no-clown-fiesta-nvim = buildVimPlugin { pname = "no-clown-fiesta.nvim"; - version = "2024-12-26"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "aktersnurra"; repo = "no-clown-fiesta.nvim"; - rev = "6453c0ca2f31607829457694b4208c1f612fdd61"; - sha256 = "1hvps3xrgws4mvkkbjkap75wf9knq12p7nic0zba3pkfgr3klwg7"; + rev = "2f57d1115e246b62a1a81bba806fe79aaa53b610"; + sha256 = "0a73zd73y0s08ilid0631mbm78q34d3qfb2rky03qqwvqz3zp7sc"; }; meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/"; }; no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2025-01-17"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "6aaa6e3c2d3d52a38ec095176a3d845cf9fd1e6e"; - sha256 = "02v52lnxc2a6a93rcvagypr0gl4n184dnkr0fvi7bxdrzh0ds2df"; + rev = "860462dd8b3d36861a81724a7b473db279f673f2"; + sha256 = "1nv0dii8a3n7rip5j729mj03zklga7v57l673gm6pvjx05v6qnlz"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; @@ -8684,12 +8696,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2025-01-17"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "af318216b744f2fe2d5afa6febb01f455ae61d6c"; - sha256 = "1s2jb7labf5h88pvl33882b0j8pij1qaba4wa3qi4qay3rgachlp"; + rev = "ed8f80849ef1ad31c2f74679fafdef7801091247"; + sha256 = "155c6kadvw6381rgyq3n5f44np8c4bj9z3nwcjzky4shxgi8qkq0"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -8804,12 +8816,12 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2025-01-19"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "715cc06f0d3abfc68326808cdc484348829843f6"; - sha256 = "1bnwfkfhjrq5zvlg7ihrimnj065f8dd66awjahzxrvnq4v0jszhi"; + rev = "23cc288deaeafe6641f0092252dee25136616a47"; + sha256 = "0knjzigb7x0nh8p3avlk5615pyqi3m0xnzvznyy0psgblm19s9d2"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; @@ -8864,12 +8876,12 @@ final: prev: nvim-bacon = buildVimPlugin { pname = "nvim-bacon"; - version = "2024-11-26"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "Canop"; repo = "nvim-bacon"; - rev = "25eaf9daa29ef7c335578bd9600e2c6349f16ed1"; - sha256 = "0b8hqbzamw7bsgag9wriayz08fyidis6h4c7gldavnam00p8hjcr"; + rev = "c9cef8ac576800b6b813ad16be692d141262a4c3"; + sha256 = "10x0rphxnhwlwmzb0bzrp03r6l25f4lmxcjlf8h1cprgl56h71ky"; }; meta.homepage = "https://github.com/Canop/nvim-bacon/"; }; @@ -8924,12 +8936,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2025-01-06"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "8c82d0bd31299dbff7f8e780f5e06d2283de9678"; - sha256 = "0yjll1qz4qbdg28c43lgx307qpfmc0va4pp9wgkp2n8g14rfjraf"; + rev = "12509903a5723a876abd65953109f926f4634c30"; + sha256 = "0a592vvfbyv1y1j9bbiq7wxy0vp63bwngjav0qkm0czdf8y4b3kb"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -8948,24 +8960,24 @@ final: prev: nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2024-07-12"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "adfd1eb87e0804b6b86126e03611db6f62bb2909"; - sha256 = "19acpgh3n0ma8idl2wbgf9mb2dw9j6xv5gzdb4ya3lmkq8k8ivsz"; + rev = "9fbed130683b7b6f73198c09e35ba4b33f547c08"; + sha256 = "07prjb4z98h460wdfyvmi4fsl26xg0j3hhfirpw8hdgjb01aqj9v"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; - version = "2025-01-14"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "catgoose"; repo = "nvim-colorizer.lua"; - rev = "86c9a6a309b4812abf726c11ab3d9779415ce90b"; - sha256 = "0x20jwp32yy66xaiws46i5jlsb8v6f37j02lykr2d6ladlf8vns0"; + rev = "39142aa1390d6ccdca57cb6dc5b2c7bfed460ffe"; + sha256 = "16sjfq765hab8ns4kgr39hyj0gd5yizh2vk8sk177gvajhjr7pxs"; }; meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/"; }; @@ -8996,12 +9008,12 @@ final: prev: nvim-config-local = buildVimPlugin { pname = "nvim-config-local"; - version = "2023-06-15"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "klen"; repo = "nvim-config-local"; - rev = "83bb6d9881653a5cf8b489ba8a6fe5a06049a10a"; - sha256 = "0gx1dd5i20z9kh6g70jdhwilg81vjm3cjwdg6gq0xsczzichzf66"; + rev = "990f3e35e0fba8fb83012d7e85f9a6a77de7f87f"; + sha256 = "0a7c22fcwl7gczip7bl9lcm2na0dz698bc6xgkryrg0y6fmzbc6k"; }; meta.homepage = "https://github.com/klen/nvim-config-local/"; }; @@ -9032,12 +9044,12 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2025-01-08"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "99807078c5089ed30e0547aa4b52c5867933f426"; - sha256 = "19v3q4rps66rwli4w7fz8s44np7q0ibcc8xrszg7ml474w1i8l82"; + rev = "1fdfe74661170ce58d37dc46259448987ffe706c"; + sha256 = "0f5pdwcjhzrhgz3iz4bsq452prdq4lq6z9yjwzx3m2xgzp7kmcz1"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -9104,12 +9116,12 @@ final: prev: nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2025-01-09"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "727c032a8f63899baccb42a1c26f27687e62fc5e"; - sha256 = "08543qwfgb693isakpfrccfh16cwfcfvs2i7mvb276irn2yls6ja"; + rev = "bc81f8d3440aede116f821114547a476b082b319"; + sha256 = "0hk34mfjxqiq82faf3q75ixpxd822vh8zbl1i5pvx6akn4v3mxk7"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -9188,24 +9200,24 @@ final: prev: nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "2024-10-29"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "a8a5289c4424360dc89225e15356104495736446"; - sha256 = "0l9d8bn70lingbmdlqkj1qqs06acf005c06wkswgfi4ic4h6935h"; + rev = "cf00140361cabcd4e55a987fd9770a92ee682301"; + sha256 = "1y4m3m27bkzyjx8g2zd1ampgm84c2f10a7sd4v5qpirf9xiqhhqb"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "2024-12-30"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "ac6fccc67a3a95ca76b5d3fd4c2fa547bff704d0"; - sha256 = "11xss95qzr7hyqr93dgihgwdpq06nnqr74n681p1rrgjkwg4l23s"; + rev = "99ca8b9e6e6bae0899cc2902f4103204572ac8ee"; + sha256 = "0f9w2510y26k2mihhmx6rsmijszsl2haj5848faqqw3nfhsph890"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; }; @@ -9296,24 +9308,24 @@ final: prev: nvim-java = buildVimPlugin { pname = "nvim-java"; - version = "2025-01-10"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "nvim-java"; repo = "nvim-java"; - rev = "4d810a546c262ca8f60228dc98ba51f81f5649c6"; - sha256 = "17d846c682s2kn6f4p5gxcawrdw4vrqsajhqc1z2ky18pgy4s49l"; + rev = "04e3a41afce7357ad7c8d9c6676f0f3b5f5634e6"; + sha256 = "07nr0ym37xr19a9wbca11yr3fa8crplki913725yixm4njfnavma"; }; meta.homepage = "https://github.com/nvim-java/nvim-java/"; }; nvim-java-core = buildVimPlugin { pname = "nvim-java-core"; - version = "2024-12-25"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "nvim-java"; repo = "nvim-java-core"; - rev = "22eca6b90b7e209299d99cbf60421f0ffdae5629"; - sha256 = "1m9p3m97nmkvs4v34lv7sly9896l47ff73aa40r2x60y6z2b98pq"; + rev = "401bf7683012a25929a359deec418f36beb876e2"; + sha256 = "0s6wqz9z8r0hvvgf5dnl8drgzb49vrk798rc7gk2cbm85blzk7p8"; }; meta.homepage = "https://github.com/nvim-java/nvim-java-core/"; }; @@ -9356,12 +9368,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2025-01-17"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "5b079475890a2a9ff45c850b428357cc89c95278"; - sha256 = "1nf4mf9fjlq834kq4sy7m7yc80xk6yjmvz2skxrkz3rms32hrxkq"; + rev = "3efcd0700a293efea9dada58f79c32a64850eb24"; + sha256 = "1131svlirdbz31rqi39m6pmnnnkg3g1z5lab8xxhxx3c5dgn16aq"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -9439,12 +9451,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2025-01-19"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "ec9fda13a5254783a80b37563ed5eb97b75c28b7"; - sha256 = "1y2ll268z602llnmhwz8qhbg13g3mnn7m9jxzapj2pbnx4gkwhqk"; + rev = "789b7ada1b4f00e08d026dffde410dcfa6a0ba87"; + sha256 = "1npjlv0gml66mw9v8d95p3c5zzijpc362bkji6zvc5n152yy59qc"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -9487,12 +9499,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2025-01-18"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "14b5a806c928390fac9ff4a5630d20eb902afad8"; - sha256 = "0azb8qc6pg8j59jrh1ywplii11y0qlbls4x16zmawx2ngqipr7vg"; + rev = "637293ce23c6a965d2f11dfbf92f604bb1978052"; + sha256 = "1z395i57bhhxc87673fbp84m2k9sn923ib9qsmmrry7414lp99zm"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -9595,24 +9607,24 @@ final: prev: nvim-neoclip-lua = buildVimPlugin { pname = "nvim-neoclip.lua"; - version = "2025-01-11"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "c4ce7f6c402872469795f8a47ffabe87e142f0fb"; - sha256 = "0qm1m6464lyqrar7dc4ddv9jrj6m69913frjmz788gcj459kbzkv"; + rev = "90e4dd66bb6b1cc0c03f01aaf8b005f69f565421"; + sha256 = "0mp15k7db5vnl19mc9p40fb7q0ycdjd97px24gbq7ajrzys13lbp"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; nvim-nio = buildNeovimPlugin { pname = "nvim-nio"; - version = "2024-07-11"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "nvim-nio"; - rev = "a428f309119086dc78dd4b19306d2d67be884eee"; - sha256 = "0n40q6znpy1xzywd1hwyivx7y1n0i0fcp3m7jp0vgipm6qssda4b"; + rev = "21f5324bfac14e22ba26553caf69ec76ae8a7662"; + sha256 = "1bz5msxwk232zkkhfxcmr7a665la8pgkdx70q99ihl4x04jg6dkq"; }; meta.homepage = "https://github.com/nvim-neotest/nvim-nio/"; }; @@ -9631,12 +9643,12 @@ final: prev: nvim-notify = buildVimPlugin { pname = "nvim-notify"; - version = "2025-01-09"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17"; - sha256 = "0841kdr25cmi3n0binxpgsa9z1spknn2diijl0b3qv4q4h8y7q8b"; + rev = "22f29093eae7785773ee9d543f8750348b1a195c"; + sha256 = "0nnxmi65ppmn8dzwh38vx2w7w6piq0i28mw0s32wa31xn5rmzwza"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -9787,12 +9799,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2025-01-14"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "9cb1ab7f6cb821612e9a7f41652c200be0e75123"; - sha256 = "0fi31apr3ckkn63qhbr5flqsr54vbmhvrbx6f1q7qd6y3r5cnl8a"; + rev = "e8ad0e0f9c38c1bf3b03e3266cb6ecf3967d6e47"; + sha256 = "0yx7n27fbmdrz7s5ka598kfy1k1qgqfy2vv7xiqcr0vdcwgjrwwc"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -9919,24 +9931,24 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2025-01-17"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "fca0b67c0b5a31727fb33addc4d9c100736a2894"; - sha256 = "0sjj89a7hnpn0xqavi5b59y971i8igl4nfw6rf5dcbqchqw0xikg"; + rev = "d05881f65f0a653db8d830ccc4d2e07d6a720628"; + sha256 = "1kpl7cjsl31mma8q3h27482lb8ivc04pb7fc1n1hzfr3lcv88n62"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2025-01-19"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "4423f3053964461656c7432fd33f205ef88a6168"; - sha256 = "0n349l4k3bivcnaq60clzsyhiy19j1bqn1f22jkcdyd4h6abjs2l"; + rev = "61a385d74f822dcd1d223f42f1267d1317aaa2d0"; + sha256 = "0vlrqa97wrr33ihnkriilvvg2qdjxkf2kyhf8mqacqqsgpsqxmh7"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -10075,12 +10087,12 @@ final: prev: nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-12-25"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "32cb247b893a384f1888b9cd737264159ecf183c"; - sha256 = "0p2f5p1nky56m666lbl8g111pf6h4piv8a29z86kdhm9hadrzp3s"; + rev = "6e810dff2e590ed32dd697f90d5910443c78b8e1"; + sha256 = "19axwbplv6d3xmprgggasyy8192k7vfrhpal7x0h4cnw7j5yb21f"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; @@ -10099,24 +10111,24 @@ final: prev: nvim-various-textobjs = buildVimPlugin { pname = "nvim-various-textobjs"; - version = "2024-12-30"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-various-textobjs"; - rev = "b43a13448c3c3a4fca027595f7b6fc3522758e00"; - sha256 = "1lb4m9vg4m0zyqhqvyzpfzlrvkzmicxa1qb9pz76rgizzwpv7hrz"; + rev = "18a2092173a6773f32adea42d4095d41d5eca09d"; + sha256 = "07x3qvxy3n51p33ixbp9hd6rg8bd1y94vskznzmbrds9inh81b6v"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; }; nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2025-01-10"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "aafa5c187a15701a7299a392b907ec15d9a7075f"; - sha256 = "08my2gdhqpc1rzps9wic37v3a5x84jf9dj0m7y1chpyp9ia48jcm"; + rev = "1c9136332840edee0c593f2f4f89598c8ed97f5f"; + sha256 = "10liz7hpdb5vavn45hpqn0c39s0cqdns8dygr1472b5fyxh5ld29"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -10135,12 +10147,12 @@ final: prev: nvim-window-picker = buildVimPlugin { pname = "nvim-window-picker"; - version = "2025-01-14"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "s1n7ax"; repo = "nvim-window-picker"; - rev = "276879db5234185f22cd19ed8366bf62437667af"; - sha256 = "0s9svcw8l45va4fz4l9449ljzxc76ich3i14j5ia625ivic2zwkn"; + rev = "0dfef64eaf063e1cd27983ab11a30e7bc5b74fac"; + sha256 = "1cxir4yd913f6rxvan535badqfp43m7djadac95rdcbvypdg0iqj"; }; meta.homepage = "https://github.com/s1n7ax/nvim-window-picker/"; }; @@ -10219,24 +10231,24 @@ final: prev: nvzone-typr = buildVimPlugin { pname = "nvzone-typr"; - version = "2025-01-15"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "nvzone"; repo = "typr"; - rev = "a60c7f237be94d4b39228a3bd2ced80fe9fe2781"; - sha256 = "0hbd85s2d28832qqy0lnm7f2iqa5n5s16h7n10hsm9iawi0z2ll9"; + rev = "249fd11305e9adf92762474691e00f5a32b12f6e"; + sha256 = "1pg0w2p4a3ppdxz8c4s8aw80zjfagq5fds3cdcaf5p417krg3s10"; }; meta.homepage = "https://github.com/nvzone/typr/"; }; nvzone-volt = buildVimPlugin { pname = "nvzone-volt"; - version = "2025-01-19"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "nvzone"; repo = "volt"; - rev = "91fe3e82842a709443cdd61fc1a1315a5eb57a8d"; - sha256 = "1rx5yhgk69nz4rvywsr2x23hnrbhgkkwlxcdnb4m6n2y9dpxa81w"; + rev = "1a7d6b1dfb2f176715ccc9e838be32d044f8a734"; + sha256 = "1kax2kx7gn6jswjcrlxmkh71x5xjfkj5bgh2ybyyamqsaya4d8g0"; }; meta.homepage = "https://github.com/nvzone/volt/"; }; @@ -10279,24 +10291,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2025-01-17"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "b4f00b00dec14fd396be979b04453336d6e83182"; - sha256 = "1r0il8rr5lgh8i6jkb860q34cf2ip1jx1xibr8sb8x2vrgiffwjq"; + rev = "75d1f6a09536e3bffa86a781cdb0bd72da57acc3"; + sha256 = "1gmfnz8hspwnc8ay699msxfgmnq5v4krp9ijszksc1pl8ch3xlnr"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2025-01-13"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "09fa1d22f5edf0730824d2b222d726c8c81bbdc9"; - sha256 = "0r12sj6chi4l2rx3dp9adhb7zjcanxk2fkpxvcb6acbflr6gkh57"; + rev = "add50252b5e9147c0a09d36480d418c7e2737472"; + sha256 = "0752q6syb686d2k31ynpsk2l4apd7nsbn00q71qifi09h1y43fxa"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -10400,12 +10412,12 @@ final: prev: onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2025-01-11"; + version = "2025-01-19"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "0feb5f55dd777352f2dddd7478dd13d050864ee3"; - sha256 = "1s5f73vyqlh8mpm2qpriyf0iim33xbh6wl9hgsxn3h9x9zyvfsw4"; + rev = "44775f8206ee43b692e7f3dc894ddc47996ee523"; + sha256 = "1qgvw08v08c9vi7vlzm96qard6xrdyghi7sra83i3imfh5xnkh8b"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -10484,12 +10496,12 @@ final: prev: orgmode = buildNeovimPlugin { pname = "orgmode"; - version = "2025-01-19"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "3ba6db78601a82732c71e02e6e96e34da5d3827e"; - sha256 = "0irglq82p6n4fbrpmvhs88nlmclrmhm1lq7jw04akli15v0xmfbd"; + rev = "98bf44d0adfaa04bd02c0ae630b182fba892cbbd"; + sha256 = "08rryqbqynaw0c8rqy7j22adyplm091x2qhxbfzq39qi15h4b2dp"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -10520,24 +10532,24 @@ final: prev: outline-nvim = buildVimPlugin { pname = "outline.nvim"; - version = "2025-01-07"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "hedyhli"; repo = "outline.nvim"; - rev = "454aedc7cc6d5abd1e6776e87ccf8a3df119c207"; - sha256 = "11q137zjpwl5nqykij35ail0749mv1bkjcdd4k792dlyi9wnwrqr"; + rev = "d5c29ee3ff3b7d1bdd454b37698316e67808c36e"; + sha256 = "1ilikhfpsjqwn3bdmgy5dcnxfrir2wvsrn2bkpvw18y69990fqxr"; }; meta.homepage = "https://github.com/hedyhli/outline.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2025-01-16"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "35b729b746a4d65c83efee5b5643f07c2c1105d2"; - sha256 = "06168r8iq0qpgvawp6595h02wc6bqkiy2f4dcrh35r8kvrf5cdlm"; + rev = "390332d4687e3d07495a545ba11e62fcf30339f1"; + sha256 = "0asjnnn63h7kq1asglpqnxwhpff8r2lh30nhj9ij6ygg3slvmxj9"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -10629,12 +10641,12 @@ final: prev: papis-nvim = buildNeovimPlugin { pname = "papis.nvim"; - version = "2025-01-19"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "jghauser"; repo = "papis.nvim"; - rev = "0b9e8ef6ddbac0a2208b44ae660732b049a6d7a8"; - sha256 = "0dzzv949iy3yi9lk0h6nybg39cbzfrn1jvz3r3ffa9vinknmi8wl"; + rev = "77e4e489ce1adfbc27b41f57a444ca2828f367c5"; + sha256 = "1qwihqd0lkj22k0vvwxi6g7shiys86y7wb85f1771b8hvals2qwx"; }; meta.homepage = "https://github.com/jghauser/papis.nvim/"; }; @@ -11087,12 +11099,12 @@ final: prev: quicker-nvim = buildVimPlugin { pname = "quicker.nvim"; - version = "2025-01-16"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "quicker.nvim"; - rev = "049def718213d3cdf49fdf29835aded09b3e54a3"; - sha256 = "03mzq5cikg73nsq6lrcvz7jz3aq86ni88zgccqv49ss91gf66k28"; + rev = "92e0f61a5d6422424cf7728ad323d2a06e3ab2d5"; + sha256 = "09ahfy88hb5cp152y0alda7i9515xgmb5z43ax69y5apjdnv9z39"; }; meta.homepage = "https://github.com/stevearc/quicker.nvim/"; }; @@ -11324,14 +11336,26 @@ final: prev: meta.homepage = "https://github.com/gabrielpoca/replacer.nvim/"; }; + repolink-nvim = buildVimPlugin { + pname = "repolink.nvim"; + version = "2023-12-08"; + src = fetchFromGitHub { + owner = "9seconds"; + repo = "repolink.nvim"; + rev = "55edfedbaef3e894d2ab5107ea7fadc64cb8258d"; + sha256 = "1pa75cmb1fyxz4b9lam4vbgkcy2g3lfj0f31s17cppzapk0aqh6a"; + }; + meta.homepage = "https://github.com/9seconds/repolink.nvim/"; + }; + resession-nvim = buildVimPlugin { pname = "resession.nvim"; - version = "2024-12-24"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "resession.nvim"; - rev = "271a6fd7afa90142be59fca3a5c3b9865e40e6b9"; - sha256 = "0l2zbfpsb62f4q3k8sxwiyj6sqwglpafjx3mzb48ncc0xbx0lhhg"; + rev = "c5274f625ba9dcec408ab4efbbb4b92df63e2a96"; + sha256 = "0n17qp1alazn3gf9x0yln8dmmbzs0kx93n0nlhwyack96yrgfxms"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/resession.nvim/"; @@ -11424,12 +11448,12 @@ final: prev: roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "2024-12-30"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "seblj"; repo = "roslyn.nvim"; - rev = "85aca5d48ddf8ada4e010ee9fa4d43c77ebf68c9"; - sha256 = "1053bm1dvyiqh5axapqbc5p730da1qb51jnccb434njdcdc24vai"; + rev = "490fd2d0f76249032ef6ce503e43ccdaeed9616e"; + sha256 = "15jqg907fnnxh3415yls90cwly75im1awi4bqs2jf94ssirnn4fc"; }; meta.homepage = "https://github.com/seblj/roslyn.nvim/"; }; @@ -11544,12 +11568,12 @@ final: prev: scnvim = buildVimPlugin { pname = "scnvim"; - version = "2024-09-16"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "cb6a968b3de9b9a176f4012dd18efcb8d9d34f71"; - sha256 = "1z1jg201q0k6lkywkgl5phxkndklz3yw4cw4h0hp8v7whjh5yn9p"; + rev = "2bd34cb3feed697bd81b399857139c08fc6856f1"; + sha256 = "1xr5lrhgs952bilvfdqxj9ss3krg3i9y5fms7icssmvm41gzvvcg"; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; @@ -11580,12 +11604,12 @@ final: prev: scrollbar-nvim = buildVimPlugin { pname = "scrollbar.nvim"; - version = "2024-11-28"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "scrollbar.nvim"; - rev = "a399fc9048293f635992b1c6755d7eba7ce2b341"; - sha256 = "1ifg1bb8fwi2k3n11aark9gvpcwpbdl2kdh276pjiys6rycadq32"; + rev = "3f0d4170db4c4e148c2796f9cdd211970432fec4"; + sha256 = "08l5b5hb80rr5agjzzh3x0z5i59c0xqnjxgk87sjsary18dbgzn2"; }; meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; }; @@ -11688,12 +11712,12 @@ final: prev: sideways-vim = buildVimPlugin { pname = "sideways.vim"; - version = "2024-11-15"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "3cfe62d57e59e4c86812e2559fb56796655fd4da"; - sha256 = "0bikch34j5520l31xy7p093h6ar4i8fxc63m5g93h47yvlkndyfn"; + rev = "23d493820643d029ea369c5d1368993d5bbd97b1"; + sha256 = "0lr75apdf5v0s2lnfvkd0m70xihc0a304cjska815vrxvifzyx58"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -11749,12 +11773,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2025-01-10"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "7266722346df921535ca3f317164a62069436b7c"; - sha256 = "043j5ypqjplycxnkycga5c6w8ad25mjzx4lb0572vyyzczpkhav0"; + rev = "bfb5e63bd4639439b48815f46636dbd52b19b1bd"; + sha256 = "0k1510hqyzg7lgqfqfhd85bac45k98xgsfx0g0zhwi3mjkg5kvr1"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -11797,24 +11821,24 @@ final: prev: smear-cursor-nvim = buildVimPlugin { pname = "smear-cursor.nvim"; - version = "2025-01-17"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "sphamba"; repo = "smear-cursor.nvim"; - rev = "d758c6ae26d8ee68679513b4a6853b212e533bfd"; - sha256 = "01s4xkpp4kg3lga2x2jwxs96vwcf0mix746aqwmfp79fanxwi7sm"; + rev = "58c25d6a3e1857e37bd18384972dc7e2b67de25a"; + sha256 = "1sfrpk8yjmxnddgfwxps0afbzbq2dihy2m4jr3byhds17sqg15mi"; }; meta.homepage = "https://github.com/sphamba/smear-cursor.nvim/"; }; snacks-nvim = buildVimPlugin { pname = "snacks.nvim"; - version = "2025-01-19"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "folke"; repo = "snacks.nvim"; - rev = "d6284d51ff748f43c5431c35ffed7f7c02e51069"; - sha256 = "0z6a3idlmalbiwlz5c6n0ycc5dn4439ffm52ml1r04jajqn8rx56"; + rev = "b96bd540f785c725289f9f15f0147b1b2dac5a35"; + sha256 = "16y78k5y1lci5y8laj35bx15b191sqh2igibxwp1dl90cp2c89f1"; }; meta.homepage = "https://github.com/folke/snacks.nvim/"; }; @@ -11869,12 +11893,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2025-01-16"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "622aa3cfeacaa3b51565a089404df3afa0187ed7"; - sha256 = "10y7qk70qdm38cr6xjwkrabz730amps8y239mdqgh7z9fx0cizzb"; + rev = "e1c1491ec3714ec9ae3d49db3c126afbd4c49970"; + sha256 = "0zhfrlwy2gy25mvf2pn80wd1jlmglicvzfmk6rv00958bi1h8557"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -12460,12 +12484,12 @@ final: prev: tailwind-tools-nvim = buildVimPlugin { pname = "tailwind-tools.nvim"; - version = "2024-11-16"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "luckasRanarison"; repo = "tailwind-tools.nvim"; - rev = "3703e162d819a04b128902c508276553dae0dfb8"; - sha256 = "1ia8mxb60gkhr984q9jcvn9hm3bmqxd19fpkbh41cxqr2z4pxnhb"; + rev = "0862805c3c0d8a8d61ec1baffc79b9fbf5578d82"; + sha256 = "0vybmjxlxb43vxwbg2xzfnih1rgr51cachb6rx6g76p2xbz6d8gf"; }; meta.homepage = "https://github.com/luckasRanarison/tailwind-tools.nvim/"; }; @@ -12593,12 +12617,12 @@ final: prev: telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2025-01-11"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "6e581bb7bea187fc03a4be3b252a8adecabc398a"; - sha256 = "1dxnlq50l1a7lh9lgx0rc9s1nf030fwrgxpgki6xcz0yhxx2s7j5"; + rev = "1ba7caa48f9ecf585cadce96078c353e031250e7"; + sha256 = "0zff8ar8g2n5l2ldvn90jg3lcias725x9lb1yphya8afjn4sbaqq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -12690,12 +12714,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2025-01-19"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "7fc130e920c702f0ff54ab25f45da821a3976a33"; - sha256 = "0204lvca077fvw4p0facmic2j5n4h1k88z7azglppx64z5cl40bk"; + rev = "fce4719aecfefdc7ddd15b1b82136d75f7994a4c"; + sha256 = "1v5a60smjyrfsmwmjnpbapzskzf705lknn3ii7lw90xav82dj9sp"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -13063,12 +13087,12 @@ final: prev: tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "2025-01-15"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "aaa6f0dd097f8ca2478cad259e61b7cb26ec0eb8"; - sha256 = "0fy6xyi1ybgrrvys2qb7g2sl7pknnzmlrpzb8ml2wwr1igkrjpyp"; + rev = "e6445d7b57da19238c9490b79d9758fc5220a79e"; + sha256 = "1k4b3ss4x9xhj6g4mnkmn4abswlvfjg9f5bk6nz68ksdaw302g07"; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; }; @@ -13184,12 +13208,12 @@ final: prev: traces-vim = buildVimPlugin { pname = "traces.vim"; - version = "2022-04-11"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "9663fcf84de5776bee71b6c816c25ccb6ea11d1a"; - sha256 = "0gwn1kclcqp1yvaja6wqf27ng8d4wrd2j7795syxdk3d8vmpn55d"; + rev = "261602a6ee8d40d13522242ec5671456a230c17e"; + sha256 = "118zicpmw7gca1fvzfm3sb101kzksgwf06hdk4790ry7xsrmnank"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -13220,12 +13244,12 @@ final: prev: treesj = buildVimPlugin { pname = "treesj"; - version = "2025-01-06"; + version = "2025-01-21"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "ec234a9a13d61a7b95900abdb02fabaea1afd9f3"; - sha256 = "129wkjzsyl73fdxklpzq8hs6in01zl9b58kwhlscvhskb9pb8gdy"; + rev = "48c1a7539f376fd40ceb9cf12d697040fcf90649"; + sha256 = "0yha205ajwqz4y1a5l5qh35mivaz2ql1vqfky2cxy90zndq8g08r"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -13497,24 +13521,24 @@ final: prev: unimpaired-nvim = buildVimPlugin { pname = "unimpaired.nvim"; - version = "2024-04-09"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "tummetott"; repo = "unimpaired.nvim"; - rev = "8e504ba95dd10a687f4e4dacd5e19db221b88534"; - sha256 = "sha256-CNU4cigMjbvOdUzUXze9ZDmTZRuYtj4dCuuLVZkMTQg="; + rev = "a282ab8ce0d0d4b5b1200ea484993aecf65dd94c"; + sha256 = "08nbc8svk83c5mjgj6ljsa7dm91i0q3anrfgjjx6x6s7khvxzccd"; }; meta.homepage = "https://github.com/tummetott/unimpaired.nvim/"; }; unison = buildVimPlugin { pname = "unison"; - version = "2025-01-17"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "14c73f1cf87f7e5155301b26dc648099e55aa0b7"; - sha256 = "1rz2kb41mdmimdwgb0p9nd8g3aq0xmzwhnbxwbxsylkfxzkbgfid"; + rev = "f605ceca04028bc0b020b25af82a40e233d2d9d4"; + sha256 = "1bmmngjalnaiwnyl58kawkn2cx2r28ac8kd4iyc22c21pimngp1b"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -14697,11 +14721,11 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2024-12-12"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "f740950d0703099e0f172016f10e0e39f50fd0ba"; + rev = "9f0ca8bcef704659820a95c3bbd2c262583a66a1"; sha256 = "13kwx67r5xl22znrd3i48qvr5dl5ny7qkpwkp455grkdx9y4q2gg"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; @@ -15009,12 +15033,12 @@ final: prev: vim-endwise = buildVimPlugin { pname = "vim-endwise"; - version = "2024-12-12"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "5ec72eef1a07fb32af9be5402144678f68cb1a7a"; - sha256 = "09wbf132vd7jsyv6i59nlq99dk2723mqkisfgvfv1m0xr14rr8gw"; + rev = "f6a32fbe4d4e511d446ac189e926f8e24f69cc1e"; + sha256 = "1yysr1l197p8mkcg739688gi718886spbmmf232r824jw9cladq3"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -15129,12 +15153,12 @@ final: prev: vim-fern = buildVimPlugin { pname = "vim-fern"; - version = "2025-01-07"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-fern"; - rev = "0912da576f4beae177cda58b4cd5984e40548b84"; - sha256 = "12n5xnimxfk1862p98dk0jzq6in4jwcg8mf346mrmdsha76277m2"; + rev = "cb5be74e4a343c8187be91b6be4475b2d73755a2"; + sha256 = "176xb6zydgckvr7ahmxjqmds7wz3ndjb712brqyh0d3qw4ll9glp"; }; meta.homepage = "https://github.com/lambdalisue/vim-fern/"; }; @@ -15285,12 +15309,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-12-29"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "174230d6a7f2df94705a7ffd8d5413e27ec10a80"; - sha256 = "0bs5l8f1qrg9fr97nb029yf7bs813fg0pk5f0cjqfnmglslfr773"; + rev = "d74a7cff4cfcf84f83cc7eccfa365488f3bbabc2"; + sha256 = "1pzsz49915rixx8wm0rf580sg23pfi7dvwxmpqw0xxb87r9jxhkn"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -16091,12 +16115,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-12-16"; + version = "2025-01-27"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "ed67f198e981f555c0f9e9ed5b69b4b06543a9e1"; - sha256 = "03zbh0my0l966y46l21612m5gr8c57jhhnhxxyzlrpy2wh59xjmk"; + rev = "0f7d26de0c48e2620b733e51f4159aae13dc3bee"; + sha256 = "0hhghy5r7sdvbb92yg418bbvmaknab3pg8ilxfc5jli33k4xd3sc"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -16559,12 +16583,12 @@ final: prev: vim-monokai = buildVimPlugin { pname = "vim-monokai"; - version = "2024-12-10"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "54a2a6c2f4c0d20401af98952945945f6b94101f"; - sha256 = "1fx0548mdq0rqmw71bpsvd6bs7gn18zhn1yv5kbh3h8h93a8sl8y"; + rev = "ccaaf4bf983e828e46d47288d0278316486d718b"; + sha256 = "195sq9gcjsyr0crwqawhjm1r044fpwkba383ia8jg7m2rhm4g71w"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -18094,12 +18118,12 @@ final: prev: vim-terraform = buildVimPlugin { pname = "vim-terraform"; - version = "2025-01-08"; + version = "2025-01-20"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "174789e2f0a1c8348ae129223581760807162e82"; - sha256 = "16pafwdlcbjbnli3afwcyi07ai53jqpxk7ci8z02s457r2s31z0n"; + rev = "8912ca1be3025a1c9fab193618f3b99517e01973"; + sha256 = "1n853x6z5cza54vw447k0sprsqf658fdyj5fp3cls14k9pngfqi3"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -18119,12 +18143,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2025-01-17"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "844b51ee092ee4bd5f9b140874c1568751b6f37c"; - sha256 = "07nvv0d8ypy0n4x44gl4a5x8jkps7h0wmmsr0zvg56zwl00iikaw"; + rev = "d317336c4022c272e74cfe11e277483183dd0b5f"; + sha256 = "1f124zfgrzbmlzv68wlzjp0k91prnjv2h63lj84s5mn599rahpb2"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -18539,12 +18563,12 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-11-15"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "cf51327a9e08935569614d1cb24e779ee9f45519"; - sha256 = "10d59w48h1n744l9w406msghncdl7i2nxg98dsd8siy6mycb5d2b"; + rev = "e46d7c4f98ee0f40782008dd60cb2a79c377fb1d"; + sha256 = "1sr1gva01vw7adgpyhbaxsl5vl1nbdn04722m8mx18fsfa7jca7x"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -18755,12 +18779,12 @@ final: prev: vimade = buildVimPlugin { pname = "vimade"; - version = "2025-01-19"; + version = "2025-01-25"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "9fb08c8c24c06781c99808adead0b07de228240d"; - sha256 = "1pkafigvbcwfr5jjgc6mxml3srf01m3n6v2wpc77mdwgzkj9ijq2"; + rev = "b750dca2828de47a7a596792108b6160263da4c2"; + sha256 = "1n3ns004rzvl90z9wwj0mbzv2z1sspygvxxnnckl7h28aj7kv2gc"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -18876,12 +18900,12 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2025-01-18"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "814eaae6dbfe5a293b211ebb9c57de5183d6dfc2"; - sha256 = "1443dyld31bzksqy1hgrc5ir7r0kb27kkwagls50ilwy6kz3kblj"; + rev = "83e331dcad5ce28012e656eea3906b5b897db2ba"; + sha256 = "1y4l90xfsaax8nmz71jv0c1ym8xv4yhr0v8vc2gmcnm1a1li18d3"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -19032,12 +19056,12 @@ final: prev: which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; - version = "2025-01-05"; + version = "2025-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "1f8d414f61e0b05958c342df9b6a4c89ce268766"; - sha256 = "02nndwqr49461260shhqy3gm3y69lqqczscpqcssh2jx9mbzhppm"; + rev = "6cebd86917df559a88de0f806b2989799c6e6423"; + sha256 = "1w13ajdd18gqikyj04bgxjsxanfjyvvaxvsqxsyq2gchc4fjmsqq"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -19261,12 +19285,12 @@ final: prev: yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "2025-01-18"; + version = "2025-01-26"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - rev = "34847a489ed9a9980cb4daf6dfac9024403caa9f"; - sha256 = "0kcmr74s9rwvd7dd8db7qpi5gi0kysv7zgfk77q9wsk3q7k09j9j"; + rev = "9a39d68534cb5ae7250aa50fcc233335843dd786"; + sha256 = "134czard0y7ynq2gz6r968vhyg01p2akwfrsmwaaq8sff2jpc1p1"; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; }; @@ -19321,12 +19345,12 @@ final: prev: zellij-nav-nvim = buildVimPlugin { pname = "zellij-nav.nvim"; - version = "2024-12-24"; + version = "2025-01-22"; src = fetchFromGitHub { owner = "swaits"; repo = "zellij-nav.nvim"; - rev = "366935eeb527889ab51771233b687589135d7891"; - sha256 = "0lj0g8nhmn5pikbzszyach6nsw55ddxq4yrdx9miw48qi6nz51sz"; + rev = "91cc2a642d8927ebde50ced5bf71ba470a0fc116"; + sha256 = "0acb5zfiljfiz1is98drj54mv211m8qqmxmi5acc1s2mcr56z31s"; }; meta.homepage = "https://github.com/swaits/zellij-nav.nvim/"; }; @@ -19429,12 +19453,12 @@ final: prev: zotcite = buildVimPlugin { pname = "zotcite"; - version = "2024-11-21"; + version = "2025-01-24"; src = fetchFromGitHub { owner = "jalvesaq"; repo = "zotcite"; - rev = "a6d1eb8a8a8555aef814979a385d03165e2f8922"; - sha256 = "11lnm75n4im2m3vg4av6sa2x2fw62ja1w4an9c6ccvrqy5fj2wgm"; + rev = "db6db942b1385f13fd4d66182fa253477ecc5a23"; + sha256 = "10lilkw6vcakfhxwj5fj29lx000iv87qk6xlmxnvafh9fi2wmivh"; }; meta.homepage = "https://github.com/jalvesaq/zotcite/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 4a0bdf9b27f5..7e13782b93eb 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -105,12 +105,12 @@ }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=49c3100"; + version = "0.0.0+rev=a985bd2"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "49c31006d8307dcb12bc5770f35b6d5b9e2be68e"; - hash = "sha256-JW+30zIyq8Xc7NG9V+YoFqC+57BjZXIbAvWPD2lqvIE="; + rev = "a985bd2d14d249b8f583343ad21aeb13c50c85e8"; + hash = "sha256-5uI2DOLGLN0zD2VbCPB7sdLQFTL5kQtNZpGh7VC25wg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -193,23 +193,23 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=3aa2995"; + version = "0.0.0+rev=492f7aa"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "3aa2995549d5d8b26928e8d3fa2770fd4327414e"; - hash = "sha256-iT0sjwtrDtCduxCU3wVB1AP6gzxW3DpmqNQaP3LUBiA="; + rev = "492f7aaa37560204856a2b3f775398b66ba09f31"; + hash = "sha256-4Ha5coP621qncxS6IE+KvNuhJlj5qI4ZveBwe/1cq9k="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=acff8cb"; + version = "0.0.0+rev=2c31cc8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "acff8cbb53a1d7b9cd07b209c9933a0e2da9ef35"; - hash = "sha256-Mdcr4UuoKiNodrNV7/NRfQkmgynPa798Rv9f6Qm3cFw="; + rev = "2c31cc87640ab6ad74fb408c0cf1262ce54da5bb"; + hash = "sha256-pr9JxTc7o5q82CaYVtSSNlp3BQS4+CGblfmtXQoj9os="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -336,23 +336,23 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=f41b4f6"; + version = "0.0.0+rev=a352ed8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "f41b4f66a42100be405f96bdc4ebc4a61095d3e8"; - hash = "sha256-NRcyXjijLdoa5fdA+MKZyt7mnM5B37zCsqZh4QvuOtA="; + rev = "a352ed85f733f9c6cc458fe5a82bcd4c00f70eab"; + hash = "sha256-s/JJD2gfs2Kepj89N7ZCstdfZ1baONZmTxFy2D0KQ2M="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { language = "css"; - version = "0.0.0+rev=5c89b88"; + version = "0.0.0+rev=6731f03"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; - rev = "5c89b88a37a2e1e36c031469462d6ee85ff2c13c"; - hash = "sha256-R5820/4sIQIfCMg3D/LF1Kk5Mf46YLokS8tBAcGL4Eo="; + rev = "6731f030693d3698ad94865ed0228fe45df07e30"; + hash = "sha256-+TGRtlFDCfQYRC2dp+xyMZL/EpBnEjdq8vDeF1ib6Y0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; @@ -370,12 +370,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=635e8aa"; + version = "0.0.0+rev=757e0a6"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "635e8aa3747823a0c4e9660c07cef76fe8d3ef93"; - hash = "sha256-+KHenEgo9wMncjEIJZoqS0x089hjdR3J1t+x663qy1M="; + rev = "757e0a61f9d38b3d9eaa299e8d866e8283ffc284"; + hash = "sha256-66tJ1GVAWKqXBCzBXUGdzG/Rl2vw/eJ6mQnWnnnpBcU="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -592,12 +592,12 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=02a6f7f"; + version = "0.0.0+rev=0e8eb7f"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "02a6f7fd4be28dd94ee4dd2ca19cb777053ea74e"; - hash = "sha256-OM2RWQNdYMltYwmbU5f4ZK5a8Wx4JxBMYx9R5n2B4jg="; + rev = "0e8eb7fc1dfb3d855398870827a9866a1529a5e4"; + hash = "sha256-rgmwf4ndSFtrdAz+w0QtIcZNgYfaLoCkqytnioXT/Pk="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; @@ -636,23 +636,23 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "0.0.0+rev=3322625"; + version = "0.0.0+rev=8495d10"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "332262529bc51abf5746317b2255ccc2fff778f8"; - hash = "sha256-C2Lo3tT2363O++ycXiR6x0y+jy2zlmhcKp7t1LhvCe8="; + rev = "8495d106154741e6d35d37064f864758ece75de6"; + hash = "sha256-DCEno1QzPcM9853hldrm4IAqKsTNALe//laDn+Hcr8Q="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=d2281ab"; + version = "0.0.0+rev=981fda0"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "d2281ab060093290045941a865a3834eec862a3f"; - hash = "sha256-tiZY1CXwKBwkXRrl1uJACOoXIlC9AmqDQ9bxWuq9ejw="; + rev = "981fda038d2eb182a88a9374ccb1c14b840cba0b"; + hash = "sha256-uvVnWbkiwsqNq0hPikEwLLq1MDVohJlgK/L6zAUC+rU="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -746,12 +746,12 @@ }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=5fc069e"; + version = "0.0.0+rev=022b032"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "5fc069e4f05810ec6f8e399cd522e4eba864181c"; - hash = "sha256-dcpGhtUbaw4lBrwL01nzokWF2BQLsER5S7zEH6xOzso="; + rev = "022b032d31299c5d8336cdfd0ece97de20a609c0"; + hash = "sha256-STRbEv7kBtkrokXgaN9g1JNwWmSV+7gkyklhYKJszNY="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -978,12 +978,12 @@ }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=12fe553"; + version = "0.0.0+rev=7cb21a6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "12fe553fdaaa7449f764bc876fd777704d4fb752"; - hash = "sha256-E8ieOSkpmdsMrj1m0op0WA5ki4VkodHBMtJRCmYtmGY="; + rev = "7cb21a65af6cc8e5c6742b9dba42881ea1158475"; + hash = "sha256-BOq/HH6r+6dbdUa/0rlQioXG3Dgm60gBNSc1SLfE2fI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -1088,12 +1088,12 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=d1556e7"; + version = "0.0.0+rev=8691159"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "d1556e77d49df1a28cd564af5766fdaea8ab7063"; - hash = "sha256-oEdO9P1akGzOmZvAUrO608yptgkMsJL5YAhPwBvarPI="; + rev = "86911590a8e46d71301c66468e5620d9faa5b6af"; + hash = "sha256-652wluH2C3pYmhthaj4eWDVLtEvvVIuu70bJNnt5em0="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; @@ -1110,12 +1110,12 @@ }; hack = buildGrammar { language = "hack"; - version = "0.0.0+rev=fca1e29"; + version = "0.0.0+rev=bc5b3a1"; src = fetchFromGitHub { owner = "slackhq"; repo = "tree-sitter-hack"; - rev = "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2"; - hash = "sha256-XTcsqCvlwbAAi7/TXrYX8wT56Ie+0OW5+eNRMH7XNyk="; + rev = "bc5b3a10d6d27e8220a113a9a7fe9bec0a1574b0"; + hash = "sha256-dVDJRRn5pT7FPQN+RIUi/mFG6uS8rAzWJy2dBfuiNSM="; }; meta.homepage = "https://github.com/slackhq/tree-sitter-hack"; }; @@ -1243,12 +1243,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=d9219ad"; + version = "0.0.0+rev=d18f83f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "d9219ada6e1a2c8f0ab0304a8bd9ca4285ae0468"; - hash = "sha256-0aLNG4eB2I0Qn0r1oF4YwUDLek78S5fbklFI/bMmxOQ="; + rev = "d18f83f8bed0be99796c4eacafe9b295ab2ee144"; + hash = "sha256-FbyIgMEheIMAvllWtizuhj39G60IYX6YPY0BIz9O2/4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1287,12 +1287,12 @@ }; hyprlang = buildGrammar { language = "hyprlang"; - version = "0.0.0+rev=6858695"; + version = "0.0.0+rev=d719158"; src = fetchFromGitHub { owner = "luckasRanarison"; repo = "tree-sitter-hyprlang"; - rev = "6858695eba0e63b9e0fceef081d291eb352abce8"; - hash = "sha256-5csAj7k03QEEfkZE/EBmGjqUHPlFss3EWvExT4kaiQg="; + rev = "d719158abe537b1916daaea6fa03287089f0b601"; + hash = "sha256-5iflQ4FDEvVRuaytPl08Q9CYXm2dfZ49qJyvcsOrzuI="; }; meta.homepage = "https://github.com/luckasRanarison/tree-sitter-hyprlang"; }; @@ -1364,34 +1364,34 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=b4aa56f"; + version = "0.0.0+rev=ca4785b"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "b4aa56fd0a2ea2708fc93062683ae5eaa4e973e6"; - hash = "sha256-2Yo1ZGNZbe6TtfaSIykkG10L58Z6lk5hMr30K5zGuYI="; + rev = "ca4785b47a4ff15653f0408a49c764dec533e0d3"; + hash = "sha256-pRB5G4lR0t2E9MQN/a2AC8OQppwD6gZ1AfCNPon6TIE="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=94703d5"; + version = "0.0.0+rev=677da92"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "94703d5a6bed02b98e438d7cad1136c01a60ba2c"; - hash = "sha256-OvEO1BLZLjP3jt4gar18kiXderksFKO0WFXDQqGLRIY="; + rev = "677da92875756e31b3a42505d822cc8be7c5ab5e"; + hash = "sha256-6eJI+6bMdMb/9q9rXFF66JeuC8TaRKKzAnkfMZ8tojU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=108b2d4"; + version = "0.0.0+rev=3f1c835"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "108b2d4d17a04356a340aea809e4dd5b801eb40d"; - hash = "sha256-0x6DbmRTlxUP4vbWVsLoj+k1YOk2Dr+LAPClFsWi7r8="; + rev = "3f1c835d05165050834da0e3cbc23a75e94aaa64"; + hash = "sha256-+lC8zuuNlMIiEDqtuMdJwKXqG9udGOREq0ufasSbIJY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1408,23 +1408,23 @@ }; jsdoc = buildGrammar { language = "jsdoc"; - version = "0.0.0+rev=b253abf"; + version = "0.0.0+rev=a417db5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; - rev = "b253abf68a73217b7a52c0ec254f4b6a7bb86665"; - hash = "sha256-Azzb2zBjAfwbEmAEO1YqhpaxtzbXmRjfIzRla2Hx+24="; + rev = "a417db5dbdd869fccb6a8b75ec04459e1d4ccd2c"; + hash = "sha256-MMLgza5H9NWYn9jtOumwg3cz3hqb8GQGFc/yRSvUIVI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc"; }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=4d770d3"; + version = "0.0.0+rev=54ccd94"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "4d770d31f732d50d3ec373865822fbe659e47c75"; - hash = "sha256-hmcwRbTn0xPrV1OufXXq6VNhCopa1NQJhDsY3VSPovw="; + rev = "54ccd9485e0122a5e9faf5d8aaed7294c308e894"; + hash = "sha256-tltnBQNEFZeN0jIxG0eHofyMLR0CTrQos1fh02Xexas="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; @@ -1507,12 +1507,12 @@ }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=0662afb"; + version = "0.0.0+rev=c4ddea3"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "0662afbd2ce19b17c603acf67ae707b4d69ab8f4"; - hash = "sha256-r3emNyglirgxb1ktR46EgsECv6ueHUpo6wI2ULyUBtU="; + rev = "c4ddea359a7ff4d92360b2efcd6cfce5dc25afe6"; + hash = "sha256-7REd272fpCP/ggzg7wLf5DS6QX9SIO9YGPdvj2c2w58="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1797,12 +1797,12 @@ }; nginx = buildGrammar { language = "nginx"; - version = "0.0.0+rev=281d184"; + version = "0.0.0+rev=989da76"; src = fetchFromGitHub { owner = "opa-oz"; repo = "tree-sitter-nginx"; - rev = "281d184b8240b2b22670b8907b57b6d6842db6f3"; - hash = "sha256-OsUCCtkaCwiKWKBduk9Ktc65LP1udKcKRmU4TAy8ayE="; + rev = "989da760be05a3334af3ec88705cbf57e6a9c41d"; + hash = "sha256-tIbwsh7cnpm1jkIKaXQ7NI/LXWzEOsZyNLfe/qTNkkM="; }; meta.homepage = "https://github.com/opa-oz/tree-sitter-nginx"; }; @@ -2009,35 +2009,35 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=7120632"; + version = "0.0.0+rev=6f280c5"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "71206326a8bcbdc2032f852bab8698e315bf5910"; - hash = "sha256-EySvg8EcCrRS7QfiainRgsCYg8Kvn5DROLxrnyD3rkU="; + rev = "6f280c52662dc254eb7a5abc0889f7a9e1154ffd"; + hash = "sha256-wyIUdf0v/acVptAe3Z3tL9QvbdZYoxpeaS1a7oygyiU="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=43aad2b"; + version = "0.0.0+rev=5021edd"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8"; - hash = "sha256-+CnUnrNRaD+CejyYjqelMYA1K3GN/WPeZBJoP2y5cmI="; + rev = "5021edde6d0ea75aedc313e75cca2ac5aa064d41"; + hash = "sha256-DeqHoBlx9UCq7e06W6MnAVtoG7h7qrT1PNGsWTRN2f0="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=43aad2b"; + version = "0.0.0+rev=5021edd"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "43aad2b9a98aa8e603ea0cf5bb630728a5591ad8"; - hash = "sha256-+CnUnrNRaD+CejyYjqelMYA1K3GN/WPeZBJoP2y5cmI="; + rev = "5021edde6d0ea75aedc313e75cca2ac5aa064d41"; + hash = "sha256-DeqHoBlx9UCq7e06W6MnAVtoG7h7qrT1PNGsWTRN2f0="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; @@ -2132,12 +2132,12 @@ }; prisma = buildGrammar { language = "prisma"; - version = "0.0.0+rev=eca2596"; + version = "0.0.0+rev=73f39a6"; src = fetchFromGitHub { owner = "victorhqc"; repo = "tree-sitter-prisma"; - rev = "eca2596a355b1a9952b4f80f8f9caed300a272b5"; - hash = "sha256-MOqkM7DCQl1L8Jn9nyw89EoAr0ez4+d39HeKy2cb66c="; + rev = "73f39a6d5401cfdcd143951e499336cf5ab2ffaa"; + hash = "sha256-0wHh+Gf2wer/35NdEWOCQFNdRH/wVWnRx9HnlX7vZho="; }; meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; @@ -2267,12 +2267,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=409b5d6"; + version = "0.0.0+rev=44c2f7a"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "409b5d671eb0ea4972eeacaaca24bbec1acf79b1"; - hash = "sha256-IIAL2qteFPBCPmDK1N2EdDgpI4CwfMuuVL8t5tYueLU="; + rev = "44c2f7aebce0efac5867cdc5f2ea03c1d43a0305"; + hash = "sha256-B/c4QW3LIMQPmiRyvQe7SrQNUoIqW8U9FEnP54+XT/4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -2311,12 +2311,12 @@ }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=a6674e2"; + version = "0.0.0+rev=5c2d027"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "a6674e279b14958625d7a530cabe06119c7a1532"; - hash = "sha256-xtr2IVI+3h/u9f84ye7szHR/U2E8Bm5NN7vhqaCkiyI="; + rev = "5c2d02747250bc326bc33687b3319b7db8554e24"; + hash = "sha256-bZ8bIrr3vclu7AklGyVIxkR3TF9JDrGJui6i71swqhM="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; @@ -2399,12 +2399,12 @@ }; regex = buildGrammar { language = "regex"; - version = "0.0.0+rev=d329907"; + version = "0.0.0+rev=b638d29"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; - rev = "d329907611abe46d26ab5908e5922e7400212cb9"; - hash = "sha256-XNoklzboR0NzFu2Ke7HT6TitROFhEM6S993INA1atfM="; + rev = "b638d29335ef41215b86732dd51be34c701ef683"; + hash = "sha256-KHPwvjqvgqLKGL/OeotF1djSSSrAsb2H3CNUmgiva18="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex"; }; @@ -2498,12 +2498,12 @@ }; rst = buildGrammar { language = "rst"; - version = "0.0.0+rev=5120f6e"; + version = "0.0.0+rev=dd5971e"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; - rev = "5120f6e59284cb8b85b450bd2db0bd352635ba9f"; - hash = "sha256-PI1C0W8fiuIQ2fgHXDelkCa0ng1a32x/9hrA33KoefM="; + rev = "dd5971ef7759583aadd5aa5e3a3a0905eb5734d5"; + hash = "sha256-gW/d49PsRm/FgTS4khJ681GDjf1aAgTSXvUv/8bP0ek="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-rst"; }; @@ -2531,12 +2531,12 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=1f63b33"; + version = "0.0.0+rev=2eaf126"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "1f63b33efee17e833e0ea29266dd3d713e27e321"; - hash = "sha256-HV7zMwO3ZMaHqX5cV43iwuC+QM7ecApZ2U/hbXuM34c="; + rev = "2eaf126458a4d6a69401089b6ba78c5e5d6c1ced"; + hash = "sha256-u3mJghmVHYPjow1QWRoT/Ip7DZwli4EzmioZQOzqTjs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; @@ -2553,12 +2553,12 @@ }; scfg = buildGrammar { language = "scfg"; - version = "0.0.0+rev=a551280"; + version = "0.0.0+rev=2f3709e"; src = fetchFromGitHub { owner = "rockorager"; repo = "tree-sitter-scfg"; - rev = "a5512800ea0220da4abbae61b8aea8423d1549aa"; - hash = "sha256-Je6taNzniyd1c+2NRCF7TOvnpeW4qhYYhdAEcgpDOAA="; + rev = "2f3709e7656fa2c443f92041c91a9f843f8cd625"; + hash = "sha256-2/n+pSR6Ojahm8iBnpNsQscrXQqzZflKBA42gX29u50="; }; generate = true; meta.homepage = "https://github.com/rockorager/tree-sitter-scfg"; @@ -2608,6 +2608,17 @@ }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; + slim = buildGrammar { + language = "slim"; + version = "0.0.0+rev=a0f08e8"; + src = fetchFromGitHub { + owner = "theoo"; + repo = "tree-sitter-slim"; + rev = "a0f08e85b787248219ea645423c5916c8d620ef6"; + hash = "sha256-b+V56Csa+byGvTieN+cAvoVy8UpFzS8/SSdYeW3cjts="; + }; + meta.homepage = "https://github.com/theoo/tree-sitter-slim"; + }; slint = buildGrammar { language = "slint"; version = "0.0.0+rev=f11da7e"; @@ -2654,12 +2665,12 @@ }; solidity = buildGrammar { language = "solidity"; - version = "0.0.0+rev=f7f5251"; + version = "0.0.0+rev=7270875"; src = fetchFromGitHub { owner = "JoranHonig"; repo = "tree-sitter-solidity"; - rev = "f7f5251a3f5b1d04f0799b3571b12918af177fc8"; - hash = "sha256-Tt8lXaHrRFbbATUoWK+Y9FZohY1IeDTCXaaom4yZYb4="; + rev = "727087514eff57d92e273a24303142308bce3381"; + hash = "sha256-k5YExvQmDXk+k9afiq6VizFdsvSH9u8Y1u3xB9i96mw="; }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; @@ -2689,12 +2700,12 @@ }; sourcepawn = buildGrammar { language = "sourcepawn"; - version = "0.0.0+rev=6b9bf9c"; + version = "0.0.0+rev=f2af8d0"; src = fetchFromGitHub { owner = "nilshelmig"; repo = "tree-sitter-sourcepawn"; - rev = "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf"; - hash = "sha256-2DjGCZ701c2rMxQZM4YF61rZokZUov4ECb0gwAmyuVk="; + rev = "f2af8d0dc14c6790130cceb2a20027eb41a8297c"; + hash = "sha256-u8/wM2Dj+uO3g24MsGZfH9zkABCEaWWFI8EX3fxuljk="; }; meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn"; }; @@ -2788,12 +2799,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=1fda813"; + version = "0.0.0+rev=e6eba40"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "1fda813bd9dc108e962e018e6a327434767ad616"; - hash = "sha256-+32toY540h92Xk5xoYvZaMYNDxXWI4pRbkrBnU4xRjM="; + rev = "e6eba40bf54dd94d842154be0389c53a37be8dc8"; + hash = "sha256-v1K4yuAeFxu8K/Wt2gv2Onwfa4AB4Wt1p76d2koLAYw="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -2867,12 +2878,12 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=ad23ed0"; + version = "0.0.0+rev=e5a12f7"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "ad23ed0325658adbb1dfb397d4dfbea8872585c6"; - hash = "sha256-dcz2b0NiaJEQUN6kOk+FVfxqD3wSzolH+NXkPpzrQj4="; + rev = "e5a12f798f056049642aa03fbb83786e3a5b95d4"; + hash = "sha256-oOykmtAFPQiqK02nia8/m8pg2fi5yKt7dzZOGr9f3dQ="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2923,12 +2934,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=60310af"; + version = "0.0.0+rev=a9178bf"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "60310af0d788a0160d719d4aff8f146b6e6c55bd"; - hash = "sha256-M0+Yw2Ld9qT9Ag9OaMpmls8LO4+IK0xtAZ8X5oZ2c78="; + rev = "a9178bfc9cc8040c08f39b47bae5400a2bf06e50"; + hash = "sha256-QMOPxbNzLcUfhEuD635M/n3WrADryjZVKXlNMF6QezQ="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -3035,12 +3046,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=8e13e1d"; + version = "0.0.0+rev=410947e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "8e13e1db35b941fc57f2bd2dd4628180448c17d5"; - hash = "sha256-Z68ERsfHxDubDJb7nQKSH0YoBmIReUGXNF0LJAQTXEs="; + rev = "410947e9d2ca8e032cd2419bf1241406c7e6f9bb"; + hash = "sha256-iRIRIighYwVB5Pze5nhdZ9gFiELiqVBYrSyKLzaXI/8="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -3069,12 +3080,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=8e13e1d"; + version = "0.0.0+rev=410947e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "8e13e1db35b941fc57f2bd2dd4628180448c17d5"; - hash = "sha256-Z68ERsfHxDubDJb7nQKSH0YoBmIReUGXNF0LJAQTXEs="; + rev = "410947e9d2ca8e032cd2419bf1241406c7e6f9bb"; + hash = "sha256-iRIRIighYwVB5Pze5nhdZ9gFiELiqVBYrSyKLzaXI/8="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -3170,12 +3181,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=5351039"; + version = "0.0.0+rev=0461bf8"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "535103910159887a41d019635c1cdbec910d1a31"; - hash = "sha256-4VxvK9KzJlN0AsXz0XL5FIs3H65vPgyj/YqTc138zC4="; + rev = "0461bf8addccb4df566827f1601f415d07b1ffbc"; + hash = "sha256-flnEty9x1wDDtSgQk9cRXYKfWFjvqxRXsLl5ev3rGXk="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3215,12 +3226,12 @@ }; vhdl = buildGrammar { language = "vhdl"; - version = "0.0.0+rev=63d0360"; + version = "0.0.0+rev=da8ea8a"; src = fetchFromGitHub { owner = "jpt13653903"; repo = "tree-sitter-vhdl"; - rev = "63d0360d42c43b4902b8470c7ddcf323432e2dde"; - hash = "sha256-D85VFM82lU4GDpIWZmY+j6134DHp0pGbqg8Haj2mgiw="; + rev = "da8ea8afa7899a99e43a7d61afef9f77b7a675eb"; + hash = "sha256-yLoIKO1ObSe7rQOBjd1cF0U8/x622tYWwasiCHx+aYE="; }; meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; }; @@ -3348,23 +3359,23 @@ }; xresources = buildGrammar { language = "xresources"; - version = "0.0.0+rev=983f13a"; + version = "0.0.0+rev=d0f9dc7"; src = fetchFromGitHub { owner = "ValdezFOmar"; repo = "tree-sitter-xresources"; - rev = "983f13acef542aef431a845fef084ddda8d9d666"; - hash = "sha256-s/wuzVzF8TzySZ0OFNCFpbvjminQzbb3icZc+DnChjc="; + rev = "d0f9dc7cec4dc15fc6f9d556bb4e9dd5050328a6"; + hash = "sha256-3TBpNdIsmOutazBlMKAsQaq7RPu4vUeZMFuZ2/2HDKo="; }; meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources"; }; yaml = buildGrammar { language = "yaml"; - version = "0.0.0+rev=b733d3f"; + version = "0.0.0+rev=1805917"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; - rev = "b733d3f5f5005890f324333dd57e1f0badec5c87"; - hash = "sha256-23/zcjnQUQt32N2EdQMzWM9srkXfQxlBvOo7FWH6rnw="; + rev = "1805917414a9a8ba2473717fd69447277a175fae"; + hash = "sha256-lcdlvzDhl0mDCe4olMoEynxFFLfn3w4p24C1k/7DItA="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml"; }; @@ -3414,24 +3425,24 @@ }; ziggy = buildGrammar { language = "ziggy"; - version = "0.0.0+rev=fe73bee"; + version = "0.0.0+rev=3518133"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "fe73beef9f52f04048d8b19016fc4fbc66b4596f"; - hash = "sha256-GSiVrl3GMp5Y8DF/gxdl1ToUoN5s3RQxNKxmab5tSHs="; + rev = "3518133e9ebea7c372eff4def368eda8488fad18"; + hash = "sha256-U3MUFYsWiM5RK3lFXyo3VaTlxqkh3b0HzQsRiegIHU8="; }; location = "tree-sitter-ziggy"; meta.homepage = "https://github.com/kristoff-it/ziggy"; }; ziggy_schema = buildGrammar { language = "ziggy_schema"; - version = "0.0.0+rev=fe73bee"; + version = "0.0.0+rev=3518133"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "ziggy"; - rev = "fe73beef9f52f04048d8b19016fc4fbc66b4596f"; - hash = "sha256-GSiVrl3GMp5Y8DF/gxdl1ToUoN5s3RQxNKxmab5tSHs="; + rev = "3518133e9ebea7c372eff4def368eda8488fad18"; + hash = "sha256-U3MUFYsWiM5RK3lFXyo3VaTlxqkh3b0HzQsRiegIHU8="; }; location = "tree-sitter-ziggy-schema"; meta.homepage = "https://github.com/kristoff-it/ziggy"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 766bb21dce49..a57851975775 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -760,6 +760,7 @@ in # Optional integrations fzf-lua telescope-nvim + snacks-nvim ]; dependencies = with self; [ copilot-lua @@ -1615,6 +1616,10 @@ in ]; }; + LuaSnip-snippets-nvim = super.LuaSnip-snippets-nvim.overrideAttrs { + checkInputs = [ self.luasnip ]; + }; + lz-n = neovimUtils.buildNeovimPlugin { luaAttr = luaPackages.lz-n; }; @@ -2763,6 +2768,10 @@ in dependencies = [ self.plenary-nvim ]; }; + repolink-nvim = super.repolink-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + # needs "http" and "json" treesitter grammars too rest-nvim = super.rest-nvim.overrideAttrs { dependencies = with self; [ @@ -3358,6 +3367,15 @@ in }; }; + vimade = super.vimade.overrideAttrs { + checkInputs = with self; [ + # Optional providers + hlchunk-nvim + mini-nvim + snacks-nvim + ]; + }; + vim-addon-actions = super.vim-addon-actions.overrideAttrs { dependencies = with self; [ vim-addon-mw-utils diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d3e516ef2402..5fd747b9a552 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -15,6 +15,7 @@ https://github.com/martinda/Jenkinsfile-vim-syntax/,, https://github.com/vigoux/LanguageTool.nvim/,, https://github.com/LazyVim/LazyVim/,, https://github.com/Yggdroot/LeaderF/,, +https://github.com/molleweide/LuaSnip-snippets.nvim/,HEAD, https://github.com/Valloric/MatchTagAlways/,, https://github.com/numToStr/Navigator.nvim/,, https://github.com/overcache/NeoSolarized/,, @@ -938,6 +939,7 @@ https://github.com/amitds1997/remote-nvim.nvim/,HEAD, https://github.com/filipdutescu/renamer.nvim/,, https://github.com/MeanderingProgrammer/render-markdown.nvim/,, https://github.com/gabrielpoca/replacer.nvim/,HEAD, +https://github.com/9seconds/repolink.nvim/,HEAD, https://github.com/stevearc/resession.nvim/,HEAD, https://github.com/rest-nvim/rest.nvim/,, https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim diff --git a/pkgs/applications/graphics/tesseract/wrapper.nix b/pkgs/applications/graphics/tesseract/wrapper.nix index 47398b88c80a..058b8a26db47 100644 --- a/pkgs/applications/graphics/tesseract/wrapper.nix +++ b/pkgs/applications/graphics/tesseract/wrapper.nix @@ -18,8 +18,6 @@ let nativeBuildInputs = [ makeWrapper ]; - phases = [ "buildPhase" "fixupPhase" ]; - buildPhase = '' makeWrapper {$tesseractBase,$out}/bin/tesseract --set-default TESSDATA_PREFIX $out/share/tessdata diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 65927dd70f0f..9a4336362227 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "128.6.0esr"; + version = "128.6.1esr"; sources = [ { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/af/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/af/thunderbird-128.6.1esr.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "147169c7e5d3bb763fa87c4f7627f9ddec6493fa7833656021d102df897d2b2b"; + sha256 = "be2c44af9f0476c5ed21abed583cc6970b1a074b25ebe69b0000a3c38b892e91"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ar/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ar/thunderbird-128.6.1esr.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "eaf250a43059ab0d255ea7b1a96f55baa9287c88b2faf5269fc574df70e5731c"; + sha256 = "4f3208c2151de9a7503888bb467b2f3fc8006a1a79abb91f98306f8498e266d6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ast/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ast/thunderbird-128.6.1esr.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0a66cbf7d5defd48c433784eab0b0b457c11971eac0d4d2f45a735818a23ec02"; + sha256 = "e370b6799874607d5072bb09a98c2998ef8b6c3e8a967a7fe31eca3f15a94e6d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/be/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/be/thunderbird-128.6.1esr.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "bb475d2f103966cf26e2837333124310cd9e943ee86ec01e524b884f438af6fa"; + sha256 = "0b0f0e4ae1843ca5c643a740a46737e39d844627212631a60b7c9b16c45c83e4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/bg/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/bg/thunderbird-128.6.1esr.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "86f3ff01453cfe8156de06b23b4b7a08bc75bd6a7703b3851b145d0e334116c6"; + sha256 = "a4dee78c0bc74de69c1a61400ceb8fdced5b6da9deead89ce88a5cdc3234ff6a"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/br/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/br/thunderbird-128.6.1esr.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "cd2df9f9970e80e9cf97d658b0157d900dda0f2ecd8be225f40d132143874d88"; + sha256 = "ef798d533bab9530f30f03636900f61804b4b57c61a61585761f23c942eb18ca"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ca/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ca/thunderbird-128.6.1esr.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0684f9615fd8324cea414b2b0d95a86bf361190ac41281805957cf70c1005457"; + sha256 = "3bd0fecc87a4aaf8934a35f0a4bcc86e271a78c1547d6c6fe5a924847f395e19"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/cak/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/cak/thunderbird-128.6.1esr.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "d2c40cd642b5e5b0a81c9d2cf0f1b034b17453dfdff100765874ff684e0bbf17"; + sha256 = "7af923642bd14adb3fccdbe6effc9afb25e911c3f8db8d42af1b122689f39bde"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/cs/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/cs/thunderbird-128.6.1esr.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "2d2324de917822676da6a13173e3fbd541abdeff2ae3cbbb9adab7c9321fe280"; + sha256 = "67c4a3efb4d00ac2840a732161f803b24b4f5ff1379b64a923b473fa8594e64b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/cy/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/cy/thunderbird-128.6.1esr.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8a57b789bfa683781d24cc3c74fe5ca5e28aa55d790bbfe2ec9113816cbad0ac"; + sha256 = "10a52a5ea2bd1957b350f07dbbff088529591bfb4634ab3ee1a76509489f47c1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/da/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/da/thunderbird-128.6.1esr.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "1a58db475780f1aa0c2d487f826e83d2da592dd3f2bf296a19406ca5ee4ff864"; + sha256 = "fade618a5a8a8e80828796509a901883086ec528c1b92e8f5a5acc3afcd77226"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/de/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/de/thunderbird-128.6.1esr.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "7c5c2ef5e276cc9214d19235a913c1345cc1fcf967c0ca1abc0c935427188df4"; + sha256 = "3e54f9ad84530145aa48b2e0b861e7db0e2ea263422c60a7fd574221001a1908"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/dsb/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/dsb/thunderbird-128.6.1esr.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b1fc585a9a57506d5852b5ced928ee26b27569bd11a6e31d1d362a2ce0e80e29"; + sha256 = "2267f1087ed7e796824aa732700c6c0892782dd8660dcba8d5540e617664d3c2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/el/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/el/thunderbird-128.6.1esr.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "88ff0bf13a314a9228504b7af1c151935e56fb93fd5fec447c82df587439ec87"; + sha256 = "650490e9684ab556f552aa400ac11ad68883d4a51901f207dc077c7c1ce227d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/en-CA/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/en-CA/thunderbird-128.6.1esr.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "a27961dac518dbd07fbe65aee8dbd0a088f510b359644e67503a4c604a483cbf"; + sha256 = "bd70b88b9ad86c5a3a36f741f6a9cf08fd50d5ca82022327c038e6c9a3aef92e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/en-GB/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/en-GB/thunderbird-128.6.1esr.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "315c95f6ae7aa96682d8db8f091a8fdb66f1d071e96ccb23394cc7b0e041b32d"; + sha256 = "699c053e9ae061842e51fab1ca87acf81b8a2ca243a2a1833eeb968af8865d2c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/en-US/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/en-US/thunderbird-128.6.1esr.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f8e7fdd9a29a196be4e3af54760ad6987d40180644bae4afb68bbf63f931f2b8"; + sha256 = "4dfa40703f0623569ef9f11e5909c35e61fd6d73d4858d85f1e911158b6e9f39"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/es-AR/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/es-AR/thunderbird-128.6.1esr.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "1a166113f8c3d38ff12dddd0193a45823ab623ed28bd8348025d45afd6c969a6"; + sha256 = "408148e33a08d9b092b2017c3fd97f3e7502bbb061b9e6381973f5f7e656b840"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/es-ES/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/es-ES/thunderbird-128.6.1esr.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "11fe857aa1ec54fb135840b3763dc5373eccd302b65028c9b8e3ff1d238a5c82"; + sha256 = "33f964d271a86f1bb02dbe793f89ba6b4a56e22f6a0fd72a9f1cbbbadc409c8f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/es-MX/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/es-MX/thunderbird-128.6.1esr.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "10922d63aedd1e472d804a29572d084f9a49bd014072815b195ac04ee8959fa0"; + sha256 = "bf93e6bddb47944d9ccd5fe3443c2e7b9e4ff3ac0af1db05a07f45bbb57c8917"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/et/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/et/thunderbird-128.6.1esr.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "26f2876b278747de85c888c59abb639ce715ea2b849a3317c69192eb4690366d"; + sha256 = "8135645758ba64d0f0b4631d06142dcd621c49db5fc584cd01222a9ce543dabb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/eu/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/eu/thunderbird-128.6.1esr.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b9446b2f5bb87bb5ad9074e4295559d9aedfc790af7f5e1ae74077f93165eda4"; + sha256 = "4fc0f5a7e7342eb3387691cb3728a64e11f6983e233060f0dff41f351e328f37"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/fi/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/fi/thunderbird-128.6.1esr.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e85e265b8b21839dbe09af3b860bc7c30c62678758f42542a3f2e73bec9b9300"; + sha256 = "67192f44c2edd542272806f6de1166e85e0cbe8d5ea59ea0459fc5dcf29c13cf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/fr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/fr/thunderbird-128.6.1esr.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6c77bc7aec3e985c4ddc17e51bd659d8f4c68811e3e04dd5c27eaa37f48e4ebe"; + sha256 = "6323051cd2084f286ffeeee1e4e24cdc6c2b8853fd1aad8581eacea6e26478c6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/fy-NL/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/fy-NL/thunderbird-128.6.1esr.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "a57e8c11a14e7418ef198c2acd566a4e3581cc9eda3ecb4fe8e1e219b27594f3"; + sha256 = "08718d1f1c809633b7854a96b56c841001408b8cc941455d4a2e500cc082c211"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ga-IE/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ga-IE/thunderbird-128.6.1esr.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "aed8de9226564d4ee4bb6869cc0421c435878d31103e87af21f393ba68c36ae3"; + sha256 = "a9c5d6534572f6356c439c88a990a97175b3e77a299bb34cbffb6f13d3e7c4ef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/gd/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/gd/thunderbird-128.6.1esr.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0cf99116e8534cb21696c0675d7bba710f27559d3d82d5e72a64daac16c1c7f4"; + sha256 = "4258c7ad2e824e20ea2fdc86507187c687cdb0178702442469a18ff77d206a49"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/gl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/gl/thunderbird-128.6.1esr.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3354f923b02c9c13d45c8a08c2f5e47fad5bac133563bcaf164a57c68d5bba92"; + sha256 = "235e1396dfaa266ebbeda750b6a10186593ddcfa95465201e7f7a3b87e8f15ff"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/he/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/he/thunderbird-128.6.1esr.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "461f8f59ea9699a1e74a1b27cbdcff05b52b8f126e8e97a0f037952a8b536cf0"; + sha256 = "5c38f24471bed56e25eab4820c556c0eba1d2798f2a566408ff8e9d973e87012"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/hr/thunderbird-128.6.1esr.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7fb6430e834532e43bd87b246058adeef11dd77adc850b8672fd04f3d6d6060a"; + sha256 = "c177125fb51b2b80cdaa6978ff2475ce9e052b8a2b1bf9b1ce536fe7ecc89309"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hsb/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/hsb/thunderbird-128.6.1esr.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e727fa3ff2617962157473b20e31bfdb99c59c35ec3e6cb10046211bfd47723d"; + sha256 = "8333ab8efc2f46a1a0a0db86c3d58dc6cd4e0144f2e69f3183ccddc0a7e882fd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hu/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/hu/thunderbird-128.6.1esr.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "c8d6f822508d7a68c65927b14105ddea413835a518d348bca4f41ef61bf11a94"; + sha256 = "f91995e57af2ca41e3166d3abe88915d3578a56f8fa646ad17a97d88d4362f03"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/hy-AM/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/hy-AM/thunderbird-128.6.1esr.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "da532b67da698cdc025a5320b4e11f630eb8982ed389c1c60fc3c942bdfb4034"; + sha256 = "12cdc3de116fc6b27ab2e9d55ea722363364477156b6da020c1df1346c3f2ae8"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/id/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/id/thunderbird-128.6.1esr.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "05ae0434947fbacd738b24941633db92a21ef8936703706cdaeb311f98cacab2"; + sha256 = "eb449aed2254840cd3b24056758130c14ed34dcd5dd7738d807a592bd71cdbb9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/is/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/is/thunderbird-128.6.1esr.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "4f506da3c5677cb9fe600e31a9e37b398f00200a403365f8e68f89c8a0eb6bf0"; + sha256 = "67cebbbd999d7a42ec03a98dfcbaec637c291b5eb9eedd4bd4f65097526b0ecd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/it/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/it/thunderbird-128.6.1esr.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "9142f001b55718443937fa7bc2ac92584371e9b4a1d0d87ff84c272fc87fa74e"; + sha256 = "e4ba4ff84f5a3ed8cfa86b5155bf3f1d487524566b03eacdd4052c4b5f431d96"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ja/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ja/thunderbird-128.6.1esr.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "965e2b5125ffbabce121c4efbd86cc796372ec969d8634d106a44fef2696c930"; + sha256 = "7b8d6c8a302d1877569246d4b5e23e4e6e7192a924030e89bd35cd04229d3b98"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ka/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ka/thunderbird-128.6.1esr.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "24b87f5590e83999c8a1b3970b5d0fa3bf98de9820573b0e1af49ced9ca7d29b"; + sha256 = "bf3e8af506a98db415491d56856261113b471ff9749a4b094a08d7b1850e86d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/kab/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/kab/thunderbird-128.6.1esr.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2efdaf21264181251f39f165270e3e22103823750b9d4d35fb94784f95137d18"; + sha256 = "0efd72d632cc95e2546dd9c811b1e761c2d47e17bef49613aa38832af96acd8f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/kk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/kk/thunderbird-128.6.1esr.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "63820d662893a836a28159057e4ceb2042823d042e2c1f0ed833480817e3cedc"; + sha256 = "b3de6a7fa35e3ea01336dfe86c448d4b0f9a672d7452e77569541fce65810d02"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ko/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ko/thunderbird-128.6.1esr.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a1006fb62ca22730213805e9a8bde134bd88405b0068204eba0400880bb10cdd"; + sha256 = "9410d40fd086f25fea1f5faeedd2f640ef0d436f49b5b8bbd4f41b4f4bed1525"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/lt/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/lt/thunderbird-128.6.1esr.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "60d9333c6633c828f4e491dc8a033a8940894875b9154433511573c31d4834a4"; + sha256 = "2af7d411d75ee76a8b3e4b1e63b07ab0634811ef8c18dfe5dd4cf3cb9676ea68"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/lv/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/lv/thunderbird-128.6.1esr.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "edf454a5d2ed00f486aebbf505aa5ce8cf9b6d14f06f4645535cc08a1db2a445"; + sha256 = "9d67e04d6039f69b0b256d103b494d7ad46471e4f337821bfc56811bb28f39a7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ms/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ms/thunderbird-128.6.1esr.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2e6374ae36a01a0362a3ac8e9a616e8b80d9c31fbe8f89e58930e00bbb8ede93"; + sha256 = "a7f269a701dabd3260a526f6a8588a6cb033c1d1e097497cf056642414974221"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/nb-NO/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/nb-NO/thunderbird-128.6.1esr.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "85e121b6878115a304720f9ff8ad85ce757ce1cb520284973be199f51357b707"; + sha256 = "940b364182ce1f208c99c58b0d5cad38fe0f5f09ab3995d4ea757136995295d5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/nl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/nl/thunderbird-128.6.1esr.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "306f6af60bee6174e0d7aab66b7cf21cfe383f9dce403c91fc867ce9a2c26944"; + sha256 = "9e18c1556863868f49a7c79a20da5e35d84f385dd4e0b11c6eaa0d8dc934944d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/nn-NO/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/nn-NO/thunderbird-128.6.1esr.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "3aa2b9391365419cdf7a753206c962a932e7f5325505a3320ae57f3b781634d9"; + sha256 = "87f3c24434e81592cf9ba6d2715219ba632ba0014d2587d027e18441e9c306e1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pa-IN/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/pa-IN/thunderbird-128.6.1esr.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "797ae91d608e7be252439b1fcd4536df1b030fb1f7267408c17b75cefda4c20b"; + sha256 = "b8cdd1c2db2eede3e2aad1da30bf767d15bf302441c3cc4979a5280b36bcf539"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/pl/thunderbird-128.6.1esr.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4ac87004c02e69159ae6875658cb7ed95ddd965fa3871ba7a89a82b6abd4f9f6"; + sha256 = "6be2cd7239411ee03bf4f5fdb98ebb4235428e4aa3fb0c85fc9c9362571deecb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pt-BR/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/pt-BR/thunderbird-128.6.1esr.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "40a3721ec6cd57f58e27ddb239e5026648bf9d75eafc417e4d61b5128c8e6a45"; + sha256 = "baee1f8a9428f50c0115766e999a9f3c18c0e9bf6961a32b27716935f0d813d7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/pt-PT/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/pt-PT/thunderbird-128.6.1esr.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "860fb6f9ed881a18921a498f30d5559316e1d7934d974636951339221a2b4b57"; + sha256 = "bddb747ee6e45014baf9a8d2261aadd4150c98d63dcd5ddafc08200972451038"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/rm/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/rm/thunderbird-128.6.1esr.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b9c47fe2fdc79f0ab5cd6233aec9b8be4bda9537ea3fdba1290d28e6d2e38dcc"; + sha256 = "bc2835f7eeaebef7ec60c06cfd4641aed51facc81ae69e83d7e4d56ec9ea10a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ro/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ro/thunderbird-128.6.1esr.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "aecc5113a2e86c6202cab6ce6278a2b7ff8b7228efba5e3de5dc3811d845c043"; + sha256 = "8e9e4b0091ae91fb544d00e7e6748532a4f874e5d416cf317478858e06aed782"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/ru/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/ru/thunderbird-128.6.1esr.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "ab3903775cafe7907b28bf56d5f30e2d3d79055d84bd52469b26bf72ec8240c9"; + sha256 = "4420432e93242e90d048f7eeffc6d4b2a0208cc3a8b6b3547bf402c58f684094"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sk/thunderbird-128.6.1esr.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "8ef99d4dc206ae86ccf4460206ff56e314e1e35d282f05f86944e462db119b8c"; + sha256 = "2a3e5f5fc207a39954b53da37faae8b77c04beeeb77f01a712d34c3a97dcb8d1"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sl/thunderbird-128.6.1esr.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c57ab55bd835e2d5bf8903a6a8db69ea456f93f1406167bffa9a9047b3747db3"; + sha256 = "67222234ed147536af027c7a9292a6e13f4fa0d6ba7a2af86d3e631754a8b9ce"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sq/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sq/thunderbird-128.6.1esr.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8b8f216d54cf9e432e19ae07b2ac316684a8e1ba91e2dee7f8157f626c46b114"; + sha256 = "e6c0b7a5e1a7c91d74c192b6d07ca21aebf2a423f11d9384c268175e9a52c516"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sr/thunderbird-128.6.1esr.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "9212dbe44a7e39097b1d1a7860a06f4a7bdd45abe734b3c5bb7c04de0d766fec"; + sha256 = "fb4682aeb65695dfe82e7420f69e31000871cc89f28f85a968b8a9851d3c4374"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/sv-SE/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/sv-SE/thunderbird-128.6.1esr.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "1f1b6b76775b1643a6748b414c014c24c1fc84a09da4aad3ee7a3672ca5f0012"; + sha256 = "6a191f049d25899d5550e8b32fe36c9c9b87f1764271a38daeecc99d2d42258d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/th/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/th/thunderbird-128.6.1esr.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "82f1ddd9b88b777162c947f09ef6add3e3050ab87ec5bb33d245b6fa14a603dd"; + sha256 = "4a7b662274fcb08462d28e9bacb0b388c24ba97ec2d2de4cd2a6ebeee51f19a5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/tr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/tr/thunderbird-128.6.1esr.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "380bcfa6ec40a2fba1eb444e473baa521cbf4ee654ad63898e5f3829be746dc8"; + sha256 = "e1c5e3f7b40d1e627b6f442bd2f015d28e1c07c70eadf686502ccc2d6c8f61de"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/uk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/uk/thunderbird-128.6.1esr.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "2a7052d5c51e53c0ab3b0703f7b33a3e870a123b8604416ef8c92dfcbad736e9"; + sha256 = "57fd513305a33a959a09c80a1fbd3e06fd0cdd40f86cb41f814e9a31a9b24267"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/uz/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/uz/thunderbird-128.6.1esr.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "72148f0f1160f9fb93ea65e1dd6053a768e02b45f6ecfb3de68de4db4f635291"; + sha256 = "ca72d66aa59098fc0e2325718a0dec4911af4bab55245268876e6224ffc47169"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/vi/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/vi/thunderbird-128.6.1esr.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "475abbbb400aea36414d787e98ce9095632e11436759da552ccdb4272adaacea"; + sha256 = "57b4b669b8a8e1704a50040c8ee5dd84e5145a09ad40644709fbdceb46af1975"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/zh-CN/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/zh-CN/thunderbird-128.6.1esr.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b2d5ac008c57e7e48168b9712d6e90891bd5c517a891e4d0d4fcb6d5ae2cfb3c"; + sha256 = "6e8323e5cc67720a7cf1afba7776116e70ad9ada3b4e01023eae1c5f4134c555"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-x86_64/zh-TW/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-x86_64/zh-TW/thunderbird-128.6.1esr.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "01122295d0e40f896312eee085b9db6e696a9eede5f94a69651d39253f7cec2c"; + sha256 = "746eb3f9a1296143c97817056cfdb4465fbd2071fa6dc9283d577c6a84c04c56"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/af/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/af/thunderbird-128.6.1esr.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "62d59997921ad6f8867fd28d249c86c4879c2634e5766b498feaa68d0da38336"; + sha256 = "f5f9713502309cf753ee9cb584226e1ec4b8983975eca29df846feb8617f3aee"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ar/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ar/thunderbird-128.6.1esr.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "dbc05ffb01763cfbec843331d47772d8b53f0e700db0fa4d3ce0afc4a48814e3"; + sha256 = "51ae27836ec8ad79a453a79dda6ebeac92f0a9a9928784a632cbde12952bec7c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ast/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ast/thunderbird-128.6.1esr.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "bdcc2cb138d79367087ac72d7fec609128cb983416bee6e3f57f18ba3f78741b"; + sha256 = "710c0bf59054b3619c58707aee80469e950cfc7f571208aab0db44b115eb8dfa"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/be/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/be/thunderbird-128.6.1esr.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ee1132188cca65f69cbef56287f930f685cc1c7f7e445b3eb819bd935ec7cb2e"; + sha256 = "f330fb05511f92648adfbcb21f7d40a5769d5bfb45a5aec74f0ea691e5871af7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/bg/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/bg/thunderbird-128.6.1esr.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "ebbc2843eedaf5ef42e8d9b53e2e7c020e3eefaccbfa9d95554d259ea2332781"; + sha256 = "711940850a15971ae10bbd47650b4a0a2025fc6518c30b07b571892e85b9a75e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/br/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/br/thunderbird-128.6.1esr.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "5c0679c6970f2e7d80fd4e1b78643e912d42641a287074ec8deb6f49016844fd"; + sha256 = "5294c69244262827b74d48e3d9080bbe55eeeb5c4dc58c2148923bc27176847f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ca/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ca/thunderbird-128.6.1esr.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d1d727eee4d58c7798414510918248b37d33ba5953243b6e23e7a03fe7c5dab3"; + sha256 = "7ff75c06c3e79aa66406ae9208f3ca3c496703e4828e1fdf77eaaecfc08f3e06"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/cak/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/cak/thunderbird-128.6.1esr.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e9e6fa54db1a01d8a9fdaf3339dbbf84fb101220e57fe060df44e045a6051189"; + sha256 = "a3197fa772df576d549c26b8480c4ff4c550c7d922139d00582a8a5be4393ff2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/cs/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/cs/thunderbird-128.6.1esr.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "f1e2399413bf3a744128cb9e2279b9f207f9361c5da3bdb4f7f625f73d2217a6"; + sha256 = "03a130d9449fa1f708be06e7a2724f087238727e321b41ffec07dcb6400026be"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/cy/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/cy/thunderbird-128.6.1esr.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "33a3372f67b1254dbb30989879a71b0078a2340901875abb9759780d81855712"; + sha256 = "490a874e8f1ada465cb600434464c25e25d44cb6452219b227510c59e91051b7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/da/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/da/thunderbird-128.6.1esr.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "2a08ff6af580d47bf2e5759dba6d706bdd3fc74e7d7b6e56b4333c4b7aae9ace"; + sha256 = "f3a8e93f01bb5f0d13a2711aa55610672526989ba54596a6a72cf1f22198e470"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/de/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/de/thunderbird-128.6.1esr.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "66eaf15fd54ecd204510e3ee8e6042515932138464d12e31f287008c1abc8218"; + sha256 = "69849cb1ef0eb78c967e7529a85e5cda2f31ac25f6b48c88ee055230857c339e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/dsb/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/dsb/thunderbird-128.6.1esr.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "2febaf2c4fb0e75b78bffd4c81b2818c63fe993451b0a7cc20a7e6353dd8fb07"; + sha256 = "357fbce54d89547a97055c08725c08619675830ac0dfe7967547e498ccc79381"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/el/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/el/thunderbird-128.6.1esr.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "165b23be9f875111a17807edcf6813fc8687773827b85e9c73475590ccab5412"; + sha256 = "638408fcff3c6e116e94bac9a10c9719cf81500d23f575f088b097c97b40de66"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/en-CA/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/en-CA/thunderbird-128.6.1esr.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "001af04eedd973468bfac7a2357bf145fc507bbf710d2ec236fb841d1b31309b"; + sha256 = "fb1d42d13985c308bd501d36f2b0977bf1d820d8f6e56ab3e4887b0f21bb2d57"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/en-GB/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/en-GB/thunderbird-128.6.1esr.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "f45125ce2e23318ae0d9943e15c6212a4238777fede7af7686f826ee3d9dbe28"; + sha256 = "89507abd00647841e576a318f4c18e2c728d818107e0e35a5c4f32f34e0b5879"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/en-US/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/en-US/thunderbird-128.6.1esr.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d9c2e45e91c927832fa2b6affaccfed77a48f83cba647a895b49eaeeaa4461ec"; + sha256 = "eb8555ff145dfbcee89271de61d22f73ec90f2bc2e06ef54ec60aa2c3b4318df"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/es-AR/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/es-AR/thunderbird-128.6.1esr.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "39fccbc25a74ab3ced790c034bfa170d1b9f4eb312ad8a9c3f7e1ad77d427c51"; + sha256 = "2e5740eccfd005ba2ba20763246cd51923b2caf4a41ea6976ffe2670294d0ded"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/es-ES/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/es-ES/thunderbird-128.6.1esr.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "03741e6cdbb65a7f5915bf57b109cf6adf5213abc20da905fc861c88f9c9c406"; + sha256 = "835b83dddec9dd1ea6283f3294ae9b5e9b827c72e65bc4b50204b338fa7da2d4"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/es-MX/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/es-MX/thunderbird-128.6.1esr.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "15c7d464ff7769701d314f13330271ed2937ab0b0034a81161b2e36d283831be"; + sha256 = "47e23a7507b3c4af1da944c4865692808d961ab7073daec08887a1cd5505a77b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/et/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/et/thunderbird-128.6.1esr.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2f388016a416978bd4459f10c627d380fffbeff95dcc4f652ad459ea77a114af"; + sha256 = "60be867338dc57434be4521bc1ef9d26ac16da51bcc0681c3424ee65d0f04335"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/eu/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/eu/thunderbird-128.6.1esr.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "913e9a6f0c642488a6f265aeb82f47cad6d9da4c8a3c20a538be4dacfdd2f424"; + sha256 = "9e407cda465e65b8fa40f966eec6793f1d618a2cb4cdaf89026736f210582146"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/fi/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/fi/thunderbird-128.6.1esr.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "181c0036ea5c3cd1d2a51c1f554be95c780d825c2b698196f21ce4451242069a"; + sha256 = "559ead385a9d4545c31a3ae0219604658275700e56fd62f289bf89743d784bcf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/fr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/fr/thunderbird-128.6.1esr.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "4855ccbf98d16a50f5b879ca7488b850a2d4378610c1a45e292e1635b3e5836c"; + sha256 = "c64d0fbc18b86da7fdf599bb574cfea257a2ad2a4072d6d54f0f201284d32ba7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/fy-NL/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/fy-NL/thunderbird-128.6.1esr.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "f1e518d037905d175b67ea69524f9347b1cf84bddfaac15c9755de319cc8cee6"; + sha256 = "48199cb503d9e4744368b199d4d06545265ddb0cbc9f3d443a0570d4f2a50658"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ga-IE/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ga-IE/thunderbird-128.6.1esr.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "a1b6fdd4a59fece7a9216c8684502634bdae34a23ad6b1d4a9b1877aa8c74b2f"; + sha256 = "4157290dd27ff6e738e8c7aa7522f0f1b8f3df09329c286c232cd21ffefca532"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/gd/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/gd/thunderbird-128.6.1esr.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "770e304815467dcd557a9377f7755ab6eeef1b754db35865102e148d181c24bd"; + sha256 = "053504f03781525eca26a11f0469c814480cd5c714eba97be41b321f8075e273"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/gl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/gl/thunderbird-128.6.1esr.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "715aa396a68625b69ab3d19133023c2b8623074bcbf60198d278e48d655562f7"; + sha256 = "0e5d718033eadbb6f1d701df5995591fdcbed0b7cc3d5cc68ba42d8a481fe9bb"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/he/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/he/thunderbird-128.6.1esr.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "71851abff423cd15633b014ed49fc340a668f37912813180087bec647ef52695"; + sha256 = "631ea9ad6ba16b83e1edc0fd55c476f4a16259025a3863e9212e61e0d89bc7ea"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/hr/thunderbird-128.6.1esr.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ec3b050dd285b5ef797de74003f5661bb4157bc4db5dabd195f1973cf0c6f5bf"; + sha256 = "bad8f983ea5ae4f80ae38ada0c7c8d3fa336744b1e966c48af10217bf5ea2237"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hsb/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/hsb/thunderbird-128.6.1esr.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "84d25c5f124a159ce9d6f0e2909c2813857c7efe38dd2f0df5b383f8f7e3d494"; + sha256 = "4d50574ac492b5bee3a7ab7f3e859ad076771cd9e47c4020018e1c10b9083518"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hu/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/hu/thunderbird-128.6.1esr.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ae2566441c6bdd4705dc24d3b917c8e03d7219650b38fbf94d94ff82a446fe62"; + sha256 = "e782b4eb870ffa199be3a1c571c67eade17cee24f3b4b8ee6f160067082a8c8c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/hy-AM/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/hy-AM/thunderbird-128.6.1esr.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "684d92cba150239ba8f7c85cc00b8002a4f86c310c3a96cadc8afa4a8212337a"; + sha256 = "16c02f0811ded8a5fd0d17a3b4ce944fe2adc6ed53c8927a2bc0dd13ae6b5a17"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/id/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/id/thunderbird-128.6.1esr.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f0be4128db7336c6d42880515d7006d6818e2650dc024e65aad6cd0e2be0e961"; + sha256 = "4226e163541af84d2df18d755673d6a5b2fafe9f650f6acdc9dc92d258b5ac1c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/is/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/is/thunderbird-128.6.1esr.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "a141c3fb553a32f9874ed6f2a4004e84979d1b970c17fa7a74a6d23fce0263c9"; + sha256 = "3ee5840dcfbcfaa488ddf34267ee15346d6f4af3531a1581918ce0bef894e627"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/it/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/it/thunderbird-128.6.1esr.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "bbc2a5d84e0ed6bebd8585df3a852fbf92e5bb0f548ae37b970a6b2447c98ed1"; + sha256 = "8895b995cc0f80ce299b90b59609943eabbfbea79b9732c0020356223c47f792"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ja/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ja/thunderbird-128.6.1esr.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d04fc2f0a0ce0be61012ae72dba8c48fe90bd6467ca20d8440787260f92dffcc"; + sha256 = "684e8e68b1369c3fba79192d6e5ec1a81da536d2c3bd41a3ae9ded8217cd1501"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ka/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ka/thunderbird-128.6.1esr.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "ed178358c17b02499d4b7691098c07c85cfbe4a43cb9bb8b5fd86ce7779298ae"; + sha256 = "aabc4ce18a4f12fb9bcbe5b185df7193850d98e75ebd3d71e277111edc1a76a3"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/kab/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/kab/thunderbird-128.6.1esr.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "3299c8a36adc7af99a3c73863645eb622e2b46de84f404233443d00b416e204c"; + sha256 = "11c2f379d051411a9339b0de268619d78d214cbd64ee75ed142c4b3b57114efd"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/kk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/kk/thunderbird-128.6.1esr.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1de2bac82f5be71751eef5bfeb59116927ea04b2b8c2b568fe1725745d160e85"; + sha256 = "636709b2a21c97264bf10464b72606bdaf95014dfa5dacb509989cdf8edec2b7"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ko/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ko/thunderbird-128.6.1esr.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "0326665b85426f1b14216e063118796e010969689d2341469bbf36d799f2f4a5"; + sha256 = "0f751cbdf911524e4436a3c7a1504de2c500e79d346acc539f3ecef4ec1acf2f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/lt/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/lt/thunderbird-128.6.1esr.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "458467e5d24267011aa9b2c61cccb77b174bd17b791ab8ab260a7e07b0059ce2"; + sha256 = "2bdc68ba0514ad110427b85008c6e586c60cd3e5309d5b8fd0f55348c9df8375"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/lv/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/lv/thunderbird-128.6.1esr.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "935564c24ad59a8cba9388c0629c5074738d9671dfc95c3058adf5f0ffae465e"; + sha256 = "72bfa32ed3b847f3e4842a9a923dd64967da1430cf38182c1bf9772cb99a7ad9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ms/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ms/thunderbird-128.6.1esr.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "d98f64f31ed2c2f2c5d6b044bfa64f342f326e9710da9e8884ece1010cd7482c"; + sha256 = "054c3a226465ed5d5d05d9465089a0b8369f89ff4b2e5db2f5e7d880eeede5da"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/nb-NO/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/nb-NO/thunderbird-128.6.1esr.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "14302cbe97ac0fcdfc3fa480f2b4437764be824dd0ab500c2c6c73701f4dedca"; + sha256 = "9137be450d76d838521f274a645995d61fb9723cd0f7b26ee6641306b645e031"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/nl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/nl/thunderbird-128.6.1esr.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8b5bb83eeab32207258366e9bd286c2b1b2cd729ef45abf41277f473baa7305f"; + sha256 = "71c19034ac6a06bffb84f64922360871e6fb1670d9c3fbc9a19798c8abee66c5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/nn-NO/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/nn-NO/thunderbird-128.6.1esr.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "9417b5870546bd223de53ec36c17a4d0e2210fcbb4b853abb2f034b74a589051"; + sha256 = "d07aaf91cfc6f3b4da65cad518e62a5168eae9a8ee7bd940424a6682d7ad126b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pa-IN/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/pa-IN/thunderbird-128.6.1esr.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "0405871e0fbbda68cbdeb933c70c26d7c0cab0c4501b8762c7be3bd148e08ab8"; + sha256 = "3951b9ff05096165b17a9e5c49ac544cf77b1eb1b732e2a41ee9d94c47ebf6f5"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/pl/thunderbird-128.6.1esr.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1da36203c8420749724bd8b32e1c215257a225aa98f0e0643d0425b32aec5980"; + sha256 = "ae27f78332e8ad0855b0214f14cae0d7fa09d59f71b38a0f80dce359606073a6"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pt-BR/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/pt-BR/thunderbird-128.6.1esr.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "cac9cd2269f7d69c25ca618864bfd115bcb2ec27331038b7c6e5831f941499ee"; + sha256 = "5383952811ca6f9bc52f3ddcfcc0b881fed818b6dca6b99d9cf90d178082ad9f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/pt-PT/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/pt-PT/thunderbird-128.6.1esr.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d66daca210cb2459850b554d492d4c0ba7d9fc7a34980ee72cfe983436861194"; + sha256 = "85c8c8ef1cf8dbd3c9c9874686590300e9cfc10c684b1bb4f64eb39cc8c5e4d2"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/rm/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/rm/thunderbird-128.6.1esr.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "dfdc1b27313897e4ae7437423d70a93b47c3277ff5199a7f134e90c787a6f5f4"; + sha256 = "2bd11169c571047b44025f0094a3bba2642f7d24480003a652fa30988997ac6f"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ro/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ro/thunderbird-128.6.1esr.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "477a37e982f00f32f7afd9e1263035f878034bc6ee79200cc3d156efc20dc124"; + sha256 = "88a1940d95c02f46aeb092af2758cb85840425b3924b662b2d1beacf18670628"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/ru/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/ru/thunderbird-128.6.1esr.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "d94e863b730f86b3c1ffd2004c74d339f72af66b67d098beb51a056e7bc4e58d"; + sha256 = "5efad22aa2d09b275367dac33deac99f4fe99e126f90883829ef71e2c577e161"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sk/thunderbird-128.6.1esr.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7fb502e717b62433c10338a140ce724d2bcd6f947c3df140d88ccc7ba17f3f02"; + sha256 = "b4a4e1b3df1882a99394ce659018efaa01b940d08bb6f1d6bef0455c8c27c39e"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sl/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sl/thunderbird-128.6.1esr.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8eea3f3ecd02765a286ddb763a1dd305a630d82720569069a239750ba83664d5"; + sha256 = "18dc29b47a46a74aa8e8a003593d0e92dc707a289a3f846355f6aca522b2d7ef"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sq/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sq/thunderbird-128.6.1esr.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "8aa055e87b14cca81d25499d196cceed9503e8922e03ee0ea92097dd9ed54d42"; + sha256 = "4f44f82bc32802c2bfb95fc9188ff1656b0b50b215e6475615395f19b4ba5e9c"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sr/thunderbird-128.6.1esr.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "879683d2bd155f0d764979c148c8024213337ff110e9b43bb45d6012f229a300"; + sha256 = "389b47ff4fe0ec44f6f04fed574a0be4fafcfe95713f5575972ee7be4fa2bc63"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/sv-SE/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/sv-SE/thunderbird-128.6.1esr.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "add729440a5acacbdb9303b975196ccd081fbaf609a5ca520c5c49da8a57fbfe"; + sha256 = "ce9ade81d2d2a66ccd50f043998364e4696eb5a5c3c272ec093d0266abf03417"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/th/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/th/thunderbird-128.6.1esr.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "b7dfb1c4471c6afe6ff84c15f868254d6871a32e9d989a085cfea3431e592b49"; + sha256 = "c51ac457124127d23339c9901446e3930c7b3f77870c71bb4be0baaf0ccf8fcf"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/tr/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/tr/thunderbird-128.6.1esr.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "55291db94cdbd0ba57ec3235a02dc06e3003240f0f9f95dba028a0fa6193e3d5"; + sha256 = "d657d7447a7a24ec5a033b72edf0410d1ccd07d0a40d9e296e6ecadaf57d654d"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/uk/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/uk/thunderbird-128.6.1esr.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "07ca8084dd890216f576f612f5540333f222496c061172e2bca55a97949ff199"; + sha256 = "0643a480d328aaf211fc65b0bb323dc4cc7943940c26784642fc8ddbf2f963a9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/uz/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/uz/thunderbird-128.6.1esr.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d0374a986585bd43e7e2ff88ce8c6fee727523ec98983fbcb665acf32327e2d0"; + sha256 = "a7dbb5595a507f4207e2181e138ba99ca08b87aa031ed4acdacf594f0ff523b9"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/vi/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/vi/thunderbird-128.6.1esr.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "147b9d64d517142fc20c91de1b5613a2c56976fa6c70382abee69dc98ad2a703"; + sha256 = "ebb655c6734c9b68bffe76a00f35156da93bd97c5879e4acf34df7b31ba92f0b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/zh-CN/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/zh-CN/thunderbird-128.6.1esr.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "15cc8573c79e62f611499a0dcd09155e7d5b66c25bf8361132f8ce4a3530897c"; + sha256 = "004ff5ed854609c6554fdf235c81854038ab56f4e231fff00477d1de85a6d30b"; } { - url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.0esr/linux-i686/zh-TW/thunderbird-128.6.0esr.tar.bz2"; + url = "http://archive.mozilla.org/pub/thunderbird/releases/128.6.1esr/linux-i686/zh-TW/thunderbird-128.6.1esr.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "9c5fae7d1ff16246beb284f26461a1cdec93c31bf8b9c0ca12adef2bf9fa7794"; + sha256 = "7894a24b448663f24e4466399fe006c4c0806f56a29a56ecfae5c2ad2f883106"; } ]; } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 0c582199a6af..5867656b2cbc 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -45,8 +45,8 @@ let } else { - version = "2024.4"; - hash = "sha256-rGGOzi5Yr6hrU2xaLE/Lk38HYDGPEtGPEDRra969hqg="; + version = "2024.5"; + hash = "sha256-/s8GsYbN25Qs+0LujaXz6yuZk+aswKLxjRSsCwFEJPM="; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 889a67312200..a8c2adba6ee6 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-wGxxLfl+d8uTPLHPL2EKpaL36x0or7PHwdVaZTlKITE="; + hash = "sha256-B421xXt7TrBJVwi04vygnw9t5o7/KLVpuItQtwV4E24="; }; - cargoHash = "sha256-8G6iyvnKYxiRotQH7SwLSZStJg7iDNw4zPvT9sUTvmA="; + cargoHash = "sha256-geg6gdPKUBJBJI/TpW5m+/q/7M7kmIlrU2UAauctFOM="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 0379d5cac956..84f94437aa3e 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -69,7 +69,7 @@ let buildFlags = [ "--enable-system-libraries" ]; }; gitlab-glfm-markdown = attrs: { - cargoDeps = rustPlatform.fetchCargoTarball { + cargoDeps = rustPlatform.fetchCargoVendor { src = stdenv.mkDerivation { inherit (buildRubyGem { inherit (attrs) gemName version source; }) name @@ -83,7 +83,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-vFApyObuqsMBXhT2yyMpH7rzW0GaPgJUn9/hE/GpS9I="; + hash = "sha256-fikyG1e45XP+oWOxuCdapW1zM2O02KozqB5qnbw2TY8="; }; dontBuild = false; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index db8fdf62b3d1..fd00d81af44b 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -33,10 +33,7 @@ let homepage = "https://github.com/hyprwm/hyprland-plugins"; description = "Hyprland ${description} plugin"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; inherit (hyprland.meta) platforms; }; } diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 9da0df03294b..75d3e1d6ef9c 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -91,10 +91,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/releases/tag/v${finalAttrs.version}"; mainProgram = "hyprland-share-picker"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - khaneliman - ]; + maintainers = lib.teams.hyprland.members; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix index 899c799c5fcc..e346ab659af6 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor.nix +++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix @@ -35,6 +35,9 @@ in name ? if args ? pname && args ? version then "${args.pname}-${args.version}" else "cargo-deps", hash ? (throw "fetchCargoVendor requires a `hash` value to be set for ${name}"), nativeBuildInputs ? [ ], + # This is mostly for breaking infinite recursion where dependencies + # of nix-prefetch-git use fetchCargoVendor. + allowGitDependencies ? true, ... }@args: @@ -53,11 +56,15 @@ let { name = "${name}-vendor-staging"; - nativeBuildInputs = [ - fetchCargoVendorUtil - nix-prefetch-git - cacert - ] ++ nativeBuildInputs; + nativeBuildInputs = + [ + fetchCargoVendorUtil + cacert + ] + ++ lib.optionals allowGitDependencies [ + nix-prefetch-git + ] + ++ nativeBuildInputs; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index 35336e223729..55a8997e8f72 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -106,6 +106,9 @@ rustPlatform.buildRustPackage { -p:Deterministic=true ''; + # NuGet.targets(156,5): error : Unable to load the service index for source https://api.nuget.org/v3/index.json. + NuGetAudit = "false"; + passthru = { inherit (dotnetBuild) fetch-deps; }; diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix index e2ba073fa636..74fc2982563f 100644 --- a/pkgs/by-name/al/alist/package.nix +++ b/pkgs/by-name/al/alist/package.nix @@ -7,17 +7,18 @@ stdenv, installShellFiles, versionCheckHook, + callPackage, }: buildGoModule rec { pname = "alist"; - version = "3.41.0"; - webVersion = "3.41.0"; + version = "3.42.0"; + webVersion = "3.42.0"; src = fetchFromGitHub { owner = "AlistGo"; repo = "alist"; tag = "v${version}"; - hash = "sha256-DzqSkcyDRyiHM0yh7A+dZj7TnjhDVQoHHgV5piVcu1g="; + hash = "sha256-qUW9bA2TeAVve77i43+ITxClLaO3aqm5959itf+iFqs="; # 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; @@ -31,11 +32,11 @@ buildGoModule rec { }; web = fetchzip { url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz"; - hash = "sha256-1IXvst9VfxuIjUrgmJxTYm8jJQStMK+RlQibQ3fTDGs="; + hash = "sha256-g2+qdLrxuyuqxlyVk32BKJCbMfXNs29KLEPxAkTQHjU="; }; proxyVendor = true; - vendorHash = "sha256-p6JqYmcQR6W7RE7F6NGxoiTxSOESuYjpke0rLRlxeSM="; + vendorHash = "sha256-uid+uT4eOtDsCNsKqGqPc4vMDnKUatG4V2n0Z7r6ccY="; buildInputs = [ fuse ]; @@ -67,6 +68,7 @@ buildGoModule rec { "TestHTTPAll" "TestWebsocketAll" "TestWebsocketCaller" + "TestDownloadOrder" ]; in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; @@ -88,6 +90,10 @@ buildGoModule rec { versionCheckHook ]; + passthru = { + updateScript = lib.getExe (callPackage ./update.nix { }); + }; + meta = { description = "File list/WebDAV program that supports multiple storages"; homepage = "https://github.com/alist-org/alist"; diff --git a/pkgs/by-name/al/alist/update.nix b/pkgs/by-name/al/alist/update.nix new file mode 100644 index 000000000000..e32f0c3e6c8d --- /dev/null +++ b/pkgs/by-name/al/alist/update.nix @@ -0,0 +1,43 @@ +{ + writeShellApplication, + nix, + nix-update, + curl, + jq, + common-updater-scripts, +}: + +writeShellApplication { + name = "update-alist"; + runtimeInputs = [ + curl + jq + nix + common-updater-scripts + nix-update + ]; + + text = '' + # get old info + oldVersion=$(nix-instantiate --eval --strict -A "alist.version" | jq -e -r) + + get_latest_release() { + local repo=$1 + curl --fail ''${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ + -s "https://api.github.com/repos/AlistGo/$repo/releases/latest" | jq -r ".tag_name" + } + + version=$(get_latest_release "alist") + version="''${version#v}" + webVersion=$(get_latest_release "alist-web") + + if [[ "$oldVersion" == "$version" ]]; then + echo "Already up to date!" + exit 0 + fi + + update-source-version alist "$webVersion" --source-key=web --version-key=webVersion + + nix-update alist --version="$version" + ''; +} diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index e5f44520c15d..7e1dfceea806 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; - version = "0.5.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "aquamarine"; rev = "v${finalAttrs.version}"; - hash = "sha256-Gxv1kTz5jEvIzmkF6XgsdKglL2jmjJOQdZ+hO9uVnlQ="; + hash = "sha256-NbJiiPFnmciji3JHpqF/L0SdMQXKXn+q3Q/D8RjF/ak="; }; nativeBuildInputs = [ @@ -71,10 +71,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A very light linux rendering backend library"; homepage = "https://github.com/hyprwm/aquamarine"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; }) diff --git a/pkgs/by-name/au/autoadb/package.nix b/pkgs/by-name/au/autoadb/package.nix deleted file mode 100644 index a0bb4f32a565..000000000000 --- a/pkgs/by-name/au/autoadb/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, -}: - -rustPlatform.buildRustPackage rec { - pname = "autoadb"; - version = "unstable-2020-06-01"; - - src = fetchFromGitHub { - owner = "rom1v"; - repo = pname; - rev = "7f8402983603a9854bf618a384f679a17cd85e2d"; - sha256 = "sha256-9Sv38dCtvbqvxSnRpq+HsIwF/rfLUVZbi0J+mltLres="; - }; - - cargoHash = "sha256-xxmBgJqtWq1FLWTaC8SjaBoSXkPcIZYrSOc+hCEN778="; - - meta = with lib; { - description = "Execute a command whenever a device is adb-connected"; - homepage = "https://github.com/rom1v/autoadb"; - license = licenses.asl20; - maintainers = with maintainers; [ shawn8901 ]; - mainProgram = "autoadb"; - }; -} diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 0484dd665c42..3bea156c1c91 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -26,8 +26,8 @@ let dotnet-sdk = with dotnetCorePackages; combinePackages [ - sdk_7_0_1xx - runtime_6_0 + sdk_7_0_1xx-bin + runtime_6_0-bin ]; npmDepsFile = ./npm-deps.nix; diff --git a/pkgs/by-name/az/azure-storage-azcopy/package.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix index aa6b36ffabcd..168c76410192 100644 --- a/pkgs/by-name/az/azure-storage-azcopy/package.nix +++ b/pkgs/by-name/az/azure-storage-azcopy/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.27.1"; + version = "10.28.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; tag = "v${version}"; - hash = "sha256-h/EiJZMX2vHn/t1FPM1ZkXf9I8LYiqK1GqkSDAlXBYY="; + hash = "sha256-dRS96M4KMEQaKYVA0fNgmmfH2JYVFbEjH8C3xA9knes="; }; subPackages = [ "." ]; - vendorHash = "sha256-7ZUQMJPYE62M47VqEwahVePC85x3TyOmADOVczUrj7w="; + vendorHash = "sha256-TwzcjhL8STH8tASTp2kQjn6bYyn/Ab+EJwvIGOBT+1A="; doCheck = false; diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 0e4b02fb8e06..c1845323e58b 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -6,27 +6,14 @@ pkg-config, alsa-lib, versionCheckHook, + bacon, nix-update-script, + + withSound ? false, }: -rustPlatform.buildRustPackage rec { - pname = "bacon"; - version = "3.9.0"; - - src = fetchFromGitHub { - owner = "Canop"; - repo = "bacon"; - tag = "v${version}"; - hash = "sha256-LnJlE4ostOl+pr+d7ZsAfKvG4C45qt4pedWpeiTchPU="; - }; - - cargoHash = "sha256-KS1SXrRqjvRom2zZOaaZZOMK2CRUwVmtXC2ilDfaEG0="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = +let + soundDependencies = lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ] @@ -34,12 +21,39 @@ rustPlatform.buildRustPackage rec { # bindgenHook is only included on darwin as it is needed to build `coreaudio-sys`, a darwin-specific crate rustPlatform.bindgenHook ]; +in + +rustPlatform.buildRustPackage rec { + pname = "bacon"; + version = "3.9.1"; + + src = fetchFromGitHub { + owner = "Canop"; + repo = "bacon"; + tag = "v${version}"; + hash = "sha256-TniEPcY3mK5LO9CBXi5kgnUQkOeDwF9n1K0kSn4ucKk="; + }; + + cargoHash = "sha256-5pY43PH2I4L/QsNnJffBGiRtuZrnLVCxjo0YseLsEMc="; + + buildFeatures = lib.optionals withSound [ + "sound" + ]; + + nativeBuildInputs = lib.optionals withSound [ + pkg-config + ]; + + buildInputs = lib.optionals withSound soundDependencies; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = [ "--version" ]; doInstallCheck = true; passthru = { + tests = { + withSound = bacon.override { withSound = true; }; + }; updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix index 486dd4217b77..51e6b983ec19 100644 --- a/pkgs/by-name/be/beatsabermodmanager/package.nix +++ b/pkgs/by-name/be/beatsabermodmanager/package.nix @@ -21,11 +21,11 @@ buildDotnetModule rec { }; dotnet-sdk = with dotnetCorePackages; combinePackages [ - sdk_7_0 - sdk_6_0 + sdk_7_0-bin + sdk_6_0-bin ]; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0-bin; projectFile = [ "BeatSaberModManager/BeatSaberModManager.csproj" ]; diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index dc3c3cb908a8..4a824fea8da0 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -26,7 +26,7 @@ buildDotnetModule rec { nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; diff --git a/pkgs/by-name/bi/bililiverecorder/package.nix b/pkgs/by-name/bi/bililiverecorder/package.nix index 3efa80e687ea..af7b1b432a36 100644 --- a/pkgs/by-name/bi/bililiverecorder/package.nix +++ b/pkgs/by-name/bi/bililiverecorder/package.nix @@ -9,8 +9,8 @@ let pname = "bililiverecorder"; dotnet = with dotnetCorePackages; combinePackages [ - runtime_6_0 - aspnetcore_6_0 + runtime_6_0-bin + aspnetcore_6_0-bin ]; version = "2.13.0"; diff --git a/pkgs/by-name/bl/blueberry/package.nix b/pkgs/by-name/bl/blueberry/package.nix index f32e619f56f5..1bcd602ccac5 100644 --- a/pkgs/by-name/bl/blueberry/package.nix +++ b/pkgs/by-name/bl/blueberry/package.nix @@ -13,9 +13,10 @@ xapp, }: -stdenv.mkDerivation rec { +python3Packages.buildPythonApplication rec { pname = "blueberry"; version = "1.4.8"; + format = "other"; src = fetchFromGitHub { owner = "linuxmint"; @@ -26,7 +27,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gobject-introspection - python3Packages.wrapPython wrapGAppsHook3 ]; @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { bluez-tools gnome-bluetooth_1_0 libnotify - python3Packages.python util-linux xapp ]; @@ -53,28 +52,28 @@ stdenv.mkDerivation rec { # Fix paths substituteInPlace $out/bin/blueberry \ - --replace /usr/lib/blueberry $out/lib/blueberry + --replace-fail /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/bin/blueberry-tray \ - --replace /usr/lib/blueberry $out/lib/blueberry + --replace-fail /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/etc/xdg/autostart/blueberry-obex-agent.desktop \ - --replace /usr/lib/blueberry $out/lib/blueberry + --replace-fail /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/etc/xdg/autostart/blueberry-tray.desktop \ - --replace Exec=blueberry-tray Exec=$out/bin/blueberry-tray + --replace-fail Exec=blueberry-tray Exec=$out/bin/blueberry-tray substituteInPlace $out/lib/blueberry/blueberry-obex-agent.py \ - --replace /usr/share $out/share + --replace-fail /usr/share $out/share substituteInPlace $out/lib/blueberry/blueberry-tray.py \ - --replace /usr/share $out/share + --replace-fail /usr/share $out/share substituteInPlace $out/lib/blueberry/blueberry.py \ - --replace '"bt-adapter"' '"${bluez-tools}/bin/bt-adapter"' \ - --replace /usr/bin/pavucontrol ${pavucontrol}/bin/pavucontrol \ - --replace /usr/lib/blueberry $out/lib/blueberry \ - --replace /usr/share $out/share + --replace-fail '"bt-adapter"' '"${bluez-tools}/bin/bt-adapter"' \ + --replace-fail /usr/bin/pavucontrol ${pavucontrol}/bin/pavucontrol \ + --replace-fail /usr/lib/blueberry $out/lib/blueberry \ + --replace-fail /usr/share $out/share substituteInPlace $out/lib/blueberry/rfkillMagic.py \ - --replace /usr/bin/rfkill ${util-linux}/bin/rfkill \ - --replace /usr/sbin/rfkill ${util-linux}/bin/rfkill \ - --replace /usr/lib/blueberry $out/lib/blueberry + --replace-fail /usr/bin/rfkill ${util-linux}/bin/rfkill \ + --replace-fail /usr/sbin/rfkill ${util-linux}/bin/rfkill \ + --replace-fail /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/share/applications/blueberry.desktop \ - --replace Exec=blueberry Exec=$out/bin/blueberry + --replace-fail Exec=blueberry Exec=$out/bin/blueberry glib-compile-schemas --strict $out/share/glib-2.0/schemas diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index 4aa6d5c45076..71ef9beadd79 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -17,7 +17,7 @@ buildDotnetModule rec { hash = "sha256-IWtYbb1IFB6DLIYYTP+q7q+h/0aqonxr/mWwf+83aRo="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; projectFile = [ "Source/Boogie.sln" ]; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix index cdc711873a36..7abde58978fe 100644 --- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix +++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "chirpstack-rest-api"; - version = "4.10.2"; + version = "4.11.0"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-rest-api"; rev = "v${version}"; - hash = "sha256-t7JACy26BzmkC7f/KGATw8V+lqEqhkPjEg6LHQ6REWE="; + hash = "sha256-yYuSciMsQudGqBPNqj28TZgCGtZb9j7mtEkBR8tbEm4="; }; - vendorHash = "sha256-Y4KGcLms5TAWHcvm9OYKty3+Lciycy+31zokVAPx/pI="; + vendorHash = "sha256-UZ1todyWnxRTnqEGc/2rM+JCZPWYG/WA+OnivpB6JGI="; ldflags = [ "-s" diff --git a/pkgs/by-name/co/colorstorm/0001-fix-segfault.patch b/pkgs/by-name/co/colorstorm/0001-fix-segfault.patch new file mode 100644 index 000000000000..af572eb75fb3 --- /dev/null +++ b/pkgs/by-name/co/colorstorm/0001-fix-segfault.patch @@ -0,0 +1,12 @@ +diff --git a/src/templator.zig b/src/templator.zig +index 5630a04..0dc8ca7 100644 +--- a/src/templator.zig ++++ b/src/templator.zig +@@ -77,7 +77,6 @@ pub fn parse_themes(f: std.fs.File) ![]Theme { + } + + const parsed = try std.json.parseFromSlice([]Theme, a, list.items, .{}); +- defer parsed.deinit(); + const themes = parsed.value; + + return themes; diff --git a/pkgs/by-name/co/colorstorm/package.nix b/pkgs/by-name/co/colorstorm/package.nix index 0f997fa2cc8a..a665bd9ed557 100644 --- a/pkgs/by-name/co/colorstorm/package.nix +++ b/pkgs/by-name/co/colorstorm/package.nix @@ -2,22 +2,31 @@ lib, stdenv, fetchFromGitHub, - zig_0_9, + zig_0_13, }: stdenv.mkDerivation (finalAttrs: { pname = "colorstorm"; - version = "2.0.0"; + # last tagged release is three years old and requires outdated Zig 0.9 + # new release requested in: https://github.com/benbusby/colorstorm/issues/16 + version = "2.0.0-unstable-2025-01-17"; src = fetchFromGitHub { owner = "benbusby"; repo = "colorstorm"; - rev = "v${finalAttrs.version}"; - hash = "sha256-6+P+QQpP1jxsydqhVrZkjl1gaqNcx4kS2994hOBhtu8="; + rev = "e645c4293fb5f72968038dac99e0b8dab3db194f"; + hash = "sha256-6D+aNcjJksv7E9RJB9fnzgzvGoUPXV4Shz5wLu5YHtg="; }; + patches = [ + # Fixes a use-after-free segfault. + # See https://github.com/benbusby/colorstorm/pull/15#discussion_r1930406581 + # and upstream PR https://github.com/NixOS/nixpkgs/pull/377279 + ./0001-fix-segfault.patch + ]; + nativeBuildInputs = [ - zig_0_9.hook + zig_0_13.hook ]; meta = { @@ -25,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/benbusby/colorstorm"; license = lib.licenses.mit; maintainers = [ ]; - inherit (zig_0_9.meta) platforms; + inherit (zig_0_13.meta) platforms; mainProgram = "colorstorm"; }; }) diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix index 17134da28104..357e71fa0379 100644 --- a/pkgs/by-name/cp/cpuinfo/package.nix +++ b/pkgs/by-name/cp/cpuinfo/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cpuinfo"; - version = "0-unstable-2024-12-09"; + version = "0-unstable-2025-01-10"; src = fetchFromGitHub { owner = "pytorch"; repo = "cpuinfo"; - rev = "ca156f7bc9109c552973414a63d310f76ef0cbf8"; - hash = "sha256-hIGizsl1NSGySXPI9Xx69xCfQLAMpYviYhBXX201N4o="; + rev = "8a1772a0c5c447df2d18edf33ec4603a8c9c04a6"; + hash = "sha256-dKmZ5YXLhvVdxaJ4PefR+SWlh+MTFHNxOMeM6Vj7Gvo="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 1ec73cd14528..3b39b5c86428 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -11,7 +11,7 @@ makeWrapper, ncurses5, - dotnet-sdk_8, + dotnetCorePackages, dotnetSupport ? false, alsa-lib, @@ -33,7 +33,7 @@ let dyalogHome = "$out/lib/dyalog"; - makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8}/share/dotnet"; + makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnetCorePackages.sdk_8_0-source}/share/dotnet"; licenseUrl = "https://www.dyalog.com/uploads/documents/Developer_Software_Licence.pdf"; diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index ed64279ccb16..ecdec1f89c8c 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.89"; + "version" = "1.11.91"; "hashes" = { - "desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0="; - "desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q"; + "desktopSrcHash" = "sha256-nHA/j9V+vZUgY+eCCp/iO458GrXSkla+ruJbJjh9NJw="; + "desktopYarnHash" = "09k4kislf1zimbyn6m68bh2s3kpn2cs9h04wqli3j3qgkplcvxdv"; }; } diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix index 6bd45a77319d..75bc7666939a 100644 --- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix +++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix @@ -1,7 +1,7 @@ { - "version" = "1.11.89"; + "version" = "1.11.91"; "hashes" = { - "webSrcHash" = "sha256-K9i5MxTJaX359qsnpfXZBZiNHbhCEy25plUPVUtbGQs="; - "webYarnHash" = "164smvrq9937x0pql20zdqab5w35fcidbywkzlyc5g4w7iwkd9kx"; + "webSrcHash" = "sha256-kdjkmVkoJuV3SBFkVQr4IAi69mAs8V5i3qFOd66BP2s="; + "webYarnHash" = "sha256-in7qiGIXP+Ki820RB/uB2st2FIwrxjqYpdOmmLI6RSM="; }; } diff --git a/pkgs/by-name/fl/flashrom/package.nix b/pkgs/by-name/fl/flashrom/package.nix index 0b1af9f9f89b..87209a371b02 100644 --- a/pkgs/by-name/fl/flashrom/package.nix +++ b/pkgs/by-name/fl/flashrom/package.nix @@ -53,6 +53,10 @@ stdenv.mkDerivation rec { install -Dm644 util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules ''; + NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.cc.isClang && !stdenv.hostPlatform.isDarwin + ) "-Wno-gnu-folding-constant"; + meta = with lib; { homepage = "https://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 155acdbe28a4..54223b97e7f3 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-oTCGjDmGVovsfj+4fjIKy/xpiuYc0Q44LYwYPI4dSF8="; + hash = "sha256-H3wcKeHfAJNJAEtRcTU8rz93wug39TUqV3XN4wkTqMg="; }; # optional only to avoid linux rebuild diff --git a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix index 8c6146706d35..8ded3c1db399 100644 --- a/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix +++ b/pkgs/by-name/fl/flutter_rust_bridge_codegen/package.nix @@ -6,17 +6,17 @@ }: rustPlatform.buildRustPackage rec { pname = "flutter_rust_bridge_codegen"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "fzyzcjy"; repo = "flutter_rust_bridge"; rev = "v${version}"; - hash = "sha256-XHHgKwwGI0v6PD+KQBA8AvUBqUPxefxoJXcZDwjOemQ="; + hash = "sha256-I9IaBOqX93g5i26aMa/ICWKurX/82R9PvINNVWNQuNk="; fetchSubmodules = true; }; - cargoHash = "sha256-MDQFHQQWEStBwrwlGti5bY5HwACcrLrSR9Zs9DxTz/A="; + cargoHash = "sha256-VZ4suSaWg2TfBjcxTuV9Ptkq/rBNmhBygtjsi5twJrk="; cargoBuildFlags = "--package flutter_rust_bridge_codegen"; cargoTestFlags = "--package flutter_rust_bridge_codegen"; diff --git a/pkgs/by-name/fr/frida-tools/package.nix b/pkgs/by-name/fr/frida-tools/package.nix index 4da97c248be6..9cd64d846448 100644 --- a/pkgs/by-name/fr/frida-tools/package.nix +++ b/pkgs/by-name/fr/frida-tools/package.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "frida-tools"; - version = "13.6.0"; + version = "13.6.1"; src = fetchPypi { inherit pname version; - hash = "sha256-M0S8tZagToIP6Qyr9RWNAGGfWOcOtO0bYKC02IhCpvg="; + hash = "sha256-imNW0vorY90lp2OkhYLYwgpyW+Vxd1kdq3Lvd4/iNVA="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/fu/fum/package.nix b/pkgs/by-name/fu/fum/package.nix index 88766c821601..96d24f662394 100644 --- a/pkgs/by-name/fu/fum/package.nix +++ b/pkgs/by-name/fu/fum/package.nix @@ -11,16 +11,17 @@ }: rustPlatform.buildRustPackage rec { pname = "fum"; - version = "0.4.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "qxb3"; repo = "fum"; tag = "v${version}"; - hash = "sha256-VRcQWwO80xFn5A21yjRsGqnnWkhWfsJxxEiw78NWJPM="; + hash = "sha256-vBn76s2ewLVVYhyXviQUmq+AzH6FSVdJaTEJQ2EPlM0="; }; - cargoHash = "sha256-GW3/SqQlEUTMtvOgnMGhcREOHz/V2qtjtCAzFFKMNb4="; + useFetchCargoVendor = true; + cargoHash = "sha256-7h/KIAIxldXPXUo0lzuBqs6Uf5S5p39yV+kTfLe/LBo="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/gd/gdlauncher-carbon/package.nix b/pkgs/by-name/gd/gdlauncher-carbon/package.nix index b76ff180ac76..2bf6074c25fb 100644 --- a/pkgs/by-name/gd/gdlauncher-carbon/package.nix +++ b/pkgs/by-name/gd/gdlauncher-carbon/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdlauncher-carbon"; - version = "2.0.20"; + version = "2.0.22"; src = appimageTools.extract { inherit (finalAttrs) pname version; src = fetchurl { url = "https://cdn-raw.gdl.gg/launcher/GDLauncher__${finalAttrs.version}__linux__x64.AppImage"; - hash = "sha256-tI9RU8qO3MHbImOGw2Wl1dksNbhqrYFyGemqms8aAio="; + hash = "sha256-b1d39cSuVJ17rx8vjlYlyIUvqkBbhCWXuq4Z96K1I3M="; }; }; diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index a3b954862c1a..e51e4270535c 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -15,7 +15,7 @@ buildDotnetModule rec { hash = "sha256-hUURXPKhiI3n1BrW8IzVVmPuJyO4AxM8D5uluaJXk+4="; }; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; projectFile = "src/gei/gei.csproj"; nugetDeps = ./deps.json; # File generated with `nix-build -A gh-gei.passthru.fetch-deps`. diff --git a/pkgs/by-name/gl/glamoroustoolkit/package.nix b/pkgs/by-name/gl/glamoroustoolkit/package.nix index a9018cb1fda3..09262b7db87a 100644 --- a/pkgs/by-name/gl/glamoroustoolkit/package.nix +++ b/pkgs/by-name/gl/glamoroustoolkit/package.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.1.9"; + version = "1.1.11"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-dBUMn5KMSLTfmJnKTS6seEYDRy2JCiR+fi37UIUJ5aM="; + hash = "sha256-bb5tU4UtqdWcSqgl28V8IoATWx4TADxNFXkn9ljmw6Y="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix b/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix index 815252650fc7..722453d3cd2c 100644 --- a/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix +++ b/pkgs/by-name/gn/gnome-bluetooth_1_0/package.nix @@ -6,6 +6,7 @@ gnome, adwaita-icon-theme, meson, + mesonEmulatorHook, ninja, pkg-config, gtk3, @@ -51,20 +52,24 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ - meson - ninja - gettext - itstool - pkg-config - libxml2 - wrapGAppsHook3 - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - python3 - ]; + nativeBuildInputs = + [ + meson + ninja + gettext + itstool + pkg-config + libxml2 + wrapGAppsHook3 + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + python3 + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ]; buildInputs = [ glib @@ -86,6 +91,8 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs meson_post_install.py ''; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-bluetooth"; diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index bd2c9439a708..214a337d1716 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -4,7 +4,6 @@ buildPackages, dbus, dotnet-sdk_6, - dotnet-sdk_8, dotnetCorePackages, fetchFromGitHub, fontconfig, @@ -60,6 +59,8 @@ let arch = stdenv.hostPlatform.linuxArch; + dotnet-sdk = dotnetCorePackages.sdk_8_0-source; + attrs = finalAttrs: rec { pname = "godot4${suffix}"; version = "4.3-stable"; @@ -154,7 +155,7 @@ let ] ++ lib.optionals withWayland [ wayland-scanner ] ++ lib.optionals withMono [ - dotnet-sdk_8 + dotnet-sdk makeWrapper ]; @@ -222,10 +223,10 @@ let + lib.optionalString withMono '' cp -r bin/GodotSharp/ $out/bin/ wrapProgram $out/bin/godot4${suffix} \ - --set DOTNET_ROOT ${dotnet-sdk_8} \ + --set DOTNET_ROOT ${dotnet-sdk} \ --prefix PATH : "${ lib.makeBinPath [ - dotnet-sdk_8 + dotnet-sdk ] }" '' diff --git a/pkgs/by-name/go/gollum/Gemfile.lock b/pkgs/by-name/go/gollum/Gemfile.lock index 90fe5379264a..a0e51e614658 100644 --- a/pkgs/by-name/go/gollum/Gemfile.lock +++ b/pkgs/by-name/go/gollum/Gemfile.lock @@ -5,14 +5,15 @@ GEM asciidoctor (2.0.23) base64 (0.2.0) builder (3.3.0) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) crass (1.0.6) creole (0.5.0) + date (3.4.1) expression_parser (0.9.0) gemojione (4.3.3) json github-markup (4.0.2) - gollum (6.0.1) + gollum (6.1.0) gemojione (~> 4.1) gollum-lib (~> 6.0) i18n (~> 1.8) @@ -45,82 +46,85 @@ GEM htmlentities (4.3.4) i18n (1.14.6) concurrent-ruby (~> 1.0) - json (2.7.4) - kramdown (2.4.0) - rexml + json (2.9.1) + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - logger (1.6.1) - loofah (2.23.1) + logger (1.6.5) + loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) mime-types (3.6.0) logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.1001) - mini_portile2 (2.8.7) + mime-types-data (3.2025.0107) + mini_portile2 (2.8.8) multi_json (1.15.0) mustache (1.1.1) mustache-sinatra (2.0.0) mustache (~> 1.0) mustermann (3.0.3) ruby2_keywords (~> 0.0.1) - nokogiri (1.16.7) + nokogiri (1.18.1) mini_portile2 (~> 2.8.2) racc (~> 1.4) - octicons (19.12.0) + octicons (19.14.0) org-ruby (0.9.12) rubypants (~> 0.2) - psych (5.1.2) + psych (5.2.3) + date stringio racc (1.8.1) rack (3.1.8) - rack-protection (4.0.0) + rack-protection (4.1.1) base64 (>= 0.1.0) + logger (>= 1.6.0) rack (>= 3.0.0, < 4) - rack-session (2.0.0) + rack-session (2.1.0) + base64 (>= 0.1.0) rack (>= 3.0.0) - rackup (2.1.0) + rackup (2.2.1) rack (>= 3) - webrick (~> 1.8) - rdoc (6.7.0) + rdoc (6.11.0) psych (>= 4.0.0) - rexml (3.3.9) + rexml (3.4.0) rouge (3.30.0) rss (0.3.1) rexml ruby2_keywords (0.0.5) rubypants (0.7.1) - rugged (1.7.2) - sinatra (4.0.0) + rugged (1.9.0) + sinatra (4.1.1) + logger (>= 1.6.0) mustermann (~> 3.0) rack (>= 3.0.0, < 4) - rack-protection (= 4.0.0) + rack-protection (= 4.1.1) rack-session (>= 2.0.0, < 3) tilt (~> 2.0) - sinatra-contrib (4.0.0) + sinatra-contrib (4.1.1) multi_json (>= 0.0.2) mustermann (~> 3.0) - rack-protection (= 4.0.0) - sinatra (= 4.0.0) + rack-protection (= 4.1.1) + sinatra (= 4.1.1) tilt (~> 2.0) sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-helpers (1.4.0) sprockets (>= 2.2) - stringio (3.1.1) + stringio (3.1.2) therubyrhino (2.1.2) therubyrhino_jar (>= 1.7.4, < 1.7.9) therubyrhino_jar (1.7.8) - tilt (2.4.0) + tilt (2.6.0) twitter-text (1.14.7) unf (~> 0.1.0) unf (0.1.4) unf_ext unf_ext (0.0.9.1) - useragent (0.16.10) - webrick (1.8.2) + useragent (0.16.11) + webrick (1.9.1) wikicloth (0.8.3) builder expression_parser @@ -140,4 +144,4 @@ DEPENDENCIES wikicloth BUNDLED WITH - 2.5.16 + 2.5.22 diff --git a/pkgs/by-name/go/gollum/gemset.nix b/pkgs/by-name/go/gollum/gemset.nix index 8ee71b2e826d..c8dab484b3c2 100644 --- a/pkgs/by-name/go/gollum/gemset.nix +++ b/pkgs/by-name/go/gollum/gemset.nix @@ -34,10 +34,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; crass = { groups = [ "default" ]; @@ -59,6 +59,16 @@ }; version = "0.5.0"; }; + date = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; + type = "gem"; + }; + version = "3.4.1"; + }; expression_parser = { groups = [ "default" ]; platforms = [ ]; @@ -115,10 +125,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01gk8zb1mfr7ypspbg765fn3m6rdh0b6jpyxfninabl9dzazyvpi"; + sha256 = "1djb0mr4csfpas1aq19yv3d04hw6vxxpgbffp2bsp0p0p1h51far"; type = "gem"; }; - version = "6.0.1"; + version = "6.1.0"; }; gollum-lib = { dependencies = [ @@ -179,10 +189,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1klf2mnfilzjqwcjdi5qb1zl3ghrifz1amcnvwjvsfnx9a5jb9ly"; + sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj"; type = "gem"; }; - version = "2.7.4"; + version = "2.9.1"; }; kramdown = { dependencies = [ "rexml" ]; @@ -190,10 +200,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; + sha256 = "131nwypz8b4pq1hxs6gsz3k00i9b75y3cgpkq57vxknkv6mvdfw7"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.1"; }; kramdown-parser-gfm = { dependencies = [ "kramdown" ]; @@ -211,10 +221,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s"; + sha256 = "0sz584vw17pwrrc5zg6yd8lqcgfpjf4qplq3s7fr0r3505nybky3"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.5"; }; loofah = { dependencies = [ @@ -225,10 +235,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ppp2cgli5avzk0z3dwnah6y65ymyr793yja28p2fs9vrci7986h"; + sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1"; type = "gem"; }; - version = "2.23.1"; + version = "2.24.0"; }; mime-types = { dependencies = [ @@ -249,20 +259,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06dbn0j13jwdrmlvrjd50mxqrjlkh3lvxp0afh4glyzbliqvqpsd"; + sha256 = "1jixfirdang1lx9iqkcw03mz43pi4vxlfpb8ha4sbz4cqry4jai3"; type = "gem"; }; - version = "3.2024.1001"; + version = "3.2025.0107"; }; mini_portile2 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.7"; + version = "2.8.8"; }; multi_json = { groups = [ "default" ]; @@ -315,20 +325,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; + sha256 = "0xc4qs4izky1zgafabzykbxk8lc4dq6aivgxmfv3ciy3jrzbw66z"; type = "gem"; }; - version = "1.16.7"; + version = "1.18.1"; }; octicons = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00ld13van1xiayr24gwpbxfb63zbw44fx25xs9cp29g6cdzi5hrp"; + sha256 = "0a1gvsr0fcxl7z8mnflr1lmmvknr11l05x9rg3c21dnnk6rnain7"; type = "gem"; }; - version = "19.12.0"; + version = "19.14.0"; }; org-ruby = { dependencies = [ "rubypants" ]; @@ -342,15 +352,18 @@ version = "0.9.12"; }; psych = { - dependencies = [ "stringio" ]; + dependencies = [ + "date" + "stringio" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; + sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4"; type = "gem"; }; - version = "5.1.2"; + version = "5.2.3"; }; racc = { groups = [ "default" ]; @@ -375,41 +388,42 @@ rack-protection = { dependencies = [ "base64" + "logger" "rack" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xmvcxgm1jq92hqxm119gfk95wzl0d46nb2c2c6qqsm4ra2n3nyh"; + sha256 = "0sniswjyi0yn949l776h7f67rvx5w9f04wh69z5g19vlsnjm98ji"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.1"; }; rack-session = { + dependencies = [ + "base64" + "rack" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1452c1bhh6fdnv17s1z65ajwh08axqnlmkhnr1qyyn2vacb3jz23"; + type = "gem"; + }; + version = "2.1.0"; + }; + rackup = { dependencies = [ "rack" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10afdpmy9kh0qva96slcyc59j4gkk9av8ilh58cnj0qq7q3b416v"; + sha256 = "13brkq5xkj6lcdxj3f0k7v28hgrqhqxjlhd4y2vlicy5slgijdzp"; type = "gem"; }; - version = "2.0.0"; - }; - rackup = { - dependencies = [ - "rack" - "webrick" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kbcka30g681cqasw47pq93fxjscq7yvs5zf8lp3740rb158ijvf"; - type = "gem"; - }; - version = "2.1.0"; + version = "2.2.1"; }; rdoc = { dependencies = [ "psych" ]; @@ -417,10 +431,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi"; + sha256 = "0h00mb8wcj937srrafpjzq0klfi8rfpd4b3xpbvn9ghrn2wnzimy"; type = "gem"; }; - version = "6.7.0"; + version = "6.11.0"; }; RedCloth = { groups = [ "default" ]; @@ -437,10 +451,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; + sha256 = "1ch4k2y80r4glr579kxliqnxld2qa91ydq8fiqam38bzpbps3gpg"; type = "gem"; }; - version = "3.3.9"; + version = "3.4.0"; }; rouge = { groups = [ "default" ]; @@ -488,13 +502,14 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sccng15h8h3mcjxfgvxy85lfpswbj0nhmzwwsqdffbzqgsb2jch"; + sha256 = "1b7gcf6pxg4x607bica68dbz22b4kch33yi0ils6x3c8ql9akakz"; type = "gem"; }; - version = "1.7.2"; + version = "1.9.0"; }; sinatra = { dependencies = [ + "logger" "mustermann" "rack" "rack-protection" @@ -505,10 +520,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0za92lv4s7xhgkkm6xxf7ib0b3bsyj8drxgkrskgsb5g3mxnixjl"; + sha256 = "002dkzdc1xqhvz5sdnj4vb0apczhs07mnpgq4kkd5dd1ka2pp6af"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.1"; }; sinatra-contrib = { dependencies = [ @@ -522,10 +537,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0r9khg85m60w0i77jpnm2irh9m4k0ia4mlicapj8dr7s6ykqd9dh"; + sha256 = "1giziwf8mgki581jf40zzw3dhjkkmdg3yxbrahj9krd5h24vb90y"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.1"; }; sprockets = { dependencies = [ @@ -557,10 +572,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; + sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.2"; }; therubyrhino = { dependencies = [ "therubyrhino_jar" ]; @@ -588,10 +603,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kds7wkxmb038cwp6ravnwn8k65ixc68wpm8j5jx5bhx8ndg4x6z"; + sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96"; type = "gem"; }; - version = "2.4.0"; + version = "2.6.0"; }; twitter-text = { dependencies = [ "unf" ]; @@ -630,20 +645,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fv5kvq494swy0p17h9qya9r50w15xsi9zmvhzb8gh55kq6ki50p"; + sha256 = "0i1q2xdjam4d7gwwc35lfnz0wyyzvnca0zslcfxm9fabml9n83kh"; type = "gem"; }; - version = "0.16.10"; + version = "0.16.11"; }; webrick = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; + sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; type = "gem"; }; - version = "1.8.2"; + version = "1.9.1"; }; wikicloth = { dependencies = [ diff --git a/pkgs/by-name/gp/gpsprune/package.nix b/pkgs/by-name/gp/gpsprune/package.nix index 333092fdba0e..802f9ad4aaf4 100644 --- a/pkgs/by-name/gp/gpsprune/package.nix +++ b/pkgs/by-name/gp/gpsprune/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "24.5"; + version = "25"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - hash = "sha256-qQtMSQbhIgYLJbCip6ioWeVphO1DEYudmXKUer04L4Y="; + hash = "sha256-8FGOigjHIvj+CZwq0Lht7UZjtmrE5l2Aqx92gZjau44="; }; dontUnpack = true; diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index fa7bab1cde8b..b01e93c958a5 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -64,10 +64,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Helper for screenshots within Hyprland, based on grimshot"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ - donovanglover - khaneliman - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "grimblast"; }; }) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index b36e969e71fb..2064ddb337db 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-cUN7e82CncDzA9m+pcvtrAn10E6AYaMcAuu6hpt85tA="; + hash = "sha256-phwFwrRuMPWPaPKi41G/YQfiRWFfNCir9478VrGckWI="; }; - cargoHash = "sha256-lo3Ye7u26xLqlu/R4klYd2X9G73119XtWaJzVkl85+g="; + cargoHash = "sha256-o2ydYm4ARA7NLcsNtN8oXiVaIv3D+RhW4tC5Btwd4nY="; meta = { description = "Grammar Checker for Developers"; diff --git a/pkgs/by-name/ht/httpx/package.nix b/pkgs/by-name/ht/httpx/package.nix index c1f038cf6515..108db308b234 100644 --- a/pkgs/by-name/ht/httpx/package.nix +++ b/pkgs/by-name/ht/httpx/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.6.9"; + version = "1.6.10"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; tag = "v${version}"; - hash = "sha256-fkHMtFshRNtRhsxjbYOkeL2cln84NAa01jcGKips5Kk="; + hash = "sha256-lU5LtYFnWJu4yZTqdJFqLnaAUOQ3Nc2EaNPrvTxoW3Q="; }; - vendorHash = "sha256-zTPJtuKPtsVsgMwHFjVwAh1/3DudW7TPWOMJ20nNu1I="; + vendorHash = "sha256-+m0TPKIBCnRfswrMw9+w1r/pWaRmkI+s0RRbv5X5GBo="; subPackages = [ "cmd/httpx" ]; diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix index a501314bcd91..05e8cc9c7911 100644 --- a/pkgs/by-name/hy/hyprcursor/package.nix +++ b/pkgs/by-name/hy/hyprcursor/package.nix @@ -50,7 +50,11 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland cursor format, library and utilities"; changelog = "https://github.com/hyprwm/hyprcursor/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ iynaix ]; + maintainers = + lib.teams.hyprland.members + ++ (with lib.maintainers; [ + iynaix + ]); mainProgram = "hyprcursor-util"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix index 43eb8f4b7e7d..b6cf9820f4e8 100644 --- a/pkgs/by-name/hy/hyprgraphics/package.nix +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -51,9 +51,6 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Official implementation library for the hypr config language"; license = lib.licenses.lgpl3Only; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ - fufexan - khaneliman - ]; + maintainers = lib.teams.hyprland.members; }; }) diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index aa9e74b0ce55..19697748d968 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -48,11 +48,11 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland's idle daemon"; homepage = "https://github.com/hyprwm/hypridle"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - iogamaster - johnrtitor - khaneliman - ]; + maintainers = + lib.teams.hyprland.members + ++ (with lib.maintainers; [ + iogamaster + ]); mainProgram = "hypridle"; platforms = [ "aarch64-linux" diff --git a/pkgs/by-name/hy/hyprland-protocols/package.nix b/pkgs/by-name/hy/hyprland-protocols/package.nix index 87c9c21036e0..814f3bd94857 100644 --- a/pkgs/by-name/hy/hyprland-protocols/package.nix +++ b/pkgs/by-name/hy/hyprland-protocols/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/hyprwm/hyprland-protocols"; description = "Wayland protocol extensions for Hyprland"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fufexan ]; + maintainers = lib.teams.hyprland.members; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/hy/hyprland-qtutils/package.nix b/pkgs/by-name/hy/hyprland-qtutils/package.nix index 779a186bea73..f1109b56cebf 100644 --- a/pkgs/by-name/hy/hyprland-qtutils/package.nix +++ b/pkgs/by-name/hy/hyprland-qtutils/package.nix @@ -43,7 +43,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland QT/qml utility apps"; homepage = "https://github.com/hyprwm/hyprland-qtutils"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.fufexan ]; + maintainers = lib.teams.hyprland.members; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 18a8ceb32d97..e77644544c14 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.46.2-b", - "commit_hash": "0bd541f2fd902dbfa04c3ea2ccf679395e316887", - "commit_message": "version: bump to 0.46.2", - "date": "2024-12-19", - "tag": "v0.46.2" + "branch": "main", + "commit_hash": "04ac46c54357278fc68f0a95d26347ea0db99496", + "commit_message": "version: bump to 0.47.0", + "date": "2025-01-27", + "tag": "v0.47.0" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index ad06666d3237..2b1c9475c2e5 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -13,6 +13,7 @@ cairo, epoll-shim, git, + glaze, hyprcursor, hyprgraphics, hyprland-qtutils, @@ -85,14 +86,14 @@ assert assertMsg (!hidpiXWayland) customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.46.2"; + version = "0.47.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-dj9dpVwpyTmUyVu4jtaIU39bHgVkoZjv6cgYfWyHc9E="; + hash = "sha256-rxvLiGNRUSVYPFsKIsqEbhxpR0sbWmHoo3azZKQ9fTY="; }; postPatch = '' @@ -143,6 +144,7 @@ customStdenv.mkDerivation (finalAttrs: { [ aquamarine cairo + glaze git hyprcursor.dev hyprgraphics @@ -215,12 +217,7 @@ customStdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/hyprwm/Hyprland"; description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - khaneliman - wozeparrot - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "Hyprland"; platforms = lib.platforms.linux ++ lib.platforms.freebsd; }; diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index 0cbd1babd340..d4dbe9584dd8 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -39,9 +39,10 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Official implementation library for the hypr config language"; license = lib.licenses.lgpl3Only; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ - iogamaster - fufexan - ]; + maintainers = + lib.teams.hyprland.members + ++ (with lib.maintainers; [ + iogamaster + ]); }; }) diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index e93cdcaceca0..6ee11eef131f 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -70,10 +70,11 @@ gcc14Stdenv.mkDerivation (finalAttrs: { description = "Hyprland's GPU-accelerated screen locking utility"; homepage = "https://github.com/hyprwm/hyprlock"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - iynaix - johnrtitor - ]; + maintainers = + lib.teams.hyprland.members + ++ (with lib.maintainers; [ + iynaix + ]); mainProgram = "hyprlock"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index bbf718c12f11..3d04aa0caa41 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -82,11 +82,7 @@ gcc14Stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs.src.meta) homepage; description = "Blazing fast wayland wallpaper utility"; license = licenses.bsd3; - maintainers = with maintainers; [ - fufexan - khaneliman - wozeparrot - ]; + maintainers = lib.teams.hyprland.members; inherit (wayland.meta) platforms; broken = gcc14Stdenv.hostPlatform.isDarwin; mainProgram = "hyprpaper"; diff --git a/pkgs/by-name/hy/hyprpicker/package.nix b/pkgs/by-name/hy/hyprpicker/package.nix index f053be81f95a..72ca3b69676b 100644 --- a/pkgs/by-name/hy/hyprpicker/package.nix +++ b/pkgs/by-name/hy/hyprpicker/package.nix @@ -61,10 +61,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Wlroots-compatible Wayland color picker that does not suck"; homepage = "https://github.com/hyprwm/hyprpicker"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - khaneliman - ]; + maintainers = lib.teams.hyprland.members; platforms = wayland.meta.platforms; mainProgram = "hyprpicker"; }; diff --git a/pkgs/by-name/hy/hyprpolkitagent/package.nix b/pkgs/by-name/hy/hyprpolkitagent/package.nix index 056bd0d3aad4..f63a95a4c04b 100644 --- a/pkgs/by-name/hy/hyprpolkitagent/package.nix +++ b/pkgs/by-name/hy/hyprpolkitagent/package.nix @@ -40,10 +40,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Polkit authentication agent written in QT/QML"; homepage = "https://github.com/hyprwm/hyprpolkitagent"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "hyprpolkitagent"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/hy/hyprprop/package.nix b/pkgs/by-name/hy/hyprprop/package.nix index f50e592506f6..e69670eb254e 100644 --- a/pkgs/by-name/hy/hyprprop/package.nix +++ b/pkgs/by-name/hy/hyprprop/package.nix @@ -65,7 +65,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "An xprop replacement for Hyprland"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ khaneliman ]; + maintainers = lib.teams.hyprland.members; mainProgram = "hyprprop"; }; }) diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix index 56755a513954..40ebdae92ef5 100644 --- a/pkgs/by-name/hy/hyprsunset/package.nix +++ b/pkgs/by-name/hy/hyprsunset/package.nix @@ -53,10 +53,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Application to enable a blue-light filter on Hyprland"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "hyprsunset"; }; }) diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index dec697da74fd..7f2760e90292 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.3.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps="; + hash = "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA="; }; nativeBuildInputs = [ @@ -42,9 +42,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Small C++ library for utilities used across the Hypr* ecosystem"; license = lib.licenses.bsd3; platforms = lib.platforms.linux ++ lib.platforms.freebsd; - maintainers = with lib.maintainers; [ - donovanglover - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; }; }) diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index ff72717819f7..1e32eaa1f736 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -36,10 +36,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Hyprland version of wayland-scanner in and for C++"; changelog = "https://github.com/hyprwm/hyprwayland-scanner/releases/tag/${finalAttrs.version}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - fufexan - johnrtitor - ]; + maintainers = lib.teams.hyprland.members; mainProgram = "hyprwayland-scanner"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 199e2283252f..be53054ff9d6 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.125.3", - "hash": "sha256-lDk2Pj+wspzeRVccWOJ1Xp4E72jlkJBU3G5djFNNHYw=", + "version": "1.125.6", + "hash": "sha256-8rVpXo4pASKA5UTUGh3yHd5J7JPQe0kYOPQ/0hMED24=", "components": { "cli": { - "npmDepsHash": "sha256-l4h6aTgGGZf84LpmaN9XLiw99pgo4JN8zfBXvyE438Y=", - "version": "2.2.44" + "npmDepsHash": "sha256-DqyA/J90+PsjWiwXyGML0gJqYL8jBRR99SxoG0acxqY=", + "version": "2.2.47" }, "server": { - "npmDepsHash": "sha256-v21BjA7+zOPQtZNH06q4+x/EvcNVi/4T1Zi4LMgYZUU=", - "version": "1.125.3" + "npmDepsHash": "sha256-4+G4mIxABb2Rr9HqbfzB2B7gwBLMlwZTDnH11Oi7kMc=", + "version": "1.125.6" }, "web": { - "npmDepsHash": "sha256-H32WmL7C+I03i3LSfs87Wyj/TMubqF1Nz7/VEj25aeI=", - "version": "1.125.3" + "npmDepsHash": "sha256-iMFKWgYlCCdjGnnYx0vB5Vl4+d4ftPjPRenHQDPePSU=", + "version": "1.125.6" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-HpLw4I7KEap45HnRcA4u1PA8qM2HvSeF5hLkar20bns=", - "version": "1.125.3" + "npmDepsHash": "sha256-nZTg6PmuMDqCFOoz+3INyRUMdbUKAqvkl+EHVkPZXoQ=", + "version": "1.125.6" }, "geonames": { - "timestamp": "20250126191509", - "hash": "sha256-uzKJJTN9TZCAgEtePI2RGZWTNGKdhmup4RHNVMGfQ48=" + "timestamp": "20250128052059", + "hash": "sha256-QnDkaqJbOpaROXZRtr1nLJxtd70YULEuNqLlwgN/9lY=" } } } diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index 70d9cf242b53..28df57aae22a 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.479.2"; + version = "2.479.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-F3wsAz8NOuQUjmAdD9raYBEtg/JQUh86Cg/ZfLsTjb0="; + hash = "sha256-MEyFkoYNWwPewnyWteiexY/HRPeBYcU/ejRKC/fOkgM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix index 08df492acd72..0fcefd35c5ce 100644 --- a/pkgs/by-name/ka/kanata/package.nix +++ b/pkgs/by-name/ka/kanata/package.nix @@ -22,28 +22,8 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-cG9so0x0y8CbTxLOxSQwn5vG72KxHJzzTIH4lQA4MvE="; }; - cargoHash = "sha256-QQrFUJ24Qnrx8+7+h9riycXZSQUdH1sXMhpDzU9AXiI="; - - # the dependency native-windows-gui contains both README.md and readme.md, - # which causes a hash mismatch on systems with a case-insensitive filesystem - # this removes the readme files and updates cargo's checksum file accordingly - depsExtraArgs = { - nativeBuildInputs = [ - jq - moreutils - ]; - - postBuild = '' - pushd $name/native-windows-gui - - rm --force --verbose README.md readme.md - jq 'del(.files."README.md") | del(.files."readme.md")' \ - .cargo-checksum.json -c \ - | sponge .cargo-checksum.json - - popd - ''; - }; + useFetchCargoVendor = true; + cargoHash = "sha256-VKvle1hQae+0Vbvd7Epq3cDqG8OV5J2mowF5lue59oc="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.IOKit ]; diff --git a/pkgs/by-name/ka/kanidm/1_3.nix b/pkgs/by-name/ka/kanidm/1_3.nix index 8d4d310ac713..f0f708eba357 100644 --- a/pkgs/by-name/ka/kanidm/1_3.nix +++ b/pkgs/by-name/ka/kanidm/1_3.nix @@ -1,7 +1,7 @@ import ./generic.nix { version = "1.3.3"; hash = "sha256-W5G7osV4du6w/BfyY9YrDzorcLNizRsoz70RMfO2AbY="; - cargoHash = "sha256-iziTHr0gvv319Rzgkze9J1H4UzPR7WxMmCkiGVsb33k="; + cargoHash = "sha256-QgEoeXjGm7fhPnJBbquWJYDYPg+Uv1IjZnaI5yUEYlQ="; patchDir = ./patches/1_3; extraMeta = { knownVulnerabilities = [ diff --git a/pkgs/by-name/ka/kanidm/1_4.nix b/pkgs/by-name/ka/kanidm/1_4.nix index 1b1b941905bf..a87b8eb4f11e 100644 --- a/pkgs/by-name/ka/kanidm/1_4.nix +++ b/pkgs/by-name/ka/kanidm/1_4.nix @@ -1,6 +1,6 @@ import ./generic.nix { version = "1.4.6"; hash = "sha256-pjJyq52wO5p34LN2Jmt0npgWBDcWin8gIX4skZ7Ff8E="; - cargoHash = "sha256-XyyvXxZOvaxSzH8Jd23IxE4Wyd/6h5N3HRVEvdQ8RtY="; + cargoHash = "sha256-33HRoH/vWPe/wOZJtQLWV9eBocbj0iR/XUu4zMehu8M="; patchDir = ./patches/1_4; } diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/by-name/ka/kanidm/generic.nix index 5c0a04bcbc2b..8512f1fc357c 100644 --- a/pkgs/by-name/ka/kanidm/generic.nix +++ b/pkgs/by-name/ka/kanidm/generic.nix @@ -38,6 +38,7 @@ in rustPlatform.buildRustPackage rec { pname = "kanidm" + (lib.optionalString enableSecretProvisioning "-with-secret-provisioning"); inherit version cargoHash; + useFetchCargoVendor = true; cargoDepsName = "kanidm"; src = fetchFromGitHub { diff --git a/pkgs/by-name/li/libdaemon/package.nix b/pkgs/by-name/li/libdaemon/package.nix index 796cb02ea03f..15b3790a3c94 100644 --- a/pkgs/by-name/li/libdaemon/package.nix +++ b/pkgs/by-name/li/libdaemon/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { [ "--disable-lynx" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Can't run this test while cross-compiling - "ac_cv_func_setpgrp_void=yes" + "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" ]; meta = { diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix index a7ab3ed42e53..243d68d8dc69 100644 --- a/pkgs/by-name/li/libloot/package.nix +++ b/pkgs/by-name/li/libloot/package.nix @@ -150,7 +150,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-qJ7gC4BkrXJiVcyA1BqlJSRzgc/7VmNBHtDq0ouJoTU="; }; - cargoHash = "sha256-x4LFO6dD3bBKv6gTrNUAo7Rdw5cP67gn44QP6Iwbv0I="; + useFetchCargoVendor = true; + cargoHash = "sha256-m3lyABr7tU0AeC6EZomBw1X722ezQg/cjSZh/ZhkiBw="; lang = "c++"; header = "libloadorder.hpp"; @@ -167,7 +168,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ygjSyixg+9HFFNV/G+w+TxGFTrjlWxlDt8phpCE8xyQ="; }; - cargoHash = "sha256-39iod83yVU5PyIjwv7pLLuMeNw9fHiM0tXDauyGrbx8="; + useFetchCargoVendor = true; + cargoHash = "sha256-6sY2M7kjSYB3+6+zoMxPwdl+g7ARLHm9RdSODHQR8bE="; lang = "c++"; header = "esplugin.hpp"; @@ -184,7 +186,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-yXbe7ByYHvFpokRpV2pz2SX0986dpk5IpehwDUhoZKg="; }; - cargoHash = "sha256-p+raWZkW16MrvfZhJigSPth8pZZ68twU1+0GL/Mo1Xw="; + useFetchCargoVendor = true; + cargoHash = "sha256-d3JBpYI4XMkDnufvdyZkgtp7H4amMzM0dBEO6t9efGE="; lang = "c"; header = "loot_condition_interpreter.h"; diff --git a/pkgs/by-name/ma/mallard-ducktype/package.nix b/pkgs/by-name/ma/mallard-ducktype/package.nix new file mode 100644 index 000000000000..7a9f1f890e8f --- /dev/null +++ b/pkgs/by-name/ma/mallard-ducktype/package.nix @@ -0,0 +1,4 @@ +{ python3 }: + +with python3.pkgs; +toPythonApplication mallard-ducktype diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index 52fa8ca72ca1..fff84963849e 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -11,7 +11,7 @@ let version = "0.4.43"; in -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { inherit version; pname = "mdbook"; @@ -22,7 +22,11 @@ rustPlatform.buildRustPackage { hash = "sha256-aADNcuIeDef9+a3NOWQxo6IRnKJ6AbkvE4GqvFbubyI="; }; - cargoHash = "sha256-8K72sJywMKxX/31SJuCEoacWvHrpkuwGGLXJ9MsDkTE="; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + allowGitDependencies = false; + hash = "sha256-W5hg6ECNQRIh07ogZkXTn51el2YltutY86aJBYFDTP4="; + }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index 5a6fd3936a24..68f344c35841 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -8,23 +8,23 @@ let hlsJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.19/dist/hls.min.js"; - hash = "sha256-KTlFB7LXpglQPzIzKajKy3DJRGDURwP4hcmRm7Oy/a8="; + url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.20/dist/hls.min.js"; + hash = "sha256-0BbBIwSW7lnz9bAcFszkzAG1odPTV63sIAyQixMevkk="; }; in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-8/RTdcq8r5yMu586iDNyC/Cfi0PydX7QkU52noQR18Y="; + hash = "sha256-+NT3YheDdlTPnyGLUl9mpyYx2kvN1lw2jDRdAboTSdc="; }; - vendorHash = "sha256-Laos5sTQjtweC4GLuQuK2J/trObPlCmoHSUw4shVP4k="; + vendorHash = "sha256-aDBjxt3f7z/9LwYJ5KyteODGFO5u+7m/rovOd9363Fg="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 925dd9ae63e8..065e886a149e 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "1.0rc-unstable-2024-12-26"; + version = "1.0rc-unstable-2025-01-17"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "0c5dd28b1c5c1d17a2ce87efbd858059a8f9376f"; - hash = "sha256-hIpIt+krUpSW1T05Vq02IU5Lfaj4Sgg18qMoMH45NaE="; + rev = "15c3faa26e879bdcff615558ded6dd886681ccae"; + hash = "sha256-X9UqAAsACc3vVaWKNvT+swZXygIvaWOgFRUFzSAMjGM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 3fcea059026f..8d7541949160 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -168,11 +168,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "131.0.2903.112"; + version = "132.0.2957.127"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-4qQNcoBXOS4Uz+MR4jItOgcnMKqB6J541cvrb5md/oc="; + hash = "sha256-uoC8oxkrMWgmkUbgn7OP21lpEadKZmb4Heb32zEvdjE="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index ae8723448ac1..2a44b0bf8962 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -6,6 +6,8 @@ nixosTests, boost, cmake, + coreutils, + dbus, glib, glm, gtest, @@ -16,29 +18,31 @@ libuuid, libxkbcommon, libgbm, + makeWrapper, mir, nlohmann_json, pcre2, pkg-config, + systemd, wayland, yaml-cpp, }: stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "miracle-wm-org"; repo = "miracle-wm"; - rev = "v${finalAttrs.version}"; - hash = "sha256-IuYRgQm3DM6ZgsfRt37GCXC3hb1vGIrqw7WxYN+Bets="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LPcVLpskpmHc8EzdNqMT6BnbY8Le/BVojpXPIqy6tGI="; }; postPatch = '' - substituteInPlace session/usr/local/share/wayland-sessions/miracle-wm.desktop.in \ - --replace-fail '@CMAKE_INSTALL_FULL_BINDIR@/miracle-wm' 'miracle-wm' + substituteInPlace CMakeLists.txt \ + --replace-fail 'DESTINATION /usr/lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' substituteInPlace CMakeLists.txt \ @@ -52,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + makeWrapper pkg-config ]; @@ -75,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ gtest ]; + cmakeFlags = [ + (lib.cmakeBool "SYSTEMD_INTEGRATION" true) + ]; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; checkPhase = '' @@ -85,6 +94,18 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; + postFixup = '' + patchShebangs $out/libexec/miracle-wm-session-setup + wrapProgram $out/libexec/miracle-wm-session-setup \ + --prefix PATH : "$out/bin:${ + lib.makeBinPath [ + coreutils # cat + dbus # dbus-update-activation-environment + systemd # systemctl + ] + }" + ''; + passthru = { updateScript = gitUpdater { rev-prefix = "v"; }; providedSessions = [ "miracle-wm" ]; diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix index 969cd4ad5a81..76ff28777862 100644 --- a/pkgs/by-name/mo/motif/package.nix +++ b/pkgs/by-name/mo/motif/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, fetchpatch, + buildPackages, pkg-config, libtool, xbitmaps, @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ + flex libtool xbitmaps libXext @@ -55,9 +57,35 @@ stdenv.mkDerivation rec { libXau ]; - postPatch = lib.optionalString (!demoSupport) '' - sed 's/\//' -i Makefile.{am,in} - ''; + strictDeps = true; + + postPatch = + '' + # File existence fails when cross-compiling - useless for Nix anyhow + substituteInPlace ./configure --replace-fail \ + 'as_fn_error $? "cannot check for file existence' '#' \ + --replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config' + '' + + lib.optionalString (!demoSupport) '' + sed 's/\//' -i Makefile.{am,in} + '' + # for cross builds, we must copy several build tools from a native build + # (and we must ensure they are not removed and recreated by make) + + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + cp "${buildPackages.motif}/lib/internals/makestrs" config/util/makestrs + substituteInPlace config/util/Makefile.in \ + --replace-fail '@rm -f makestrs$(EXEEXT)' "" \ + --replace-fail '$(AM_V_CCLD)$(LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)' "" + + cp "${buildPackages.motif}"/lib/internals/{wml,wmluiltok,wmldbcreate} tools/wml/ + substituteInPlace tools/wml/Makefile.in \ + --replace-fail '@rm -f wmldbcreate$(EXEEXT)' "" \ + --replace-fail '$(AM_V_CCLD)$(LINK) $(wmldbcreate_OBJECTS) $(wmldbcreate_LDADD) $(LIBS)' "" \ + --replace-fail '@rm -f wmluiltok$(EXEEXT)' "" \ + --replace-fail '$(AM_V_CCLD)$(LINK) $(wmluiltok_OBJECTS) $(wmluiltok_LDADD) $(LIBS)' "" \ + --replace-fail '@rm -f wml$(EXEEXT)' "" \ + --replace-fail '$(AM_V_CCLD)$(LINK) $(wml_OBJECTS) $(wml_LDADD) $(LIBS)' "" + ''; patches = [ ./Remove-unsupported-weak-refs-on-darwin.patch @@ -90,6 +118,11 @@ stdenv.mkDerivation rec { }) ]; + # provide correct configure answers for cross builds + configureFlags = [ + "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" + ]; + env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-function-declaration" @@ -99,6 +132,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # copy tools for cross builds + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + mkdir -p "$out/lib/internals" + cp config/util/makestrs tools/wml/{wml,wmluiltok,.libs/wmldbcreate} "$out/lib/internals" + ''; + meta = with lib; { homepage = "https://motif.ics.com"; description = "Unix standard widget-toolkit and window-manager"; diff --git a/pkgs/by-name/ms/msbuild/package.nix b/pkgs/by-name/ms/msbuild/package.nix index 2df76c872264..a694aa765bf7 100644 --- a/pkgs/by-name/ms/msbuild/package.nix +++ b/pkgs/by-name/ms/msbuild/package.nix @@ -2,7 +2,7 @@ let - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; xplat = fetchurl { url = "https://github.com/mono/msbuild/releases/download/v16.9.0/mono_msbuild_6.12.0.137.zip"; diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index e0fc11bb8223..074b1cccb387 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -17,6 +17,7 @@ xvfb-run, libadwaita, libxcvt, + libGL, libICE, libX11, libXcomposite, @@ -106,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ desktop-file-utils gettext + glib libxcvt meson ninja @@ -133,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { libdrm libei libdisplay-info + libGL libgudev libinput libstartup_notification @@ -175,10 +178,6 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "libadwaita-1.so.0" "${libadwaita}/lib/libadwaita-1.so.0" ''; - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. # TODO: Move this into a directory devhelp can find. @@ -189,6 +188,7 @@ stdenv.mkDerivation (finalAttrs: { PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; separateDebugInfo = true; + strictDeps = true; passthru = { libdir = "${finalAttrs.finalPackage}/lib/mutter-15"; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 132e119bd41a..2c1f0e246cc7 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -17,18 +17,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.73.1"; + version = "1.75.2"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-gPdJKVOZlizdS0o+2nBgCImnIhtHzRjE2xk0zJA52go="; + hash = "sha256-fIdwciI4QUNr2wNWiq7qT4c6aZeUnkaVhSkIgFO4Svw="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-Am9R2rfQiw1IPd22/UraqzEqvVeB5XuSrrLSYXWsWfU="; + hash = "sha256-rtXTAHZUeitQFTa1Tw6l4el+xWD2hLT+2wu2LXW80cE="; }; nativeBuildInputs = diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix index 216df3c3cf16..ed72a25dbf76 100644 --- a/pkgs/by-name/na/naps2/package.nix +++ b/pkgs/by-name/na/naps2/package.nix @@ -33,7 +33,7 @@ buildDotnetModule rec { inherit (combinePackages [ sdk_8_0 - sdk_6_0 + sdk_6_0-bin ]) packages targetPackages diff --git a/pkgs/by-name/ne/netlify-cli/package.nix b/pkgs/by-name/ne/netlify-cli/package.nix index f766204b4477..a785718790e9 100644 --- a/pkgs/by-name/ne/netlify-cli/package.nix +++ b/pkgs/by-name/ne/netlify-cli/package.nix @@ -11,16 +11,16 @@ buildNpmPackage rec { pname = "netlify-cli"; - version = "18.0.0"; + version = "18.0.2"; src = fetchFromGitHub { owner = "netlify"; repo = "cli"; tag = "v${version}"; - hash = "sha256-LGnFVg7c+CMgjxkVdy/rdoo6uU5HaOwGKRDHRe5Hz3Y="; + hash = "sha256-GykzaVJyiAH7L9afK+PdwkqImo80ldcx420pM8V4WBg="; }; - npmDepsHash = "sha256-ONLkCbmmY45/sRwaGUWhA187YVtCcdPVnD7ZMFoQ2Y0="; + npmDepsHash = "sha256-n6JUInqI4ioMTebYcJXJ1ff8MjUW/+Y3b2lS7zhuSdI="; inherit nodejs; diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix index c27d97088518..2f726ee47d65 100644 --- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix +++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix @@ -38,16 +38,20 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; + nativeBuildInputs = + [ + autoreconfHook + glib # for gdbus-codegen + pkg-config + ] + ++ lib.optionals withGnome [ + gtk4 # for gtk4-builder-tool + ]; buildInputs = [ networkmanager ppp - glib openssl nss ] @@ -67,6 +71,7 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; + strictDeps = true; passthru = { networkManagerPlugin = "VPN/nm-l2tp-service.name"; diff --git a/pkgs/by-name/ne/networkmanager-openconnect/package.nix b/pkgs/by-name/ne/networkmanager-openconnect/package.nix index c33ba6644f90..e4ec7fa5739b 100644 --- a/pkgs/by-name/ne/networkmanager-openconnect/package.nix +++ b/pkgs/by-name/ne/networkmanager-openconnect/package.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { buildInputs = [ - glib libxml2 openconnect networkmanager @@ -55,6 +54,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + glib intltool pkg-config file diff --git a/pkgs/by-name/ne/networkmanager-openvpn/package.nix b/pkgs/by-name/ne/networkmanager-openvpn/package.nix index 964a51ddab97..82e9c7b0149f 100644 --- a/pkgs/by-name/ne/networkmanager-openvpn/package.nix +++ b/pkgs/by-name/ne/networkmanager-openvpn/package.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gettext + glib pkg-config file libxml2 @@ -46,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { [ openvpn networkmanager - glib ] ++ lib.optionals withGnome [ gtk3 @@ -63,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: { "--enable-absolute-paths" ]; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = "NetworkManager-openvpn"; diff --git a/pkgs/by-name/ne/networkmanager-sstp/package.nix b/pkgs/by-name/ne/networkmanager-sstp/package.nix index 4a8a13ac3936..494f27b80571 100644 --- a/pkgs/by-name/ne/networkmanager-sstp/package.nix +++ b/pkgs/by-name/ne/networkmanager-sstp/package.nix @@ -29,18 +29,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-zd+g86cZLyibLhYLal6XzUb9wFu7kHROp0KzRM95Qng="; }; - nativeBuildInputs = [ - autoreconfHook - file - gettext - pkg-config - ]; + nativeBuildInputs = + [ + autoreconfHook + file + gettext + glib # for gdbus-codegen + pkg-config + ] + ++ lib.optionals withGnome [ + gtk4 # for gtk4-builder-tool + ]; buildInputs = [ sstp networkmanager - glib ppp ] ++ lib.optionals withGnome [ @@ -63,6 +67,8 @@ stdenv.mkDerivation rec { "--enable-absolute-paths" ]; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/by-name/ne/networkmanager-vpnc/package.nix b/pkgs/by-name/ne/networkmanager-vpnc/package.nix index 52f47d871199..76af39b9da20 100644 --- a/pkgs/by-name/ne/networkmanager-vpnc/package.nix +++ b/pkgs/by-name/ne/networkmanager-vpnc/package.nix @@ -35,12 +35,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file + glib ]; buildInputs = [ vpnc networkmanager - glib ] ++ lib.optionals withGnome [ gtk3 gtk4 @@ -55,6 +55,8 @@ stdenv.mkDerivation rec { "--enable-absolute-paths" ]; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/by-name/ne/networkminer/package.nix b/pkgs/by-name/ne/networkminer/package.nix index ff5d917ad7ac..88918a1b1115 100644 --- a/pkgs/by-name/ne/networkminer/package.nix +++ b/pkgs/by-name/ne/networkminer/package.nix @@ -21,7 +21,7 @@ buildDotnetModule rec { sha256 = "1n2312acq5rq0jizlcfk0crslx3wgcsd836p47nk3pnapzw0cqvv"; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; nativeBuildInputs = [ unzip diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix index 6ccff3cce505..870ad9692f92 100644 --- a/pkgs/by-name/ni/nimlangserver/package.nix +++ b/pkgs/by-name/ni/nimlangserver/package.nix @@ -6,7 +6,7 @@ buildNimPackage ( final: prev: rec { pname = "nimlangserver"; - version = "1.8.0"; + version = "1.8.1"; # nix build ".#nimlangserver.src" # nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --prefetch-git:bearssl,zlib @@ -16,7 +16,7 @@ buildNimPackage ( owner = "nim-lang"; repo = "langserver"; rev = "v${version}"; - hash = "sha256-JyBjHAP/sxQfQ1XvyeZyHsu0Er5D7ePDGyJK7Do5kyk="; + hash = "sha256-j5YnTGPtt0WhRvNfpgO9tjAqZJA5Kt1FE1Mjqn0/DNY="; }; doCheck = false; diff --git a/pkgs/by-name/ni/nixpkgs-hammering/package.nix b/pkgs/by-name/ni/nixpkgs-hammering/package.nix index 575d213de0c9..4a689578ca22 100644 --- a/pkgs/by-name/ni/nixpkgs-hammering/package.nix +++ b/pkgs/by-name/ni/nixpkgs-hammering/package.nix @@ -10,13 +10,13 @@ }: let - version = "unstable-2024-03-25"; + version = "0-unstable-2024-12-22"; src = fetchFromGitHub { owner = "jtojnar"; repo = "nixpkgs-hammering"; - rev = "6851ecea8c6da45870b7c06d6495cba3fb2d7c7c"; - hash = "sha256-kr3zMr7aWt4W/+Jcol5Ctiq0KjXSxViPhGtyqvX9dqE="; + rev = "56e8d636b3e7188dae2832fc405db2e388be634b"; + hash = "sha256-hr+BHAmWT/FCLI5zNEHgtKdBbIYgmAydrErRu9RfuuM="; }; meta = with lib; { diff --git a/pkgs/by-name/ob/oboete/package.nix b/pkgs/by-name/ob/oboete/package.nix index c7de788d4c02..037d72024ce5 100644 --- a/pkgs/by-name/ob/oboete/package.nix +++ b/pkgs/by-name/ob/oboete/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "oboete"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "mariinkys"; repo = "oboete"; tag = version; - hash = "sha256-W5dd8UNjG2w0N1EngDPK7Q83C2TF9UfW0GGvPaW6nls="; + hash = "sha256-tQn3ihGHkR91zNtBIiyyIEEo21Q0ZSKLEaV/3UI9pwU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-UZUqPITtpHeNrsi6Nao+dfK3ACVJmZIc47aqSbwTemw="; + cargoHash = "sha256-91JMgdpMXL0a7oZXAG5xgiulOIyVXQ5x09wN3XDeSy0="; nativeBuildInputs = [ pkg-config @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Simple flashcards application for the COSMIC™ desktop written in Rust"; homepage = "https://github.com/mariinkys/oboete"; - changelog = "https://github.com/mariinkys/oboete/releases/tag/${src.tag}"; + changelog = "https://github.com/mariinkys/oboete/releases/tag/${version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix index 2dd462d4a487..feae836d56bb 100644 --- a/pkgs/by-name/oc/octoprint/plugins.nix +++ b/pkgs/by-name/oc/octoprint/plugins.nix @@ -11,7 +11,7 @@ let buildPlugin = args: self.buildPythonPackage (args // { pname = "octoprint-plugin-${args.pname}"; inherit (args) version; - propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ super.octoprint ]; + propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ self.octoprint ]; # none of the following have tests doCheck = false; }); diff --git a/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/pkgs/by-name/op/openrgb-plugin-effects/package.nix similarity index 91% rename from pkgs/applications/misc/openrgb-plugins/effects/default.nix rename to pkgs/by-name/op/openrgb-plugin-effects/package.nix index 5723bab1d1c8..70f96877ad79 100644 --- a/pkgs/applications/misc/openrgb-plugins/effects/default.nix +++ b/pkgs/by-name/op/openrgb-plugin-effects/package.nix @@ -2,13 +2,11 @@ lib, stdenv, fetchFromGitLab, - qtbase, + libsForQt5, openrgb, glib, openal, - qmake, pkg-config, - wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { @@ -29,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${openrgb.src} OpenRGB ''; - nativeBuildInputs = [ + nativeBuildInputs = with libsForQt5; [ qmake pkg-config wrapQtAppsHook ]; - buildInputs = [ + buildInputs = with libsForQt5; [ qtbase glib openal diff --git a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix similarity index 92% rename from pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix rename to pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix index 497da16c10a6..970c0d38a059 100644 --- a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix +++ b/pkgs/by-name/op/openrgb-plugin-hardwaresync/package.nix @@ -2,14 +2,12 @@ lib, stdenv, fetchFromGitLab, - qtbase, + libsForQt5, openrgb, glib, libgtop, lm_sensors, - qmake, pkg-config, - wrapQtAppsHook, }: stdenv.mkDerivation (finalAttrs: { @@ -31,14 +29,14 @@ stdenv.mkDerivation (finalAttrs: { rm -r dependencies/lhwm-cpp-wrapper ''; - buildInputs = [ + buildInputs = with libsForQt5; [ qtbase glib libgtop lm_sensors ]; - nativeBuildInputs = [ + nativeBuildInputs = with libsForQt5; [ qmake pkg-config wrapQtAppsHook diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/by-name/op/openrgb/package.nix similarity index 95% rename from pkgs/applications/misc/openrgb/default.nix rename to pkgs/by-name/op/openrgb/package.nix index ac8651b36e37..fa544e48cd93 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/by-name/op/openrgb/package.nix @@ -2,15 +2,12 @@ lib, stdenv, fetchFromGitLab, - qmake, - wrapQtAppsHook, + libsForQt5, libusb1, hidapi, pkg-config, coreutils, mbedtls_2, - qtbase, - qttools, symlinkJoin, openrgb, }: @@ -26,12 +23,13 @@ stdenv.mkDerivation rec { hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU="; }; - nativeBuildInputs = [ + nativeBuildInputs = with libsForQt5; [ qmake pkg-config wrapQtAppsHook ]; - buildInputs = [ + + buildInputs = with libsForQt5; [ libusb1 hidapi mbedtls_2 diff --git a/pkgs/by-name/ox/oxipng/package.nix b/pkgs/by-name/ox/oxipng/package.nix index 572977337e4c..db8cb2cb3ef8 100644 --- a/pkgs/by-name/ox/oxipng/package.nix +++ b/pkgs/by-name/ox/oxipng/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchCrate, + fetchFromGitHub, rustPlatform, }: @@ -9,15 +9,16 @@ rustPlatform.buildRustPackage rec { version = "9.1.3"; pname = "oxipng"; - src = fetchCrate { - inherit version pname; - hash = "sha256-kzN4YNsFqv/KUxpHao++oqc90Us6VllyFYkpdVUigD0="; + # do not use fetchCrate (only repository includes tests) + src = fetchFromGitHub { + owner = "shssoichiro"; + repo = "oxipng"; + tag = "v${version}"; + hash = "sha256-8EOEcIw10hCyYi9SwDLDZ8J3ezLXa30RUY5I9ksfqTs="; }; cargoHash = "sha256-4PCLtBJliK3uteL8EVKLBVR2YZW1gwQOiSLQok+rqug="; - doCheck = !stdenv.hostPlatform.isAarch64 && !stdenv.hostPlatform.isDarwin; - meta = { homepage = "https://github.com/shssoichiro/oxipng"; description = "Multithreaded lossless PNG compression optimizer"; diff --git a/pkgs/by-name/pa/pablodraw/package.nix b/pkgs/by-name/pa/pablodraw/package.nix index 1354061a838f..7de1cf2e797f 100644 --- a/pkgs/by-name/pa/pablodraw/package.nix +++ b/pkgs/by-name/pa/pablodraw/package.nix @@ -30,8 +30,8 @@ buildDotnetModule rec { executables = [ "PabloDraw" ]; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-sdk = dotnetCorePackages.sdk_7_0-bin; + dotnet-runtime = dotnetCorePackages.runtime_7_0-bin; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 1f91494028a5..a6b2ed8aec17 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -26,13 +26,13 @@ xorg, }: let - version = "2.14.5"; + version = "2.14.6"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-ML38TErINQPjBGweCY673zFlGEjTjgJcYJTJUbTov+4="; + hash = "sha256-wBm4+ohM9v25n6zEUAeaVU6mAmB3GR8n1kDYyTBlnjM="; }; # subpath installation is broken with uvicorn >= 0.26 @@ -283,6 +283,7 @@ python.pkgs.buildPythonApplication rec { # FileNotFoundError(2, 'No such file or directory'): /build/tmp... "test_script_with_output" "test_script_exit_non_zero" + "testDocumentPageCountMigrated" # AssertionError: 10 != 4 (timezone/time issue) # Due to getting local time from modification date in test_consumer.py "testNormalOperation" diff --git a/pkgs/by-name/pa/parinfer-rust/package.nix b/pkgs/by-name/pa/parinfer-rust/package.nix index d300092b1907..f5e6cfb5bea6 100644 --- a/pkgs/by-name/pa/parinfer-rust/package.nix +++ b/pkgs/by-name/pa/parinfer-rust/package.nix @@ -7,16 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "parinfer-rust"; - version = "0.4.3"; + version = "0.4.3-unstable-2024-05-07"; src = fetchFromGitHub { owner = "eraserhd"; repo = "parinfer-rust"; - rev = "v${version}"; - sha256 = "0hj5in5h7pj72m4ag80ing513fh65q8xlsf341qzm3vmxm3y3jgd"; + rev = "d84828b453e158d06406f6b5e9056f6b54ff76c9"; + sha256 = "sha256-Q2fYogfn5QcNDEie4sUaVydAmDmcFXnsvz35cxPCf+M="; }; - cargoHash = "sha256-PW9LIQamQfusaijyJ2R9xe29LhM0GNf9BdxI9vkjVdE="; + useFetchCargoVendor = true; + cargoHash = "sha256-w/GMjNtKiMGYOfzSl5IZTeHBSp4C9Mu6+oogCqHxdb4="; nativeBuildInputs = [ llvmPackages.clang diff --git a/pkgs/by-name/pl/plumed/package.nix b/pkgs/by-name/pl/plumed/package.nix index 3809e5fccc84..c2d64c559678 100644 --- a/pkgs/by-name/pl/plumed/package.nix +++ b/pkgs/by-name/pl/plumed/package.nix @@ -9,13 +9,13 @@ assert !blas.isILP64; stdenv.mkDerivation rec { pname = "plumed"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "plumed"; repo = "plumed2"; rev = "v${version}"; - hash = "sha256-jNvdbfh1krNMrOFqkEHMy60mjsG/Wp6MQg0gHEjDA5U="; + hash = "sha256-KN412t64tp3QUQkhpLU3sAYDosQ3hw9HqpT1fzt5fwA="; }; postPatch = '' diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix index dfc2de383b6a..d017054aaeb1 100644 --- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix +++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-up.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "poetry-plugin-up"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "MousaZeidBaker"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-PWHbMDGL9CGLRmvFWLOztUW0f/TJioPjQtAgpyCbAqw="; + tag = "v${version}"; + hash = "sha256-gVhx8Vhk+yT/QjcEme8w0F+6BBpnEZOqzCkUJgM9eck="; }; build-system = [ @@ -43,7 +43,5 @@ buildPythonPackage rec { changelog = "https://github.com/MousaZeidBaker/poetry-plugin-up/releases/tag/${version}"; license = licenses.mit; maintainers = [ maintainers.k900 ]; - # https://github.com/MousaZeidBaker/poetry-plugin-up/pull/70 - broken = lib.versionAtLeast poetry.version "2"; }; } diff --git a/pkgs/by-name/pr/proxsuite-nlp/package.nix b/pkgs/by-name/pr/proxsuite-nlp/package.nix index f522a4c9618a..2abd4d6c8fd8 100644 --- a/pkgs/by-name/pr/proxsuite-nlp/package.nix +++ b/pkgs/by-name/pr/proxsuite-nlp/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proxsuite-nlp"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "proxsuite-nlp"; rev = "v${finalAttrs.version}"; - hash = "sha256-JWMvPIxmZ5vSVS3nSlhFyNu8hLSVTc7Hdvd4YmE/pI8="; + hash = "sha256-+zg3QGPLqrvwT7rjnYXTUwIzHlHrIAISj/+Q9HU4cYs="; }; outputs = [ diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index 8bf887a6f5d4..b67923d4e013 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { name = "regal"; - version = "0.30.0"; + version = "0.30.2"; src = fetchFromGitHub { owner = "StyraInc"; repo = "regal"; rev = "v${version}"; - hash = "sha256-sr+tGfKDSgJ5SiHihJ/aMAn6AnAC8bEb838+xYdFosc="; + hash = "sha256-HlopAz+AqpjZ/NpVVvkiR0p7+ezWlr5ddLMK/LobxpM="; }; - vendorHash = "sha256-6JheW6JHkAidZda7WWHSfEAuPYoBdli8wWHp2sX2r5Q="; + vendorHash = "sha256-0B8MOF+ovJ1memBuXtEeMViKKWaQXX6+HQzMY91bgyI="; ldflags = [ "-s" diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index b3d674f1f584..5202728adaa8 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "renovate"; - version = "39.107.0"; + version = "39.137.1"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; tag = finalAttrs.version; - hash = "sha256-I2ufRvx8NZavFMKpiwgx8q8yejRUE8r7TvpSw4q56Zo="; + hash = "sha256-E3J+jEd21j5r4iaa4D2mNbWcwfwyzcaHTHiD3jBVXlQ="; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-ginPQvnhB8dQStipi2kGL+cdDwqobvENnrLRbC5WIHc="; + hash = "sha256-ljhRpFMafpB0xbmGVoh8Icwm0c0dr7JPqAA/6sln03w="; }; env.COREPACK_ENABLE_STRICT = 0; diff --git a/pkgs/by-name/re/resumed/package.nix b/pkgs/by-name/re/resumed/package.nix index 78d8836a5592..bc1d5ade1ed9 100644 --- a/pkgs/by-name/re/resumed/package.nix +++ b/pkgs/by-name/re/resumed/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "resumed"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "rbardini"; repo = "resumed"; rev = "v${version}"; - hash = "sha256-XaEK41UBKUldjRlxTzc42K/RwZ9D8kueU/6dm8n1W1U="; + hash = "sha256-kDv6kOVY8IfztmLeby2NgB5q0DtP1ajMselvr1EDQJ8="; }; - npmDepsHash = "sha256-r0wq1KGZA5b4eIQsp+dz8Inw8AQA62BK7vgfYlViIrY="; + npmDepsHash = "sha256-7Wdf8NaizgIExeX+Kc8wn5f20al0bnxRpFoPy6p40jw="; meta = with lib; { description = "Lightweight JSON Resume builder, no-frills alternative to resume-cli"; diff --git a/pkgs/by-name/ro/roslyn/package.nix b/pkgs/by-name/ro/roslyn/package.nix index 8811b92fbdc6..a69fa5fb2ad8 100644 --- a/pkgs/by-name/ro/roslyn/package.nix +++ b/pkgs/by-name/ro/roslyn/package.nix @@ -17,7 +17,7 @@ buildDotnetModule rec { hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; projectFile = [ "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj" ]; diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index 5ef0aa8bdb12..c5531501898a 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -34,7 +34,7 @@ buildDotnetModule rec { enableParallelBuilding = false; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index d73a00dcd7bb..ce6b0a4e8221 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "saga"; - version = "9.7.1"; + version = "9.7.2"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; - hash = "sha256-ZPJ8OlVEqG/jmRaA7BJRsw3b1X/3tKtRcYTXqfGdJ0I="; + hash = "sha256-1nWpFGRBS49uzKl7m/4YWFI+3lvm2zKByYpR9llxsgY="; }; sourceRoot = "saga-${version}/saga-gis"; diff --git a/pkgs/by-name/se/sequin/package.nix b/pkgs/by-name/se/sequin/package.nix index ce6e27be4260..1060fa1fba0f 100644 --- a/pkgs/by-name/se/sequin/package.nix +++ b/pkgs/by-name/se/sequin/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sequin"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "sequin"; tag = "v${version}"; - hash = "sha256-pGZ7QmmPIpXrRcfkbEbTZzHXHtqPwU8Cju9Q2xtSqvw="; + hash = "sha256-rszK2UZ3Eq9g+Di1lncDQIT4TlUcWZEu1SU2aE2uFHY="; }; - vendorHash = "sha256-LehOqSahbF3Nqm0/bJ0Q3mR0ds8FEXaLEvGLwzPdvU4="; + vendorHash = "sha256-mpmGd6liBzz9XPcB00ZhHaQzTid6lURD5I3EvehXsA8="; ldflags = [ "-X main.Version=${version}" diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix index 654a4ca8fd10..daa2ed37560b 100644 --- a/pkgs/by-name/sh/shadow/package.nix +++ b/pkgs/by-name/sh/shadow/package.nix @@ -56,10 +56,9 @@ stdenv.mkDerivation rec { sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am ''; - # Assume System V `setpgrp (void)', which is the default on GNU variants - # (`AC_FUNC_SETPGRP' is not cross-compilation capable.) + # `AC_FUNC_SETPGRP' is not cross-compilation capable. preConfigure = '' - export ac_cv_func_setpgrp_void=yes + export ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"} export shadow_cv_logdir=/var/log ''; diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix index 30a24ea39838..55e8b094f8bd 100644 --- a/pkgs/by-name/sh/shairport-sync/package.nix +++ b/pkgs/by-name/sh/shairport-sync/package.nix @@ -53,13 +53,13 @@ in stdenv.mkDerivation rec { pname = "shairport-sync"; - version = "4.3.5"; + version = "4.3.6"; src = fetchFromGitHub { repo = "shairport-sync"; owner = "mikebrady"; tag = version; - hash = "sha256-GYu/n4JoghqUHnkCiSQJYm9WSLww585WKgXTEiWGq4g="; + hash = "sha256-Pbg2yFa524OFOfvwZPS1/K+Vvn+bwtmo7Fbr919Smwc="; }; nativeBuildInputs = diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index d15bd3ffebd5..2cbe99cf9db1 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "6.0.3"; + version = "6.1.1"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-BTnj7SUKgbJ2LM2gzw+8bSJ4+Zd6Z/KZy9B46fxIvsg="; + hash = "sha256-VAIxoTXOcWA2V+vx+AsCArkjprFiZun5BJoP1l3FGk0="; }; # Fix build on darwin diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix index 97b3a45c535c..60ccaecca0cc 100644 --- a/pkgs/by-name/sl/slurm/package.nix +++ b/pkgs/by-name/sl/slurm/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchFromGitHub, + runCommand, + config, pkg-config, libtool, curl, @@ -33,6 +35,8 @@ enableX11 ? true, enableGtk2 ? false, gtk2, + enableNVML ? config.cudaSupport, + nvml, }: stdenv.mkDerivation rec { @@ -113,7 +117,14 @@ stdenv.mkDerivation rec { http-parser ] ++ lib.optionals enableX11 [ xorg.xauth ] - ++ lib.optionals enableGtk2 [ gtk2 ]; + ++ lib.optionals enableGtk2 [ gtk2 ] + ++ lib.optionals enableNVML [ + (runCommand "collect-nvml" { } '' + mkdir $out + ln -s ${nvml.dev}/include $out/include + ln -s ${nvml.lib}/lib/stubs $out/lib + '') + ]; configureFlags = [ @@ -132,7 +143,8 @@ stdenv.mkDerivation rec { "--without-rpath" # Required for configure to pick up the right dlopen path ] ++ (lib.optional enableGtk2 "--disable-gtktest") - ++ (lib.optional (!enableX11) "--disable-x11"); + ++ (lib.optional (!enableX11) "--disable-x11") + ++ (lib.optional (enableNVML) "--with-nvml"); preConfigure = '' patchShebangs ./doc/html/shtml2html.py diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index c4a7cf65d357..77c4a82d1aae 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -69,8 +69,8 @@ buildDotnetModule { runtimeDeps = [ sqlite ]; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-runtime = dotnetCorePackages.aspnetcore_6_0-bin; doCheck = true; diff --git a/pkgs/by-name/so/sourcegit/deps.json b/pkgs/by-name/so/sourcegit/deps.json new file mode 100644 index 000000000000..f76816c86853 --- /dev/null +++ b/pkgs/by-name/so/sourcegit/deps.json @@ -0,0 +1,232 @@ +[ + { + "pname": "Avalonia", + "version": "11.0.0", + "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E=" + }, + { + "pname": "Avalonia", + "version": "11.2.3", + "hash": "sha256-NUoyXJkIsgbkcKFVb10VRafM4ViHs801c/7vhu3ssUY=" + }, + { + "pname": "Avalonia.Angle.Windows.Natives", + "version": "2.1.22045.20230930", + "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" + }, + { + "pname": "Avalonia.AvaloniaEdit", + "version": "11.1.0", + "hash": "sha256-K9+hK+4aK93dyuGytYvVU25daz605+KN54hmwQYXFF8=" + }, + { + "pname": "Avalonia.BuildServices", + "version": "0.0.29", + "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + }, + { + "pname": "Avalonia.Controls.ColorPicker", + "version": "11.2.3", + "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg=" + }, + { + "pname": "Avalonia.Controls.DataGrid", + "version": "11.2.3", + "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM=" + }, + { + "pname": "Avalonia.Desktop", + "version": "11.2.3", + "hash": "sha256-srtZi+kDbhRtMl33l91zssBWETU5oHodKbbWyfEsb/I=" + }, + { + "pname": "Avalonia.Diagnostics", + "version": "11.2.3", + "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc=" + }, + { + "pname": "Avalonia.Fonts.Inter", + "version": "11.2.3", + "hash": "sha256-ySsCXVpjqjCX/uYkwluSfrAoBtuq9k7fC1bFjxKC9/Q=" + }, + { + "pname": "Avalonia.FreeDesktop", + "version": "11.2.3", + "hash": "sha256-3sNemBmZE06w2ul87T5HrEeHUxXMOa9MfQhpI4AoxDY=" + }, + { + "pname": "Avalonia.Native", + "version": "11.2.3", + "hash": "sha256-2Gp98NGWcrILqF+P5PDMPRdsMby/lZiT3eWAUskFim8=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.2.3", + "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.0.0", + "hash": "sha256-A01nrs3Ij1eTo6tPmu7++T1K+Wo/H/9LvpeuOUGbQeU=" + }, + { + "pname": "Avalonia.Skia", + "version": "11.2.3", + "hash": "sha256-QBp8wTA92hGwbmNSVL4gsjrqA9CfwDPgdTiOEqcogGA=" + }, + { + "pname": "Avalonia.Themes.Fluent", + "version": "11.2.3", + "hash": "sha256-DRl+267mUtJDUJpreUj6BxDLGGYGkEEo5vDGtGguoC8=" + }, + { + "pname": "Avalonia.Themes.Simple", + "version": "11.2.3", + "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k=" + }, + { + "pname": "Avalonia.Win32", + "version": "11.2.3", + "hash": "sha256-xKFKObvqdJaQjphEktRJvzmAoDEsKg3WqlEG31V3qLE=" + }, + { + "pname": "Avalonia.X11", + "version": "11.2.3", + "hash": "sha256-SD4dmpKx4l8YOyUnrA0fnf2Bb+tHSNyARh7GAtHyg60=" + }, + { + "pname": "AvaloniaEdit.TextMate", + "version": "11.1.0", + "hash": "sha256-Nv52bUxA02VcsKCbMqEAkNBl46gznSivRZ3llLHrhkM=" + }, + { + "pname": "CommunityToolkit.Mvvm", + "version": "8.3.2", + "hash": "sha256-zY+iB5Rj/8ru0xpRWwFLFO6JI3UFB/XHnx9pWmrZCAs=" + }, + { + "pname": "HarfBuzzSharp", + "version": "7.3.0.2", + "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=" + }, + { + "pname": "HarfBuzzSharp", + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", + "version": "7.3.0.3", + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + }, + { + "pname": "LiveChartsCore", + "version": "2.0.0-rc4.5", + "hash": "sha256-2Fgn9Bo1aM6dZHCU+OVykOhggTzpcEfFNfYtWc4yvHc=" + }, + { + "pname": "LiveChartsCore.SkiaSharpView", + "version": "2.0.0-rc4.5", + "hash": "sha256-03RR14tA0DtYHiLdgmAI4Gp5/e2H6QPkNFOBeqiFaJU=" + }, + { + "pname": "LiveChartsCore.SkiaSharpView.Avalonia", + "version": "2.0.0-rc4.5", + "hash": "sha256-lzG/5e6WDpUiHZ8GvovOMvwXyYoVBeB1Ktuuw2Fx5No=" + }, + { + "pname": "MicroCom.Runtime", + "version": "0.11.0", + "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + }, + { + "pname": "Onigwrap", + "version": "1.0.6", + "hash": "sha256-p+dhMfIH4C6xLKRUREnUpC0DZwFazjvI+30KRT8TWnU=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.8", + "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" + }, + { + "pname": "SkiaSharp", + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" + }, + { + "pname": "SkiaSharp.HarfBuzz", + "version": "2.88.8", + "hash": "sha256-W9jNuEo/8q+k2aHNC19FfKcBUIEWx2zDcGwM+jDZ1o8=" + }, + { + "pname": "SkiaSharp.NativeAssets.Linux", + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" + }, + { + "pname": "SkiaSharp.NativeAssets.macOS", + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" + }, + { + "pname": "SkiaSharp.NativeAssets.WebAssembly", + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" + }, + { + "pname": "SkiaSharp.NativeAssets.Win32", + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" + }, + { + "pname": "System.IO.Pipelines", + "version": "8.0.0", + "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + }, + { + "pname": "System.Text.Json", + "version": "8.0.5", + "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" + }, + { + "pname": "TextMateSharp", + "version": "1.0.59", + "hash": "sha256-qfAGSgVpTrWMZSk0TFDVP1IgWWi6O1jEEvWc0Pvw9i0=" + }, + { + "pname": "TextMateSharp", + "version": "1.0.65", + "hash": "sha256-kZx3CBDzu7qUSnihs9Q4Ck78ih1aJ+0g8cN8Hke+E5w=" + }, + { + "pname": "TextMateSharp.Grammars", + "version": "1.0.59", + "hash": "sha256-ru5VxQK4PFRJhHu+MvCzDt3EwbC/94n1whtDovUAUDA=" + }, + { + "pname": "TextMateSharp.Grammars", + "version": "1.0.65", + "hash": "sha256-tZx/GKYX3bomQFVFaEgneNYHpB74v+8D90IfkYImlhE=" + }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.20.0", + "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" + } +] diff --git a/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch b/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch new file mode 100644 index 000000000000..790fd218e789 --- /dev/null +++ b/pkgs/by-name/so/sourcegit/fix-darwin-git-path.patch @@ -0,0 +1,31 @@ +diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs +index a24f1b6..4102274 100644 +--- a/src/Native/Linux.cs ++++ b/src/Native/Linux.cs +@@ -97,7 +97,7 @@ namespace SourceGit.Native + } + } + +- private string FindExecutable(string filename) ++ public static string FindExecutable(string filename) + { + var pathVariable = Environment.GetEnvironmentVariable("PATH") ?? string.Empty; + var pathes = pathVariable.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries); +diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs +index 5721fe8..bc2a57d 100644 +--- a/src/Native/MacOS.cs ++++ b/src/Native/MacOS.cs +@@ -25,12 +25,7 @@ namespace SourceGit.Native + + public string FindGitExecutable() + { +- var gitPathVariants = new List() { +- "/usr/bin/git", "/usr/local/bin/git", "/opt/homebrew/bin/git", "/opt/homebrew/opt/git/bin/git" +- }; +- foreach (var path in gitPathVariants) +- if (File.Exists(path)) return path; +- return string.Empty; ++ return Linux.FindExecutable("git"); + } + + public string FindTerminal(Models.ShellOrTerminal shell) diff --git a/pkgs/by-name/so/sourcegit/package.nix b/pkgs/by-name/so/sourcegit/package.nix new file mode 100644 index 000000000000..72ac09617105 --- /dev/null +++ b/pkgs/by-name/so/sourcegit/package.nix @@ -0,0 +1,117 @@ +{ + lib, + stdenv, + buildDotnetModule, + fetchFromGitHub, + dotnetCorePackages, + copyDesktopItems, + makeDesktopItem, + libicns, + + libXcursor, + libXext, + libXi, + libXrandr, + + git, + xdg-utils, +}: + +buildDotnetModule (finalAttrs: { + pname = "sourcegit"; + version = "2025.01"; + + src = fetchFromGitHub { + owner = "sourcegit-scm"; + repo = "sourcegit"; + tag = "v${finalAttrs.version}"; + hash = "sha256-6FO0WRUcWm7xnuw6Br97+cWZhvzIOesg/eANZzeyxZo="; + }; + + patches = [ ./fix-darwin-git-path.patch ]; + + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.runtime_9_0; + + nugetDeps = ./deps.json; + + projectFile = [ "src/SourceGit.csproj" ]; + + executables = [ "SourceGit" ]; + + dotnetFlags = [ + "-p:DisableUpdateDetection=true" + "-p:DisableAOT=true" + ]; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + copyDesktopItems + libicns + ]; + + # these are dlopen-ed at runtime + # libXi is needed for right-click support + # not sure about what the other ones are needed for, but I'll include them anyways + runtimeDeps = [ + libXcursor + libXext + libXi + libXrandr + ]; + + # Note: users can use `.overrideAttrs` to append to this list + runtimePathDeps = [ + git + xdg-utils + ]; + + # add fallback binaries to use if the user doesn't already have them in their PATH + preInstall = '' + makeWrapperArgs+=( + --suffix PATH : ${lib.makeBinPath finalAttrs.runtimePathDeps} + ) + ''; + + desktopItems = [ + (makeDesktopItem { + name = "SourceGit"; + exec = "SourceGit"; + icon = "SourceGit"; + desktopName = "SourceGit"; + terminal = false; + comment = finalAttrs.meta.description; + }) + ]; + + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + # extract the .icns file into multiple .png files + # where the format of the .png file names is App_"$n"x"$n"x32.png + + icns2png -x build/resources/app/App.icns + + for f in App_*x32.png; do + res=''${f//App_} + res=''${res//x32.png} + install -Dm644 $f "$out/share/icons/hicolor/$res/apps/SourceGit.png" + done + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + install -Dm644 build/resources/app/App.icns $out/Applications/SourceGit.app/Contents/Resources/App.icns + + substitute build/resources/app/App.plist $out/Applications/SourceGit.app/Contents/Info.plist \ + --replace-fail "SOURCE_GIT_VERSION" "${finalAttrs.version}" + + mkdir -p $out/Applications/SourceGit.app/Contents/MacOS + ln -s $out/bin/SourceGit $out/Applications/SourceGit.app/Contents/MacOS/SourceGit + ''; + + meta = { + changelog = "https://github.com/sourcegit-scm/sourcegit/releases/tag/${finalAttrs.src.tag}"; + description = "Free & OpenSource GUI client for GIT users"; + homepage = "https://github.com/sourcegit-scm/sourcegit"; + license = lib.licenses.mit; + mainProgram = "SourceGit"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +}) diff --git a/pkgs/by-name/st/steam-unwrapped/force-overwrite-bootstrap.patch b/pkgs/by-name/st/steam-unwrapped/force-overwrite-bootstrap.patch new file mode 100644 index 000000000000..0516f5d68564 --- /dev/null +++ b/pkgs/by-name/st/steam-unwrapped/force-overwrite-bootstrap.patch @@ -0,0 +1,13 @@ +diff --git a/bin_steam.sh b/bin_steam.sh +index 49f9d8a..48f4379 100755 +--- a/bin_steam.sh ++++ b/bin_steam.sh +@@ -297,7 +297,7 @@ fi + # Leave a copy of the bootstrap tarball in ~/.steam so that Steam can + # re-bootstrap itself if required + if ! cmp -s "$LAUNCHSTEAMBOOTSTRAPFILE" "$LAUNCHSTEAMDIR/bootstrap.tar.xz"; then +- cp "$LAUNCHSTEAMBOOTSTRAPFILE" "$LAUNCHSTEAMDIR/bootstrap.tar.xz" ++ cp -f "$LAUNCHSTEAMBOOTSTRAPFILE" "$LAUNCHSTEAMDIR/bootstrap.tar.xz" + fi + + # go to the install directory and run the client diff --git a/pkgs/by-name/st/steam-unwrapped/package.nix b/pkgs/by-name/st/steam-unwrapped/package.nix index 98e1ee15ac45..7828feba494e 100644 --- a/pkgs/by-name/st/steam-unwrapped/package.nix +++ b/pkgs/by-name/st/steam-unwrapped/package.nix @@ -7,14 +7,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "steam-unwrapped"; - version = "1.0.0.81"; + version = "1.0.0.82"; src = fetchurl { # use archive url so the tarball doesn't 404 on a new release url = "https://repo.steampowered.com/steam/archive/stable/steam_${finalAttrs.version}.tar.gz"; - hash = "sha256-Gia5182s4J4E3Ia1EeC5kjJX9mSltsr+b+1eRtEXtPk="; + hash = "sha256-r6Lx3WJx/StkW6MLjzq0Cv02VONUJBoxy9UQAPfm/Hc="; }; + patches = [ + # We copy the bootstrap file from the store, where it's read-only, + # so future attempts to update it with bare "cp" will fail. + # So, use "cp -f" to force an overwrite. + ./force-overwrite-bootstrap.patch + ]; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" diff --git a/pkgs/by-name/sw/swapview/package.nix b/pkgs/by-name/sw/swapview/package.nix index b15b9d6d062d..c4cc669c2b40 100644 --- a/pkgs/by-name/sw/swapview/package.nix +++ b/pkgs/by-name/sw/swapview/package.nix @@ -6,16 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "swapview"; - version = "0.1.0"; + version = "0.1.0-unstable-2023-12-03"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "swapview"; - rev = "v${version}"; - sha256 = "0339biydk997j5r72vzp7djwkscsz89xr3936nshv23fmxjh2rzj"; + rev = "cc8e863acd2084413b91572357dab34551c27ed7"; + sha256 = "sha256-H5jMdmtZoN9nQfjXFQyYbuvPY58jmEP2j/XWGdBocFo="; }; - cargoHash = "sha256-v3Fd08s70YX7pEIWYcgpC2daerfZhtzth4haKfUy0Q8="; + useFetchCargoVendor = true; + cargoHash = "sha256-kLWd8dg63oA4sPMPPkRn+HsU+v+gQAiniBWI0i7JszM="; meta = with lib; { description = "Simple program to view processes' swap usage on Linux"; diff --git a/pkgs/by-name/te/tensorman/package.nix b/pkgs/by-name/te/tensorman/package.nix index 03e372ac0b0d..f972af1e4312 100644 --- a/pkgs/by-name/te/tensorman/package.nix +++ b/pkgs/by-name/te/tensorman/package.nix @@ -6,16 +6,17 @@ rustPlatform.buildRustPackage { pname = "tensorman"; - version = "unstable-2023-03-13"; + version = "0.1.0-unstable-2024-06-24"; src = fetchFromGitHub { owner = "pop-os"; repo = "tensorman"; - rev = "b1125f71b55a8d9a4d674a62fa1e8868d40d0f0d"; - hash = "sha256-WMX+nzNQTGeSUxOfMHo+U0ICYx8rttXpQrQClwU2zX8="; + rev = "24fa3b2bb06a29708162ee474a733e9a227b1778"; + hash = "sha256-kI/dOw9JnhXmLqIgaljhRMc/SX35m7WQ9b6bQa6diZ0="; }; - cargoHash = "sha256-y/AE2jTVetqBBExBlPEB0LwIVk+LjB2i0ZjijLPs9js="; + useFetchCargoVendor = true; + cargoHash = "sha256-/Ul8+5MmTntQ0OprfG4QhUNjc3PktCandzTTWn4FD0Y="; meta = with lib; { description = "Utility for easy management of Tensorflow containers"; diff --git a/pkgs/by-name/te/termplay/package.nix b/pkgs/by-name/te/termplay/package.nix deleted file mode 100644 index 79fcd6f03687..000000000000 --- a/pkgs/by-name/te/termplay/package.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - rustPlatform, - fetchFromGitLab, - lib, - makeWrapper, - gst_all_1, - libsixel, -}: - -rustPlatform.buildRustPackage rec { - pname = "termplay"; - version = "2.0.6"; - - src = fetchFromGitLab { - owner = "jD91mZM2"; - repo = "termplay"; - rev = "v${version}"; - sha256 = "1w7hdqgqr1jgxid3k7f2j52wz31gv8bzr9rsm6xzp7nnihp6i45p"; - }; - - cargoHash = "sha256-i7toHEewkpQ85aj4PK4SLJQCfUllUqkqIWLaOEk3NyI="; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-ugly - gst_all_1.gst-plugins-bad - libsixel - ]; - - buildFeatures = [ "bin" ]; - - postInstall = '' - wrapProgram $out/bin/termplay --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - ''; - - meta = with lib; { - description = "Play an image/video in your terminal"; - homepage = "https://jd91mzm2.github.io/termplay/"; - license = licenses.mit; - maintainers = [ ]; - platforms = platforms.unix; - mainProgram = "termplay"; - }; -} diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix index 5622d2c5b0d7..c28d39cd7dc1 100644 --- a/pkgs/by-name/tf/tfswitch/package.nix +++ b/pkgs/by-name/tf/tfswitch/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "tfswitch"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = "v${version}"; - sha256 = "sha256-zmGJiwdESf+3yXM7W64iSy38lADZmA03dI1yhtv9H28="; + sha256 = "sha256-Rpr/S22UX6+fHc71jnMo6kR+8kjJAboLog9vMwYTpnQ="; }; - vendorHash = "sha256-paJC46AJRaB5RieKs6wZYzshxAp8e8MvCatGsN8E4Io="; + vendorHash = "sha256-9oM7VrPZrZlR1s+vvjwpWvKdmknfbgd3hpvYByKQtgs="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/pkgs/by-name/tp/tpm2-openssl/package.nix b/pkgs/by-name/tp/tpm2-openssl/package.nix index 48c04e25fb4f..a3a36bf24a3e 100644 --- a/pkgs/by-name/tp/tpm2-openssl/package.nix +++ b/pkgs/by-name/tp/tpm2-openssl/package.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "tpm2-openssl"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = "tpm2-openssl"; rev = finalAttrs.version; - hash = "sha256-mZ4Z/GxJFwwfyFd1SAiVlQqOjkFSzsZePeuEZtq8Mcg="; + hash = "sha256-CCTR7qBqI/y+jLBEEcgRanYOBNUYM/sH/hCqOLGA4QM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/va/vanguards/package.nix b/pkgs/by-name/va/vanguards/package.nix new file mode 100644 index 000000000000..c821f1531723 --- /dev/null +++ b/pkgs/by-name/va/vanguards/package.nix @@ -0,0 +1,38 @@ +{ + python312Packages, + fetchFromGitHub, + lib, +}: +python312Packages.buildPythonApplication rec { + pname = "vanguards"; + version = "0.3.1-unstable-2023-10-31"; + + dependencies = [ python312Packages.stem ]; + #tries to access the network during the tests, which fails + doCheck = false; + + src = fetchFromGitHub { + owner = "mikeperry-tor"; + repo = "vanguards"; + rev = "8132fa0e556fbcbb3538ff9b48a2180c0c5e8fbd"; + sha256 = "sha256-XauSTgoH6zXv2DXyX2lQc6gy6Ysm41fKnyuWZ3hj7kI="; + }; + patches = [ ./python-3.12.patch ]; + postPatch = '' + # fix import cycle issue + substituteInPlace src/vanguards/main.py --replace-fail \ + 'import stem.response.events' 'import stem.socket; import stem.control; import stem.response.events' + ''; + + meta = { + maintainers = with lib.maintainers; [ ForgottenBeast ]; + mainProgram = "vanguards"; + license = lib.licenses.mit; + homepage = "https://github.com/mikeperry-tor/vanguards"; + description = "Protects TOR hidden services against guard node attacks"; + longDescription = '' + Runs alongside tor and interacts with its control port + in order to protect and alert against guard node attacks on hidden services + ''; + }; +} diff --git a/pkgs/by-name/va/vanguards/python-3.12.patch b/pkgs/by-name/va/vanguards/python-3.12.patch new file mode 100644 index 000000000000..5241b3c09ce6 --- /dev/null +++ b/pkgs/by-name/va/vanguards/python-3.12.patch @@ -0,0 +1,51 @@ +Origin: https://github.com/mikeperry-tor/vanguards/pull/105/commits/183d24775521feb3ed61b681088347279c3fc84c +From: Dave Jones +Date: Wed, 28 Aug 2024 12:54:24 +0100 +Subject: [PATCH] Python 3.12 compatibility + +Python 3.12 removes the deprecated `SafeConfigParser` class. This patch +switches the code to using ConfigParser and read_file from Python 3.x, +and patches 2.7's SafeConfigParser to a compatible definition. +--- + src/vanguards/config.py | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/vanguards/config.py b/src/vanguards/config.py +index 1c33391..b8e3f9c 100644 +--- a/src/vanguards/config.py ++++ b/src/vanguards/config.py +@@ -16,9 +16,12 @@ + from .logger import plog + + try: +- from configparser import SafeConfigParser, Error ++ from configparser import ConfigParser, Error + except ImportError: + from ConfigParser import SafeConfigParser, Error ++ class ConfigParser(SafeConfigParser): ++ def read_file(self, f, source=None): ++ return self.readfp(f, source) + + ################# Global options ################## + +@@ -209,7 +212,7 @@ def set_options_from_module(config, module, section): + config.set(section, param, str(val)) + + def generate_config(): +- config = SafeConfigParser(allow_no_value=True) ++ config = ConfigParser(allow_no_value=True) + set_options_from_module(config, sys.modules[__name__], "Global") + set_options_from_module(config, vanguards, "Vanguards") + set_options_from_module(config, bandguards, "Bandguards") +@@ -219,9 +222,9 @@ def generate_config(): + return config + + def apply_config(config_file): +- config = SafeConfigParser(allow_no_value=True) ++ config = ConfigParser(allow_no_value=True) + +- config.readfp(open(config_file, "r")) ++ config.read_file(open(config_file, "r")) + + get_options_for_module(config, sys.modules[__name__], "Global") + get_options_for_module(config, vanguards, "Vanguards") diff --git a/pkgs/by-name/vi/vital/package.nix b/pkgs/by-name/vi/vital/package.nix index fb103ddaec7d..a5c964cde693 100644 --- a/pkgs/by-name/vi/vital/package.nix +++ b/pkgs/by-name/vi/vital/package.nix @@ -11,6 +11,7 @@ xorg, libGL, freetype, + zenity, }: stdenv.mkDerivation (finalAttrs: { @@ -57,6 +58,11 @@ stdenv.mkDerivation (finalAttrs: { curl libjack2 ] + }" \ + --prefix PATH : "${ + lib.makeBinPath [ + zenity + ] }" runHook postInstall diff --git a/pkgs/by-name/vo/void/package.nix b/pkgs/by-name/vo/void/package.nix deleted file mode 100644 index 9f45138b2d29..000000000000 --- a/pkgs/by-name/vo/void/package.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "void"; - version = "1.1.5"; - - src = fetchFromGitHub { - owner = "spacejam"; - repo = "void"; - rev = version; - sha256 = "08vazw4rszqscjz988k89z28skyj3grm81bm5iwknxxagmrb20fz"; - }; - - # The tests are long-running and not that useful - doCheck = false; - - cargoHash = "sha256-4LLm8EIGR9YJyVlSLRsQmBJc0QZaxBQafE4VLsDyAfI="; - - meta = with lib; { - description = "Terminal-based personal organizer"; - homepage = "https://github.com/spacejam/void"; - license = licenses.gpl3; - maintainers = with maintainers; [ spacekookie ]; - mainProgram = "void"; - }; -} diff --git a/pkgs/by-name/vp/vpnc/package.nix b/pkgs/by-name/vp/vpnc/package.nix index 3ffd36234aeb..d6b8630984a5 100644 --- a/pkgs/by-name/vp/vpnc/package.nix +++ b/pkgs/by-name/vp/vpnc/package.nix @@ -1,6 +1,8 @@ { lib, stdenv, + bash, + buildPackages, fetchFromGitHub, makeWrapper, pkg-config, @@ -14,17 +16,21 @@ stdenv.mkDerivation { pname = "vpnc"; - version = "unstable-2021-11-04"; + version = "unstable-2024-12-20"; src = fetchFromGitHub { owner = "streambinder"; repo = "vpnc"; - rev = "c8bb5371b881f8853f191c495e762f834c9def5d"; - sha256 = "1j1p83nfc2fpwczjcggsby0b44hk97ky0s6vns6md3awlbpgdn57"; + rev = "d58afaaafb6a43cb21bb08282b54480d7b2cc6ab"; + sha256 = "sha256-79DaK1s+YmROKbcWIXte+GZh0qq9LAQlSmczooR86H8="; fetchSubmodules = true; }; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional (!opensslSupport) pkg-config; + nativeBuildInputs = [ + makeWrapper + perl + ] ++ lib.optional (!opensslSupport) pkg-config; + buildInputs = [ libgcrypt perl @@ -40,15 +46,25 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; }; - postPatch = '' - patchShebangs src/makeman.pl - ''; + postPatch = + '' + substituteInPlace src/vpnc-disconnect \ + --replace-fail /bin/sh ${lib.getExe' bash "sh"} + patchShebangs src/makeman.pl + '' + + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # manpage generation invokes the build vpnc, which must be emulating when cross compiling + substituteInPlace src/makeman.pl --replace-fail \ + '$vpnc --long-help' \ + '${stdenv.hostPlatform.emulator buildPackages} $vpnc --long-help' + ''; enableParallelBuilding = true; # Missing install depends: # install: target '...-vpnc-unstable-2021-11-04/share/doc/vpnc': No such file or directory # make: *** [Makefile:149: install-doc] Error 1 enableParallelInstalling = false; + strictDeps = true; meta = with lib; { homepage = "https://davidepucci.it/doc/vpnc/"; diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix index 7363dfe3ed3b..3722c6a5ceba 100644 --- a/pkgs/by-name/w3/w3m/package.nix +++ b/pkgs/by-name/w3/w3m/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { "--with-gc=${boehmgc.dev}" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "ac_cv_func_setpgrp_void=yes" + "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" ] ++ lib.optional graphicsSupport "--enable-image=${lib.optionalString x11Support "x11,"}fb" ++ lib.optional (graphicsSupport && !x11Support) "--without-x"; diff --git a/pkgs/by-name/wa/wasabibackend/package.nix b/pkgs/by-name/wa/wasabibackend/package.nix index 5b36e1d8ede5..2ab8e58e55a4 100644 --- a/pkgs/by-name/wa/wasabibackend/package.nix +++ b/pkgs/by-name/wa/wasabibackend/package.nix @@ -22,8 +22,8 @@ buildDotnetModule rec { projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj"; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; + dotnet-sdk = dotnetCorePackages.sdk_7_0-bin; + dotnet-runtime = dotnetCorePackages.aspnetcore_7_0-bin; buildInputs = [(lib.getLib stdenv.cc.cc) zlib]; diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix index 561c5dbf55ab..e0a5e58b8e07 100644 --- a/pkgs/by-name/wa/waytrogen/package.nix +++ b/pkgs/by-name/wa/waytrogen/package.nix @@ -10,25 +10,27 @@ rustPlatform.buildRustPackage rec { pname = "waytrogen"; - version = "0.5.8"; + version = "0.6.3"; src = fetchFromGitHub { owner = "nikolaizombie1"; repo = "waytrogen"; tag = version; - hash = "sha256-tq5cC0Z0kmrYopOGbdoAERBHQXrAw799zWdQP06rTYw="; + hash = "sha256-jkrvtwkzlsQgbw8/N4uzeqQ3fVSur2oa21IOXRRgh9I="; }; - cargoHash = "sha256-05YfQBezDbQ8KfNvl/4Av5vf/rxJU3Ej6RDgSnSfjtM="; + cargoHash = "sha256-UkYQ/oN1+C9WQ+4hbhXxORw5J3Ypwe7DaDg5LhgP2d0="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; - buildInputs = [ - glib - ]; + buildInputs = [ glib ]; + + env = { + OPENSSL_NO_VENDOR = 1; + }; postBuild = '' install -Dm644 org.Waytrogen.Waytrogen.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas @@ -38,6 +40,10 @@ rustPlatform.buildRustPackage rec { postInstall = '' install -Dm644 waytrogen.desktop $out/share/applications/waytrogen.desktop install -Dm644 README-Assets/WaytrogenLogo.svg $out/share/icons/hicolor/scalable/apps/waytrogen.svg + while IFS= read -r lang; do + mkdir -p $out/share/locale/$lang/LC_MESSAGES + msgfmt locales/$lang/LC_MESSAGES/waytrogen.po -o $out/share/locale/$lang/LC_MESSAGES/waytrogen.mo + done < locales/LINGUAS ''; passthru.updateScript = nix-update-script { }; @@ -52,7 +58,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nikolaizombie1/waytrogen"; changelog = "https://github.com/nikolaizombie1/waytrogen/releases/tag/${version}"; license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ genga898 ]; + maintainers = with lib.maintainers; [ + genga898 + nikolaizombie1 + ]; mainProgram = "waytrogen"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/we/webmetro/package.nix b/pkgs/by-name/we/webmetro/package.nix deleted file mode 100644 index 12c60fe28050..000000000000 --- a/pkgs/by-name/we/webmetro/package.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, -}: - -rustPlatform.buildRustPackage rec { - pname = "webmetro"; - version = "unstable-20180426"; - - src = fetchFromGitHub { - owner = "Tangent128"; - repo = pname; - rev = "4f6cc00fe647bd311d00a8a4cb53ab08f20a04f9"; - sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651"; - }; - - cargoHash = "sha256-6LfJ5rI7Y+ziEIMxPpKxOS+VSrKuKohEcqIK7xdKhNg="; - - meta = with lib; { - description = "Simple relay server for broadcasting a WebM stream"; - longDescription = '' - Webmetro is a simple relay server for broadcasting a WebM stream - from one uploader to many downloaders, via HTTP. - The initialization segment is remembered, so that viewers can join - mid-stream. Cluster timestamps are rewritten to be monotonic, so multiple - (compatibly-encoded) webm files can be chained together without - clients needing to reconnect. - ''; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ leenaars ]; - mainProgram = "webmetro"; - }; -} diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix index 569beaa62bef..06e6d8e241d0 100644 --- a/pkgs/by-name/we/wezterm/package.nix +++ b/pkgs/by-name/we/wezterm/package.nix @@ -29,14 +29,14 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "0-unstable-2025-01-03"; + version = "0-unstable-2025-01-24"; src = fetchFromGitHub { owner = "wez"; repo = "wezterm"; - rev = "8e9cf912e66f704f300fac6107206a75036de1e7"; + rev = "4bf0007cefff7f1ad139d89b54f074d5ad7d2184"; fetchSubmodules = true; - hash = "sha256-JkAovAeoVrH2QlHzzcciraebfsSQPBQPsA3fUKEjRm8="; + hash = "sha256-YN1C+cgF2T/dUljCZO5RMdbJsun+7lgqLN7BW+IMZsg="; }; postPatch = '' diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index 4cd9ea9e7db3..f07cd148290a 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -108,6 +108,9 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + # Multiple tests spin up & speak to D-Bus, avoid cross-talk causing failures + enableParallelChecking = false; + postInstall = '' substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \ --replace-fail '/bin/false' '${lib.getExe' coreutils "false"}' diff --git a/pkgs/development/compilers/dotnet/8/default.nix b/pkgs/development/compilers/dotnet/8/default.nix index 95b4c71bcf78..0c72d4b03766 100644 --- a/pkgs/development/compilers/dotnet/8/default.nix +++ b/pkgs/development/compilers/dotnet/8/default.nix @@ -5,5 +5,5 @@ releaseInfoFile = ./release-info.json; bootstrapSdkFile = ./bootstrap-sdk.nix; depsFile = ./deps.json; - fallbackTargetPackages = dotnetCorePackages.sdk_8_0.targetPackages; + fallbackTargetPackages = dotnetCorePackages.sdk_8_0-bin.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/9/default.nix b/pkgs/development/compilers/dotnet/9/default.nix index 21d73761cc58..c9ec2ae9a930 100644 --- a/pkgs/development/compilers/dotnet/9/default.nix +++ b/pkgs/development/compilers/dotnet/9/default.nix @@ -6,5 +6,5 @@ bootstrapSdkFile = ./bootstrap-sdk.nix; allowPrerelease = true; depsFile = ./deps.json; - fallbackTargetPackages = dotnetCorePackages.sdk_9_0.targetPackages; + fallbackTargetPackages = dotnetCorePackages.sdk_9_0-bin.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 6528fb3d56a1..4c9e868dc4f5 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -18,7 +18,7 @@ in assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' You must include at least one package, e.g `with dotnetCorePackages; combinePackages [ - sdk_6_0 aspnetcore_7_0 + sdk_9_0 aspnetcore_8_0 ];`''; mkWrapper "sdk" (buildEnv { name = "dotnet-combined"; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 90c474f6ae20..2d246642b8f6 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -1,6 +1,6 @@ /* How to combine packages for use in development: - dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; + dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_9_0 aspnetcore_8_0 ]; Hashes and urls are retrieved from: https://dotnet.microsoft.com/download/dotnet @@ -13,74 +13,115 @@ makeScopeWithSplicing', }: -makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "dotnetCorePackages"; - f = ( - self: - let - callPackage = self.callPackage; +let + pkgs = makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "dotnetCorePackages"; + f = ( + self: + let + callPackage = self.callPackage; - fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; + fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; - buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) { }; - buildDotnetSdk = - version: - import version { - inherit fetchNupkg; - buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); - buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); - buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); + buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) { }; + buildDotnetSdk = + version: + import version { + inherit fetchNupkg; + buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); + buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); + buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); + }; + + ## Files in versions/ are generated automatically by update.sh ## + dotnet-bin = lib.mergeAttrsList ( + map buildDotnetSdk [ + ./versions/6.0.nix + ./versions/7.0.nix + ./versions/8.0.nix + ./versions/9.0.nix + ] + ); + + runtimeIdentifierMap = { + "x86_64-linux" = "linux-x64"; + "aarch64-linux" = "linux-arm64"; + "x86_64-darwin" = "osx-x64"; + "aarch64-darwin" = "osx-arm64"; + "x86_64-windows" = "win-x64"; + "i686-windows" = "win-x86"; }; - ## Files in versions/ are generated automatically by update.sh ## - dotnet_6_0 = buildDotnetSdk ./versions/6.0.nix; - dotnet_7_0 = buildDotnetSdk ./versions/7.0.nix; - dotnet_8_0 = buildDotnetSdk ./versions/8.0.nix; - dotnet_9_0 = buildDotnetSdk ./versions/9.0.nix; + in + lib.optionalAttrs config.allowAliases ( + { + # EOL + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + } + // dotnet-bin + ) + // lib.mapAttrs' (k: v: lib.nameValuePair "${k}-bin" v) dotnet-bin + // { + inherit callPackage fetchNupkg buildDotnetSdk; - runtimeIdentifierMap = { - "x86_64-linux" = "linux-x64"; - "aarch64-linux" = "linux-arm64"; - "x86_64-darwin" = "osx-x64"; - "aarch64-darwin" = "osx-arm64"; - "x86_64-windows" = "win-x64"; - "i686-windows" = "win-x86"; - }; + # Convert a "stdenv.hostPlatform.system" to a dotnet RID + systemToDotnetRid = + system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); - in - { - inherit callPackage fetchNupkg buildDotnetSdk; + combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) { }; - # Convert a "stdenv.hostPlatform.system" to a dotnet RID - systemToDotnetRid = - system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); + patchNupkgs = callPackage ./patch-nupkgs.nix { }; + nugetPackageHook = callPackage ./nuget-package-hook.nix { }; - combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) { }; + buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { }; + buildDotnetGlobalTool = callPackage ../../../build-support/dotnet/build-dotnet-global-tool { }; - patchNupkgs = callPackage ./patch-nupkgs.nix { }; - nugetPackageHook = callPackage ./nuget-package-hook.nix { }; + mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { }; + mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; + addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { }; - buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { }; - buildDotnetGlobalTool = callPackage ../../../build-support/dotnet/build-dotnet-global-tool { }; - - mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { }; - mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; - addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { }; - - dotnet_8 = recurseIntoAttrs (callPackage ./8 { }); - dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); - } - // lib.optionalAttrs config.allowAliases { - # EOL - sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - } - // dotnet_6_0 - // dotnet_7_0 - // dotnet_8_0 - // dotnet_9_0 + dotnet_8 = recurseIntoAttrs (callPackage ./8 { }); + dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); + } + ); + }; +in +pkgs +// rec { + # use binary SDK here to avoid downgrading feature band + sdk_8_0_1xx = if !pkgs.dotnet_8.vmr.meta.broken then pkgs.dotnet_8.sdk else pkgs.sdk_8_0_1xx-bin; + # source-built SDK only exists for _1xx feature band + sdk_8_0_4xx = pkgs.callPackage ./wrapper.nix { } "sdk" ( + pkgs.sdk_8_0_4xx-bin.unwrapped.overrideAttrs (old: { + passthru = + old.passthru + // { + inherit (sdk_8_0_1xx) + runtime + aspnetcore + ; + } + # We can't use the source-built packages until ilcompiler is fixed (see vmr.nix) + // lib.optionalAttrs sdk_8_0_1xx.hasILCompiler { + inherit (sdk_8_0_1xx) + packages + targetPackages + ; + }; + }) ); + sdk_8_0 = sdk_8_0_4xx; + sdk_8_0-source = sdk_8_0_1xx; + runtime_8_0 = sdk_8_0.runtime; + aspnetcore_8_0 = sdk_8_0.aspnetcore; +} +// rec { + sdk_9_0_1xx = if !pkgs.dotnet_9.vmr.meta.broken then pkgs.dotnet_9.sdk else pkgs.sdk_9_0_1xx-bin; + sdk_9_0 = sdk_9_0_1xx; + runtime_9_0 = sdk_9_0.runtime; + aspnetcore_9_0 = sdk_9_0.aspnetcore; } diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index e8819a14611c..a82b5c3f62f0 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -25,6 +25,11 @@ let + '' ln -s ${vmr.man} $man ''; + propagatedSandboxProfile = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + (allow file-read* (subpath "/private/var/db/mds/system")) + (allow mach-lookup (global-name "com.apple.SecurityServer") + (global-name "com.apple.system.opendirectoryd.membership")) + ''; } ) ); @@ -66,8 +71,12 @@ let version=''${version,,} mkdir -p "$out"/share/nuget/packages/"$id" cp -r . "$out"/share/nuget/packages/"$id"/"$version" - chmod +w "$out"/share/nuget/packages/"$id"/"$version" - echo {} > "$out"/share/nuget/packages/"$id"/"$version"/.nupkg.metadata + cd "$out"/share/nuget/packages/"$id"/"$version" + chmod +w . + for dir in tools runtimes/*/native; do + [[ ! -d "$dir" ]] || chmod -R +x "$dir" + done + echo {} > .nupkg.metadata ) popd diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index d6d86c0b1837..80c1ddfeaa71 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -481,5 +481,8 @@ stdenv.mkDerivation rec { "x86_64-darwin" "aarch64-darwin" ]; + # build deadlocks intermittently on rosetta + # https://github.com/dotnet/runtime/issues/111628 + broken = stdenv.hostPlatform.system == "x86_64-darwin"; }; } diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index d328dbf97b7e..d268476c2c14 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -204,6 +204,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { runtime = null; run = checkConsoleOutput "$src/bin/test"; }; + + ready-to-run = mkConsoleTest { + name = "ready-to-run"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime -p:PublishReadyToRun=true -o $out/bin"; + run = checkConsoleOutput "$src/bin/test"; + }; } // lib.optionalAttrs finalAttrs.finalPackage.hasILCompiler { aot = mkConsoleTest { diff --git a/pkgs/development/compilers/llvm/20/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/20/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 000000000000..dfe21f9dcae0 --- /dev/null +++ b/pkgs/development/compilers/llvm/20/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,13 @@ +--- a/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:36:20.550893344 -0700 ++++ b/tools/polly/cmake/polly_macros.cmake 2024-03-15 17:37:06.277332960 -0700 +@@ -45,8 +45,8 @@ + install(TARGETS ${name} + COMPONENT ${name} + ${exports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + add_llvm_install_targets(install-${name} + COMPONENT ${name}) + endif() diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 7d2ef2e3f135..0fee6ce58ede 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -130,6 +130,11 @@ let ]; "llvm/gnu-install-dirs-polly.patch" = [ { + after = "20"; + path = ../20; + } + { + before = "20"; after = "18"; path = ../18; } @@ -519,7 +524,8 @@ let (metadata.getVersionFile "clang/purity.patch") # https://reviews.llvm.org/D51899 (metadata.getVersionFile "clang/gnu-install-dirs.patch") - + ] + ++ lib.optionals (lib.versionOlder metadata.release_version "20") [ # https://github.com/llvm/llvm-project/pull/116476 # prevent clang ignoring warnings / errors for unsuppored # options when building & linking a source file with trailing @@ -1063,7 +1069,7 @@ let ++ lib.optionals (lib.versionAtLeast metadata.release_version "13") [ (metadata.getVersionFile "compiler-rt/armv6-scudo-libatomic.patch") ] - ++ lib.optional (lib.versionAtLeast metadata.release_version "19") (fetchpatch { + ++ lib.optional (lib.versions.major metadata.release_version == "19") (fetchpatch { url = "https://github.com/llvm/llvm-project/pull/99837/commits/14ae0a660a38e1feb151928a14f35ff0f4487351.patch"; hash = "sha256-JykABCaNNhYhZQxCvKiBn54DZ5ZguksgCHnpdwWF2no="; relative = "compiler-rt"; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index ee60db1e08a6..6ff44ffecff2 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -31,9 +31,9 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.6".officialRelease.sha256 = "sha256-LD4nIjZTSZJtbgW6tZopbTF5Mq0Tenj2gbuPXhtOeUI="; "20.0.0-git".gitRelease = { - rev = "1ef5b987a464611a60e873650726b5e02fda0feb"; - rev-version = "20.0.0-unstable-2024-12-17"; - sha256 = "sha256-QCY9z9h3z5gPvwq6bNzAB5xFFStwOCfKh4VnWInhxU4="; + rev = "6383a12e3b4339fa4743bb97da4d51dea6d2e2ea"; + rev-version = "20.0.0-unstable-2025-01-25"; + sha256 = "sha256-LMew+lFm+HrR5iwFDnoXA6B2LiU/pVqsy1YrP9xr5GU="; }; } // llvmVersions; diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 555bfc45beff..2bcb59fe66f5 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -7,7 +7,7 @@ lib, stdenv, fetchFromGitLab, - autoconf269, + autoconf, automake, bash, libtool, @@ -56,24 +56,22 @@ assert let ffcallAvailable = stdenv.hostPlatform.isLinux && (libffcall != null); - # Some modules need autoreconf called in their directory. - shouldReconfModule = name: name != "asdf"; in stdenv.mkDerivation { - version = "2.50pre20230112"; + version = "2.49.95-unstable-2024-12-28"; pname = "clisp"; src = fetchFromGitLab { owner = "gnu-clisp"; repo = "clisp"; - rev = "bf72805c4dace982a6d3399ff4e7f7d5e77ab99a"; - hash = "sha256-sQoN2FUg9BPaCgvCF91lFsU/zLja1NrgWsEIr2cPiqo="; + rev = "c3ec11bab87cfdbeba01523ed88ac2a16b22304d"; + hash = "sha256-xXGx2FlS0l9huVMHqNbcAViLjxK8szOFPT0J8MpGp9w="; }; strictDeps = true; nativeBuildInputs = [ - autoconf269 + autoconf automake libtool ]; @@ -98,10 +96,6 @@ stdenv.mkDerivation { libXext ]; - patches = [ - ./gnulib_aarch64.patch - ]; - # First, replace port 9090 (rather low, can be used) # with 64237 (much higher, IANA private area, not # anything rememberable). @@ -112,22 +106,6 @@ stdenv.mkDerivation { find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i ''; - preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ( - '' - ( - cd src - autoreconf -f -i -I m4 -I glm4 - ) - '' - + lib.concatMapStrings (x: '' - ( - root="$PWD" - cd modules/${x} - autoreconf -f -i -I "$root/src" -I "$root/src/m4" -I "$root/src/glm4" - ) - '') (builtins.filter shouldReconfModule withModules) - ); - configureFlags = [ "builddir" ] ++ lib.optional (!dllSupport) "--without-dynamic-modules" diff --git a/pkgs/development/interpreters/clisp/gnulib_aarch64.patch b/pkgs/development/interpreters/clisp/gnulib_aarch64.patch deleted file mode 100644 index a0095835706a..000000000000 --- a/pkgs/development/interpreters/clisp/gnulib_aarch64.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gllib/vma-iter.c b/src/gllib/vma-iter.c -index 6045f21d7..d50a3a398 100644 ---- a/src/gllib/vma-iter.c -+++ b/src/gllib/vma-iter.c -@@ -1327,7 +1327,7 @@ vma_iterate (vma_iterate_callback_fn callback, void *data) - In 64-bit processes, we could use vm_region_64 or mach_vm_region. - I choose vm_region_64 because it uses the same types as vm_region, - resulting in less conditional code. */ --# if defined __ppc64__ || defined __x86_64__ -+# if defined __aarch64__ || defined __ppc64__ || defined __x86_64__ - struct vm_region_basic_info_64 info; - mach_msg_type_number_t info_count = VM_REGION_BASIC_INFO_COUNT_64; - diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 30bd2df22fee..145f515a3c1d 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2024.12"; + version = "2025.01"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "rakudo"; repo = "rakudo"; rev = version; - hash = "sha256-R4D+Hh3M1373MQBLX2TY8nq+so4S6DP5RM5XR+Zr95Y="; + hash = "sha256-NrbeB6/VnxlUt6glIvetK1o9huWaeVD6WLdpi4bb2FU="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 227bee72df3d..9000fab8bb72 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2024.12"; + version = "2025.01"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "moarvm"; repo = "moarvm"; rev = version; - hash = "sha256-CP8zYs4y2pT2keIxqE7yFy+N9aR3fidkwRXAe5blWAo="; + hash = "sha256-Xvkn1edzOeXBiBn2QSwk0eKfSG1JvfSkVrCAmyYtlmI="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index acb611334a38..b1d06179fc23 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2024.12"; + version = "2025.01"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "raku"; repo = "nqp"; rev = version; - hash = "sha256-TjN7uH5cJzZ49KbxOYDCj2tYk6ORZWZn7ruTIn4Hgzc="; + hash = "sha256-45L3fEL8jIk9bkKpuhrsLM014zNW1P7Kf6qVXxJjWws="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 5df85f8b5367..8d55d78c72e6 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -38,8 +38,9 @@ stdenv.mkDerivation rec { lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # For cross builds, provide answers to the configure time tests. # These answers are valid on x86_64-linux and aarch64-linux. + # TODO: provide all valid answers for BSD. "ac_cv_file__dev_zero=yes" - "ac_cv_func_setpgrp_void=yes" + "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}" "apr_cv_tcp_nodelay_with_cork=yes" "ac_cv_define_PTHREAD_PROCESS_SHARED=yes" "apr_cv_process_shared_works=yes" diff --git a/pkgs/development/libraries/astal/buildAstalModule.nix b/pkgs/development/libraries/astal/buildAstalModule.nix index dd6929161031..b6d748b141eb 100644 --- a/pkgs/development/libraries/astal/buildAstalModule.nix +++ b/pkgs/development/libraries/astal/buildAstalModule.nix @@ -39,7 +39,7 @@ let cleanArgs args // { pname = "astal-${name}"; - version = "0-unstable-2025-01-13"; + version = "0-unstable-2025-01-23"; __structuredAttrs = true; strictDeps = true; @@ -47,8 +47,8 @@ let src = fetchFromGitHub { owner = "Aylur"; repo = "astal"; - rev = "cac0fc63bfe098b26753db8262f5d95ac42b281b"; - hash = "sha256-kNtKWbQ+gMzmAF7KNSZ4Hb8/2cfSNoURCyRSB0nx2I4="; + rev = "127e9cdcbf173846a3c40ddc0abfbb038df48042"; + hash = "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI="; }; sourceRoot = "${finalAttrs.src.name}/${sourceRoot}"; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/conduit.patch b/pkgs/development/ocaml-modules/ocsigen-server/conduit.patch new file mode 100644 index 000000000000..5aaac2407e32 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocsigen-server/conduit.patch @@ -0,0 +1,14 @@ +diff --git a/src/server/ocsigen_cohttp.ml b/src/server/ocsigen_cohttp.ml +index 66895339..edbfcbf2 100644 +--- a/src/server/ocsigen_cohttp.ml ++++ b/src/server/ocsigen_cohttp.ml +@@ -105,7 +105,8 @@ let handler ~ssl ~address ~port ~connector (flow, conn) request body = + let rec getsockname = function + | `TCP (ip, port) -> Unix.ADDR_INET (Ipaddr_unix.to_inet_addr ip, port) + | `Unix_domain_socket path -> Unix.ADDR_UNIX path +- | `TLS (_, edn) -> getsockname edn ++ | `TLS (_, edn) -> getsockname (edn :> Conduit_lwt_unix.endp) ++ | `TLS_tunnel _ -> raise (Failure "TLS tunnel not supported") + | `Unknown err -> raise (Failure ("resolution failed: " ^ err)) + | `Vchan_direct _ -> raise (Failure "VChan not supported") + | `Vchan_domain_socket _ -> raise (Failure "VChan not supported") diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index e55fd1c05088..2e758c0545bf 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -64,6 +64,8 @@ buildDunePackage rec { hash = "sha256-T3bgPZpDO6plgebLJDBtBuR2eR/bN3o24UAUv1VwgtI="; }; + patches = [ ./conduit.patch ]; + nativeBuildInputs = [ makeWrapper which diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix index 7feb91d8d971..99eca088b2ab 100644 --- a/pkgs/development/python-modules/bindep/default.nix +++ b/pkgs/development/python-modules/bindep/default.nix @@ -11,18 +11,17 @@ buildPythonPackage rec { pname = "bindep"; - version = "2.11.0"; + version = "2.12.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-rLLyWbzh/RUIhzR5YJu95bmq5Qg3hHamjWtqGQAufi8="; + hash = "sha256-wGtR5tC6OWWq2PPCXwpXS+D4AboHyxp4SV2olUZ952A="; }; env.PBR_VERSION = version; build-system = [ - distro pbr setuptools ]; @@ -41,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bindep is a tool for checking the presence of binary packages needed to use an application / library"; - homepage = "https://docs.opendev.org/opendev/bindep/latest/"; + homepage = "https://opendev.org/opendev/bindep"; license = licenses.asl20; mainProgram = "bindep"; maintainers = teams.openstack.members; diff --git a/pkgs/development/python-modules/compliance-trestle/default.nix b/pkgs/development/python-modules/compliance-trestle/default.nix new file mode 100755 index 000000000000..b67b80f02c01 --- /dev/null +++ b/pkgs/development/python-modules/compliance-trestle/default.nix @@ -0,0 +1,108 @@ +{ + attrs, + buildPythonPackage, + cmarkgfm, + cryptography, + defusedxml, + datamodel-code-generator, + email-validator, + fetchFromGitHub, + furl, + ilcli, + importlib-resources, + jinja2, + lib, + mypy, + openpyxl, + orjson, + paramiko, + pytestCheckHook, + pydantic, + python-dotenv, + python-frontmatter, + requests, + ruamel-yaml, + setuptools, + setuptools-scm, +}: + +buildPythonPackage rec { + pname = "compliance-trestle"; + version = "3.7.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oscal-compass"; + repo = "compliance-trestle"; + tag = "v${version}"; + hash = "sha256-MEPleUM5gSCJjVaVbNtNzRl+Vvvk97h6Q/mOWIxFd2Q="; + fetchSubmodules = true; + }; + + pythonRelaxDeps = true; + + postPatch = '' + substituteInPlace tests/trestle/misc/mypy_test.py \ + --replace-fail "trestle'," "${placeholder "out"}/bin/trestle'," \ + ''; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + attrs + cmarkgfm + cryptography + defusedxml + datamodel-code-generator + email-validator + furl + ilcli + importlib-resources + jinja2 + openpyxl + orjson + paramiko + pydantic + python-dotenv + python-frontmatter + requests + ruamel-yaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + mypy + ]; + + disabledTests = [ + # Requires network access + "test_import_from_url" + "test_import_from_nist" + "test_remote_profile_relative_cat" + + # AssertionError + "test_profile_generate_assemble_rev_5" + "test_ssp_assemble_fedramp_profile" + "test_ssp_generate_aggregates_no_cds" + "test_ssp_generate_aggregates_no_param_value_orig" + ]; + + disabledTestPaths = [ + # Requires network access + "tests/trestle/core/remote" + ]; + + pythonImportsCheck = [ "trestle" ]; + + meta = { + description = "An opinionated tooling platform for managing compliance as code, using continuous integration and NIST's OSCAL standard"; + homepage = "https://github.com/oscal-compass/compliance-trestle"; + changelog = "https://github.com/oscal-compass/compliance-trestle/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tochiaha ]; + mainProgram = "trestle"; + }; +} diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index 14e72f843c0b..9a359369cb12 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -12,7 +12,7 @@ }: let - version = "1.9.0"; + version = "1.50.5"; tag = version; in buildPythonPackage { @@ -24,7 +24,7 @@ buildPythonPackage { owner = "elevenlabs"; repo = "elevenlabs-python"; inherit tag; - hash = "sha256-0fkt2Z05l95b2S+xoyyy9VGAUZDI1SM8kdcP1PCrUg8="; + hash = "sha256-Cew8+L7NoQlvR2pILVmwNIa3WUfZzmEkf1+U2nglsnM="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index bc4b2ae8e79a..a7a0736d60db 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "1.9.0"; + version = "1.9.1"; pyproject = true; src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; tag = "v${version}"; - hash = "sha256-2frJqHKIOuERC8G6fJwJOdxcWHRQRRy1BxfZDrVhXEU="; + hash = "sha256-tlShiI90PAbWztrL5PgmE1D+/h6bUoSxAHxwGlQHvus="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index 01d06d31eb12..f29fa882b578 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -6,6 +6,9 @@ # build-system hatchling, + # dependencies + wadler-lindig, + # tests cloudpickle, equinox, @@ -20,18 +23,22 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.36"; + version = "0.2.37"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "jaxtyping"; tag = "v${version}"; - hash = "sha256-TXhHh6Nka9TOnfFPaNyHmLdTkhzyFEY0mLSfoDf9KQc="; + hash = "sha256-0a/9TSQW/k5kuucHoSUhLtRk9k+5ycbI/g6V1id3v28="; }; build-system = [ hatchling ]; + dependencies = [ + wadler-lindig + ]; + pythonImportsCheck = [ "jaxtyping" ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix index 071b3707225b..8eeffccb26a5 100644 --- a/pkgs/development/python-modules/jupyter-server/default.nix +++ b/pkgs/development/python-modules/jupyter-server/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchPypi, - pythonOlder, hatch-jupyter-builder, hatchling, pytestCheckHook, @@ -37,7 +36,6 @@ buildPythonPackage rec { pname = "jupyter-server"; version = "2.14.2"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; @@ -45,12 +43,12 @@ buildPythonPackage rec { hash = "sha256-ZglQIaqWOM7SdsJIsdgYYuTFDyktV1kgu+lg3hxWsSs="; }; - nativeBuildInputs = [ + build-system = [ hatch-jupyter-builder hatchling ]; - propagatedBuildInputs = [ + dependencies = [ argon2-cffi jinja2 tornado @@ -87,6 +85,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" + # 19 failures on python 3.13: + # ResourceWarning: unclosed database in + # TODO: Can probably be removed at the next update + "-W" + "ignore::pytest.PytestUnraisableExceptionWarning" ]; preCheck = '' @@ -111,6 +114,10 @@ buildPythonPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ # Failed: DID NOT RAISE "test_copy_big_dir" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ + # TypeError: the JSON object must be str, bytes or bytearray, not NoneType + "test_terminal_create_with_cwd" ]; disabledTestPaths = [ @@ -123,12 +130,12 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { changelog = "https://github.com/jupyter-server/jupyter_server/blob/v${version}/CHANGELOG.md"; description = "Backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications"; mainProgram = "jupyter-server"; homepage = "https://github.com/jupyter-server/jupyter_server"; - license = licenses.bsdOriginal; + license = lib.licenses.bsdOriginal; maintainers = lib.teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/llama-cpp-python/default.nix b/pkgs/development/python-modules/llama-cpp-python/default.nix index ec69378235e6..6c07005d4ddf 100644 --- a/pkgs/development/python-modules/llama-cpp-python/default.nix +++ b/pkgs/development/python-modules/llama-cpp-python/default.nix @@ -1,8 +1,10 @@ { lib, stdenv, + gcc13Stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # nativeBuildInputs cmake, @@ -33,6 +35,9 @@ cudaPackages ? { }, }: +let + stdenvTarget = if cudaSupport then gcc13Stdenv else stdenv; +in buildPythonPackage rec { pname = "llama-cpp-python"; version = "0.3.6"; @@ -47,6 +52,16 @@ buildPythonPackage rec { }; # src = /home/gaetan/llama-cpp-python; + patches = [ + # fix segfault when running tests due to missing default Metal devices + (fetchpatch2 { + url = "https://github.com/ggerganov/llama.cpp/commit/acd38efee316f3a5ed2e6afcbc5814807c347053.patch?full_index=1"; + stripLen = 1; + extraPrefix = "vendor/llama.cpp/"; + hash = "sha256-71+Lpg9z5KPlaQTX9D85KS2LXFWLQNJJ18TJyyq3/pU="; + }) + ]; + dontUseCmakeConfigure = true; SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" ( lib.optionals cudaSupport [ @@ -76,6 +91,8 @@ buildPythonPackage rec { ] ); + stdenv = stdenvTarget; + dependencies = [ diskcache jinja2 @@ -99,7 +116,11 @@ buildPythonPackage rec { passthru = { updateScript = gitUpdater { rev-prefix = "v"; }; - tests.llama-cpp-python = llama-cpp-python.override { cudaSupport = true; }; + tests = lib.optionalAttrs stdenvTarget.hostPlatform.isLinux { + withCuda = llama-cpp-python.override { + cudaSupport = true; + }; + }; }; meta = { @@ -109,12 +130,6 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ kirillrdy ]; badPlatforms = [ - # Segfaults during tests: - # tests/test_llama.py .Fatal Python error: Segmentation fault - # Current thread 0x00000001f3decf40 (most recent call first): - # File "/private/tmp/nix-build-python3.12-llama-cpp-python-0.3.2.drv-0/source/llama_cpp/_internals.py", line 51 in __init__ - lib.systems.inspect.patterns.isDarwin - # cc1: error: unknown value ‘native+nodotprod+noi8mm+nosve’ for ‘-mcpu’ "aarch64-linux" ]; diff --git a/pkgs/development/python-modules/mallard-ducktype/default.nix b/pkgs/development/python-modules/mallard-ducktype/default.nix new file mode 100644 index 000000000000..f13d66593ed5 --- /dev/null +++ b/pkgs/development/python-modules/mallard-ducktype/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "mallard-ducktype"; + version = "1.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "projectmallard"; + repo = "mallard-ducktype"; + tag = version; + hash = "sha256-jHjzTBBRBh//bOrdnyCRmZRmpupgDaDRuZGAd75baco="; + }; + + build-system = [ setuptools ]; + + checkPhase = '' + runHook preCheck + pushd tests + ./runtests + popd + runHook postCheck + ''; + + pythonImportsCheck = [ "mallard" ]; + + meta = { + description = "Parser for the lightweight Ducktype syntax for Mallard"; + homepage = "https://github.com/projectmallard/mallard-ducktype"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix index 0c12f0612792..c52242f8ed5b 100644 --- a/pkgs/development/python-modules/pyiskra/default.nix +++ b/pkgs/development/python-modules/pyiskra/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyiskra"; - version = "0.1.14"; + version = "0.1.15"; pyproject = true; src = fetchFromGitHub { owner = "Iskramis"; repo = "pyiskra"; tag = "v${version}"; - hash = "sha256-OLNUa11UULiW6E8nVy5rUyN7iAD7KdM+R76m2zaDOgc="; + hash = "sha256-LIrhd2gDqa1AehnG0WVQKUNbFTuFkLcHwqNAjFejYk0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/scrap-engine/default.nix b/pkgs/development/python-modules/scrap-engine/default.nix index 0a8c9fed90e8..2583c637f7a8 100644 --- a/pkgs/development/python-modules/scrap-engine/default.nix +++ b/pkgs/development/python-modules/scrap-engine/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "scrap-engine"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchPypi { pname = "scrap_engine"; inherit version; - hash = "sha256-qxzbVYFcSKcL2HtMlH9epO/sCx9HckWAt/NyVD8QJBQ="; + hash = "sha256-9jiStwFD5vhPSxWsEVmHOvfRgNgVOUvlzAa1Rmf+faE="; }; build-system = [ diff --git a/pkgs/development/python-modules/stable-baselines3/default.nix b/pkgs/development/python-modules/stable-baselines3/default.nix index a9d784707886..0cca87dd9857 100644 --- a/pkgs/development/python-modules/stable-baselines3/default.nix +++ b/pkgs/development/python-modules/stable-baselines3/default.nix @@ -22,16 +22,14 @@ }: buildPythonPackage rec { pname = "stable-baselines3"; - # TODO: To this date, the latest release (2.4.1) is not compatible with numpy 2 and does not build - # successfully on nixpkgs - version = "2.4.1-unstable-2025-01-07"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "DLR-RM"; repo = "stable-baselines3"; - rev = "b7c64a1aa4dd2fd3efed96e7a9ddb4d1f5c96112"; - hash = "sha256-oyTOBRZsKkhhGKwwBN9HCV0t8+MkJYpWsTRdS+upMeI="; + tag = "v${version}"; + hash = "sha256-4KOF/3/PxHHSo95zaqtPy5+h53VcUsMhSx85tGvXV2o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/wadler-lindig/default.nix b/pkgs/development/python-modules/wadler-lindig/default.nix new file mode 100644 index 000000000000..7011c0a9ef16 --- /dev/null +++ b/pkgs/development/python-modules/wadler-lindig/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # tests + numpy, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "wadler-lindig"; + version = "0.1.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "patrick-kidger"; + repo = "wadler_lindig"; + rev = "v${version}"; + hash = "sha256-akb1x9UYbfEwnVS6ahpb42XnEl3y7kk3WkhwD8p7AA4="; + }; + + build-system = [ + hatchling + ]; + + pythonImportsCheck = [ + "wadler_lindig" + ]; + + nativeCheckInputs = [ + numpy + pytestCheckHook + ]; + + meta = { + description = "A Wadler--Lindig pretty printer for Python"; + homepage = "https://github.com/patrick-kidger/wadler_lindig"; + changelog = "https://github.com/patrick-kidger/wadler_lindig/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/whey-pth/default.nix b/pkgs/development/python-modules/whey-pth/default.nix index c40292ede641..a389860d1e2d 100644 --- a/pkgs/development/python-modules/whey-pth/default.nix +++ b/pkgs/development/python-modules/whey-pth/default.nix @@ -1,21 +1,30 @@ { buildPythonPackage, - fetchPypi, + fetchFromGitHub, lib, setuptools, dom-toml, whey, + pytestCheckHook, }: + buildPythonPackage rec { pname = "whey-pth"; version = "0.0.6"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-CIpgqzNXW3VpS+k6BCpc2DNyqwgt/Af3ms59AH/V5KM="; + src = fetchFromGitHub { + owner = "repo-helper"; + repo = "whey-pth"; + tag = "v${version}"; + hash = "sha256-A+bXB9F8FD+A1iRuETIxP12bkH/5NKcx01ERXJZAj+Q="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'setuptools!=61.*,<=67.1.0,>=40.6.0' setuptools + ''; + build-system = [ setuptools ]; dependencies = [ @@ -23,14 +32,18 @@ buildPythonPackage rec { whey ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' - ''; + pythonImportsCheck = [ "whey_pth" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # missing dependency coincidence + doCheck = false; meta = { - description = "Extension to whey to support .pth files."; - homepage = "https://pypi.org/project/whey-pth"; + description = "Extension to whey to support .pth files"; + homepage = "https://github.com/repo-helper/whey-pth"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tyberius-prime ]; }; diff --git a/pkgs/development/python-modules/whey/default.nix b/pkgs/development/python-modules/whey/default.nix index 7c1aaec13e6c..61ef34e74ad6 100644 --- a/pkgs/development/python-modules/whey/default.nix +++ b/pkgs/development/python-modules/whey/default.nix @@ -1,30 +1,41 @@ { buildPythonPackage, - fetchPypi, + fetchFromGitHub, lib, setuptools, attrs, click, consolekit, dist-meta, + docutils, dom-toml, domdf-python-tools, + editables, handy-archives, natsort, packaging, pyproject-parser, + pytestCheckHook, shippinglabel, }: + buildPythonPackage rec { pname = "whey"; version = "0.1.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-l72fjczuuDXg/cDiqJ7roNVm4X+au+1u4AA8Szs1bNo="; + src = fetchFromGitHub { + owner = "repo-helper"; + repo = "whey"; + tag = "v${version}"; + hash = "sha256-s2jZmuFj0gTWVTcXWcBhcu5RBuaf/qMS/xzIpIoG1ZE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'setuptools!=61.*,<=67.1.0,>=40.6.0' setuptools + ''; + build-system = [ setuptools ]; dependencies = [ @@ -41,14 +52,29 @@ buildPythonPackage rec { shippinglabel ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' - ''; + pythonImportsCheck = [ "whey" ]; + + optional-dependencies = { + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + editable = [ + editables + ]; + readme = [ + docutils + pyproject-parser + ] ++ pyproject-parser.optional-dependencies.readme; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # missing dependency pyproject-examples + doCheck = false; meta = { - description = "A simple Python wheel builder for simple projects."; - homepage = "https://pypi.org/project/whey"; + description = "Simple Python wheel builder for simple projects"; + homepage = "https://github.com/repo-helper/whey"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tyberius-prime ]; }; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index a38555846362..4829bcc798ee 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -48,6 +48,7 @@ rec { runCommand, writeText, autoPatchelfHook, + buildPackages, # The JDK/JRE used for running Gradle. java ? defaultJava, @@ -78,7 +79,6 @@ rec { ]; buildInputs = [ - java stdenv.cc.cc ncurses5 ncurses6 @@ -123,6 +123,8 @@ rec { newFileEvents = toString (lib.versionAtLeast version "8.12"); in '' + # get the correct jar executable for cross + export PATH="${buildPackages.jdk}/bin:$PATH" . ${./patching.sh} nativeVersion="$(extractVersion native-platform $out/lib/gradle/lib/native-platform-*.jar)" diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index 59ff96a3f42f..ab873f618f22 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -21,13 +21,13 @@ let common = rec { - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixd"; rev = version; - hash = "sha256-5+ul4PxMgPkmGLB8CYpJcIcRDY/pJgByvjIHDA1Gs5A="; + hash = "sha256-gYC7nbZsTDOA1cJIw9JRjwjgkvSzrlQonGTT21EZeWM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix index 73404de17624..444b35a6ee94 100644 --- a/pkgs/development/tools/marksman/default.nix +++ b/pkgs/development/tools/marksman/default.nix @@ -28,7 +28,7 @@ buildDotnetModule rec { nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; postInstall = '' diff --git a/pkgs/development/tools/rust/cargo-web/default.nix b/pkgs/development/tools/rust/cargo-web/default.nix deleted file mode 100644 index ace033d6a114..000000000000 --- a/pkgs/development/tools/rust/cargo-web/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - openssl, - perl, - pkg-config, - rustPlatform, - CoreServices, - Security, - fetchpatch, -}: - -rustPlatform.buildRustPackage rec { - pname = "cargo-web"; - version = "0.6.26"; - - src = fetchFromGitHub { - owner = "koute"; - repo = pname; - rev = version; - sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd"; - }; - - patches = [ - (fetchpatch { - name = "fix-qualified-path.patch"; - url = "https://github.com/koute/cargo-web/commit/c9584542163d60d0aae6d6890509794e838e257f.patch"; - hash = "sha256-w59fXmrszptKt0llqGt0AF+0b3r9N6xUY6zQkpZnemE="; - }) - ]; - - cargoHash = "sha256-apPXSG8RV9hZ+jttn4XHhgmuLQ7344SQJna7Z/fu/mA="; - - nativeBuildInputs = [ - openssl - perl - pkg-config - ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - ]; - - meta = with lib; { - description = "Cargo subcommand for the client-side Web"; - mainProgram = "cargo-web"; - homepage = "https://github.com/koute/cargo-web"; - license = with licenses; [ - asl20 # or - mit - ]; - maintainers = with maintainers; [ clevor ]; - }; -} diff --git a/pkgs/games/openra/build-engine.nix b/pkgs/games/openra/build-engine.nix index 85644fadef06..956ed7750e81 100644 --- a/pkgs/games/openra/build-engine.nix +++ b/pkgs/games/openra/build-engine.nix @@ -17,8 +17,8 @@ buildDotnetModule rec { nugetDeps = engine.deps; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-runtime = dotnetCorePackages.runtime_6_0-bin; useAppHost = false; diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index 1eed4d5a569b..a1ed882b2b1f 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,31 +1,31 @@ { fetchurl, fetchzip }: { - x86_64-darwin = fetchzip { - sha256 = "sha256-+xZmMc5VOJ2GKvZdR0qDdwj+qze4r7eJFtZuLUkqZwE="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_darwin_amd64.zip"; - }; - aarch64-darwin = fetchzip { - sha256 = "sha256-gIqPWHOl0bcZYmfujV3KnTrsZ8hWjN5KQDWq+aHNIn4="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_darwin_arm64.zip"; - }; - i686-linux = fetchurl { - sha256 = "sha256-HWUTRPkaqk26A2eeN13DUNKBNM+jDBa5UuqjrYzPK5k="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_386.tar.gz"; - }; - x86_64-linux = fetchurl { - sha256 = "sha256-El/IAemoIyOgQYpmI1F84qTFteHT0H3ncYp2WxzZcJY="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_amd64.tar.gz"; - }; - aarch64-linux = fetchurl { - sha256 = "sha256-AHsQbTWH1mNafhRtpGY31g89jP07TZnL5fJvS0EbLDU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_arm64.tar.gz"; - }; - armv6l-linux = fetchurl { - sha256 = "sha256-cpCgPLJEkgR0h5pduIEGP+sb58qZTljEeQn/w3Csz2Q="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_armv6.tar.gz"; - }; - armv7l-linux = fetchurl { - sha256 = "sha256-Nm09ih54jZEDMJCBJst43Sl2d6vVXCdFnkWBV4lehns="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.55/AdGuardHome_linux_armv7.tar.gz"; - }; +x86_64-darwin = fetchzip { + sha256 = "sha256-uviTmopXz7OYVr4H2M/dFOMw0vD5P+3t5CChSL2HyrE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_darwin_amd64.zip"; +}; +aarch64-darwin = fetchzip { + sha256 = "sha256-P9n6H8YmttcZE5E/7nw/Bc+Gzb4nHbs3L/2pgdqUyFw="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_darwin_arm64.zip"; +}; +i686-linux = fetchurl { + sha256 = "sha256-JPhx1Hqu5o3K4bBulStedLZexCtZhgZNgzvGTqUn3XY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_386.tar.gz"; +}; +x86_64-linux = fetchurl { + sha256 = "sha256-BEqPo3jeLukMnykO+6GNZ93bplDCOcV33BOHleQLWDI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_amd64.tar.gz"; +}; +aarch64-linux = fetchurl { + sha256 = "sha256-JxitRduWdp4uJCcoR7FA26prDIc68CzsFOviehxDRxI="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_arm64.tar.gz"; +}; +armv6l-linux = fetchurl { + sha256 = "sha256-TdBDGSny3xWRrMG5MamrN26E/fOf7V9jHvxxbK+7BPU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_armv6.tar.gz"; +}; +armv7l-linux = fetchurl { + sha256 = "sha256-mrBsebAKSelAMcuurAUiZdPKr2AGi9lnk1Dhz+PAm/0="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.56/AdGuardHome_linux_armv7.tar.gz"; +}; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 63315913b720..d5fcb49a85ff 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.55"; + version = "0.107.56"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 8d5b2885b867..c63e91595c0d 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -26,7 +26,15 @@ buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnetInstallFlags = [ "-p:TargetFramework=net8.0" ]; + dotnetInstallFlags = [ + "--framework" + "net8.0" + ]; + + postPatch = '' + substituteInPlace ${projectFile} ${testProjectFile} \ + --replace-fail 'net8.0;net462net8.0