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

Merge master into staging-nixos

parents a581678c 0ddc7f01

doc/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -323,3 +323,5 @@ gnuradioMinimal.override { 
### Additions and Improvements {#sec-nixpkgs-release-26.05-lib-additions-improvements}



- The builder `php.buildComposerProject2` for PHP applications has been improved for better reliability and stability.



- The `services.drupal` module has a few improvements aimed at making it better for installing custom Drupal instances, namely a `webRoot` option and a some new settings for managing variable content and filepaths.

nixos/modules/system/service/portable/config-data-item.nix→lib/services/config-data-item.nix

+1 −1
Original line number Diff line number Diff line 
# Tests in: ../../../../tests/modular-service-etc/test.nix

# Tests in: ../../nixos/tests/modular-service-etc/test.nix

# This file is a function that returns a module.

pkgs:

{

nixos/modules/system/service/portable/config-data.nix→lib/services/config-data.nix

+1 −1
Original line number Diff line number Diff line 
# Tests in: ../../../../tests/modular-service-etc/test.nix

# Tests in: ../../nixos/tests/modular-service-etc/test.nix



# Non-modular context provided by the modular services integration.

{ pkgs }:

nixos/modules/system/service/portable/service.nix→lib/services/service.nix

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ in 
  # https://nixos.org/manual/nixos/unstable/#modular-services

  _class = "service";

  imports = [

    ../../../../../modules/generic/meta-maintainers.nix

    ../../../misc/assertions.nix

    ../../modules/generic/meta-maintainers.nix

    ../../nixos/modules/misc/assertions.nix

    (lib.modules.importApply ./config-data.nix { inherit pkgs; })

  ];

  options = {