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

Merge master into staging-next

parents f65ccb31 3e8e1782

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -2769,6 +2769,12 @@ 
    githubId = 7435854;

    name = "Victor Calvert";

  };

  camelpunch = {

    email = "me@andrewbruce.net";

    github = "camelpunch";

    githubId = 141733;

    name = "Andrew Bruce";

  };

  cameronfyfe = {

    email = "cameron.j.fyfe@gmail.com";

    github = "cameronfyfe";

maintainers/team-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ with lib.maintainers; { 
    members = [

      cleeyv

      ryantm

      lassulus

    ];

    scope = "Maintain Jitsi.";

    shortName = "Jitsi";

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

+0 −2
Original line number Diff line number Diff line
@@ -238,8 +238,6 @@ 


- `baloo`, the file indexer/search engine used by KDE now has a patch to prevent files from constantly being reindexed when the device ids of the their underlying storage changes. This happens frequently when using btrfs or LVM. The patch has not yet been accepted upstream but it provides a significantly improved experience. When upgrading, reset baloo to get a clean index: `balooctl disable ; balooctl purge ; balooctl enable`.



- `services.ddclient` has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`.



- The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`.



- `fileSystems.<name>.autoFormat` now uses `systemd-makefs`, which does not accept formatting options. Therefore, `fileSystems.<name>.formatOptions` has been removed.

nixos/modules/programs/cdemu.nix

+13 −0
Original line number Diff line number Diff line
@@ -53,6 +53,19 @@ in { 
      dbus.packages = [ pkgs.cdemu-daemon ];

    };



    users.groups.${config.programs.cdemu.group} = {};



    # Systemd User service

    # manually adapted from example in source package:

    # https://sourceforge.net/p/cdemu/code/ci/master/tree/cdemu-daemon/service-example/cdemu-daemon.service

    systemd.user.services.cdemu-daemon.description = "CDEmu daemon";

    systemd.user.services.cdemu-daemon.serviceConfig = {

      Type = "dbus";

      BusName = "net.sf.cdemu.CDEmuDaemon";

      ExecStart = "${pkgs.cdemu-daemon}/bin/cdemu-daemon --config-file \"%h/.config/cdemu-daemon\"";

      Restart = "no";

    };



    environment.systemPackages =

      [ pkgs.cdemu-daemon pkgs.cdemu-client ]

      ++ optional cfg.gui pkgs.gcdemu

nixos/modules/services/backup/restic.nix

+1 −14
Original line number Diff line number Diff line
@@ -23,25 +23,13 @@ in 


        environmentFile = mkOption {

          type = with types; nullOr str;

          # added on 2021-08-28, s3CredentialsFile should

          # be removed in the future (+ remember the warning)

          default = config.s3CredentialsFile;

          default = null;

          description = lib.mdDoc ''

            file containing the credentials to access the repository, in the

            format of an EnvironmentFile as described by systemd.exec(5)

          '';

        };



        s3CredentialsFile = mkOption {

          type = with types; nullOr str;

          default = null;

          description = lib.mdDoc ''

            file containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY

            for an S3-hosted repository, in the format of an EnvironmentFile

            as described by systemd.exec(5)

          '';

        };



        rcloneOptions = mkOption {

          type = with types; nullOr (attrsOf (oneOf [ str bool ]));

          default = null;
@@ -300,7 +288,6 @@ in 
  };



  config = {

    warnings = mapAttrsToList (n: v: "services.restic.backups.${n}.s3CredentialsFile is deprecated, please use services.restic.backups.${n}.environmentFile instead.") (filterAttrs (n: v: v.s3CredentialsFile != null) config.services.restic.backups);

    assertions = mapAttrsToList (n: v: {

      assertion = (v.repository == null) != (v.repositoryFile == null);

      message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set";