Unverified Commit 27c3e944 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 319c2c80 f5c6b4fe
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@

- `nodePackages.wavedrom-cli` has been removed, as it was unmaintained within nixpkgs.

- `requireFile` now treats any `message` or `url` argument as a literal string, rather than subjecting it to Bash here-doc expansion.  This allows including strings like `$PWD` in the message without needing to know about and handle the undocumented Bash expansion.

- `nodePackages.browserify` has been removed, as it was unmaintained within nixpkgs.

- `nodePackages.sass` has been removed, as it was unmaintained within nixpkgs.
@@ -202,6 +204,17 @@

- `docker-color-output` has been updated from major version 2 to 3. One breaking change is, that they switched to [YAML-based configuration files](https://github.com/devemio/docker-color-output?tab=readme-ov-file#configuration).

- `dasel` has been updated from v2.8.1 to v3. There were significant breaking changes:

  - The `put` and `delete` commands have been removed. Use the new query syntax with expressions to modify data in-place.
  - The `--version` flag is now a subcommand: `dasel version`
  - CLI framework migrated from Cobra to Kong, changing flag parsing behavior
  - Selector syntax has been revamped, see [dasel v3 documentation](https://daseldocs.tomwright.me/v3) for migration guide.

  Example migration:
  - Old: `echo '{"my":{"favourites":{"colour":"blue"}}}' | dasel put -t json -r json -t string -v "red" "my.favourites.colour"`
  - New: `echo '{"my":{"favourites":{"colour":"blue"}}}' | dasel query -i json -o json --root 'my.favourites.colour = "red"'`

- `stalwart-mail` has been renamed to `stalwart`

- Ethercalc and its associated module have been removed, as the package is unmaintained and cannot be installed from source with npm now.
+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ When reviewing a modular service, you should check the following. Details and ra
- [ ] `_class = "service"`
- [ ] Modular services provided through `passthru.services` must override the default of the package option using `finalAttrs.finalPackage`
- [ ] Is the modular services infrastructure sufficient for this service? If one or more features are not covered, comment in https://github.com/NixOS/nixpkgs/issues/428084
- [ ] Has been added to `nixos/modules/misc/documentation/modular-services.nix`
```

## Details
+2 −0
Original line number Diff line number Diff line
@@ -303,6 +303,8 @@ See <https://github.com/NixOS/nixpkgs/issues/481673>.

- `opengfw` package and `services.opengfw` module have been removed as the upstream GitHub repository and website have been shut down.

- `services.esphome` no longer uses `DynamicUser`. The service now runs as a static `esphome` system user. systemd handles the migration from `/var/lib/private/esphome` automatically, but users with [impermanence](https://github.com/nix-community/impermanence) setups should ensure `/var/lib/esphome` is persisted.

## Other Notable Changes {#sec-release-26.05-notable-changes}

<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ let
    options = {
      "<imports = [ pkgs.ghostunnel.services.default ]>" = fakeSubmodule pkgs.ghostunnel.services.default;
      "<imports = [ pkgs.php.services.default ]>" = fakeSubmodule pkgs.php.services.default;
      "<imports = [ pkgs.snid.services.default ]>" = fakeSubmodule pkgs.snid.services.default;
    };
  };
in
+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ let
      cp baseq3/pak*.pk3 /tmp/baseq3
      nix-store --add-fixed sha256 --recursive /tmp/baseq3

      Alternatively you can set services.quake3-server.baseq3 to a path and copy the baseq3 directory into
      $services.quake3-server.baseq3/.q3a/
      Alternatively you can set services.quake3-server.baseq3 to a path and
      copy the baseq3 directory into the .q3a subdirectory of that path.
    '';
  };

Loading