Unverified Commit 037a1dd5 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge release-23.11 into staging-next-23.11

parents 7dd40eb4 06b8a5a0

nixos/doc/manual/release-notes/rl-2311.section.md

+2 −1
Original line number Diff line number Diff line
@@ -644,7 +644,8 @@ The module update takes care of the new config syntax and the data itself (user 
  designed to be easy and safe to use.



  This aims to be a replacement for `lib.sources`-based filtering.

  To learn more about it, see [the tutorial](https://nix.dev/tutorials/file-sets).

  To learn more about it, see [the blog post](https://www.tweag.io/blog/2023-11-28-file-sets/)

  or [the tutorial](https://nix.dev/tutorials/file-sets).



- [`lib.gvariant`](https://nixos.org/manual/nixpkgs/unstable#sec-functions-library-gvariant):

  A partial and basic implementation of GVariant formatted strings.

nixos/modules/services/security/clamav.nix

+2 −1
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ in 


    systemd.services.clamav-daemon = mkIf cfg.daemon.enable {

      description = "ClamAV daemon (clamd)";

      after = optional cfg.updater.enable "clamav-freshclam.service";

      after = optionals cfg.updater.enable [ "clamav-freshclam.service" ];

      wants = optionals cfg.updater.enable [ "clamav-freshclam.service" ];

      wantedBy = [ "multi-user.target" ];

      restartTriggers = [ clamdConfigFile ];

nixos/modules/tasks/filesystems/bcachefs.nix

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ let 
          lib.elem (kernel.structuredExtraConfig.BCACHEFS_FS or null) [

            lib.kernel.module

            lib.kernel.yes

            lib.kernel.option.yes

            (lib.kernel.option lib.kernel.yes)

          ]

        )

      );

pkgs/applications/accessibility/contrast/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -64,5 +64,6 @@ stdenv.mkDerivation rec { 
    platforms = platforms.unix;

    # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs

    broken = stdenv.isDarwin;

    mainProgram = "contrast";

  };

}

pkgs/applications/accessibility/dasher/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -66,5 +66,6 @@ stdenv.mkDerivation { 
    license = lib.licenses.gpl2Only;

    maintainers = [ ];

    platforms = lib.platforms.all;

    mainProgram = "dasher";

  };

}