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

Merge staging-next into staging

parents d508b598 e68fd265

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -16895,6 +16895,12 @@ 
    githubId = 943430;

    name = "David Hagege";

  };

  peat-psuwit = {

    name = "Ratchanan Srirattanamet";

    email = "peat@peat-network.xyz";

    github = "peat-psuwit";

    githubId = 6771175;

  };

  pedohorse = {

    github = "pedohorse";

    githubId = 13556996;

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->



- Create the first release note entry in this section!

- [Kimai](https://www.kimai.org/), a web-based multi-user time-tracking application. Available as [services.kimai](option.html#opt-services.kimai).



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1459,6 +1459,7 @@ 
  ./services/web-apps/kasmweb/default.nix

  ./services/web-apps/kavita.nix

  ./services/web-apps/keycloak.nix

  ./services/web-apps/kimai.nix

  ./services/web-apps/komga.nix

  ./services/web-apps/lanraragi.nix

  ./services/web-apps/lemmy.nix

nixos/modules/services/desktop-managers/lomiri.nix

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ in 
          ])

          ++ (with pkgs.lomiri; [

            hfd-service

            history-service

            libusermetrics

            lomiri

            lomiri-calculator-app
@@ -90,6 +89,7 @@ in 
            lomiri-download-manager

            lomiri-filemanager-app

            lomiri-gallery-app

            lomiri-history-service

            lomiri-polkit-agent

            lomiri-schemas # exposes some required dbus interfaces

            lomiri-session # wrappers to properly launch the session

nixos/modules/services/desktops/geoclue2.nix

+15 −7
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ 
with lib;



let

  # the demo agent isn't built by default, but we need it here

  package = pkgs.geoclue2.override { withDemoAgent = config.services.geoclue2.enableDemoAgent; };



  cfg = config.services.geoclue2;



  defaultWhitelist = [ "gnome-shell" "io.elementary.desktop.agent-geoclue2" ];
@@ -132,6 +129,17 @@ in 
        '';

      };



      package = mkOption {

        type = types.package;

        default = pkgs.geoclue2;

        defaultText = literalExpression "pkgs.geoclue2";

        apply = pkg: pkg.override {

          # the demo agent isn't built by default, but we need it here

          withDemoAgent = cfg.enableDemoAgent;

        };

        description = "The geoclue2 package to use";

      };



      submitData = mkOption {

        type = types.bool;

        default = false;
@@ -180,11 +188,11 @@ in 
  ###### implementation

  config = mkIf cfg.enable {



    environment.systemPackages = [ package ];

    environment.systemPackages = [ cfg.package ];



    services.dbus.packages = [ package ];

    services.dbus.packages = [ cfg.package ];



    systemd.packages = [ package ];

    systemd.packages = [ cfg.package ];



    # we cannot use DynamicUser as we need the the geoclue user to exist for the

    # dbus policy to work
@@ -223,7 +231,7 @@ in 
        unitConfig.ConditionUser = "!@system";

        serviceConfig = {

          Type = "exec";

          ExecStart = "${package}/libexec/geoclue-2.0/demos/agent";

          ExecStart = "${cfg.package}/libexec/geoclue-2.0/demos/agent";

          Restart = "on-failure";

          PrivateTmp = true;

        };