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

Merge master into staging-nixos

parents ff7e535e 088b069b

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -18976,6 +18976,11 @@ 
    github = "noaccOS";

    githubId = 24324352;

  };

  Noah765 = {

    name = "Noah765";

    github = "Noah765";

    githubId = 99338019;

  };

  noahfraiture = {

    name = "Noahcode";

    email = "pro@noahcode.dev";

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

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


- [dsearch](https://github.com/AvengeMedia/danksearch), a fast filesystem search service with fuzzy matching. Available as [programs.dsearch](#opt-programs.dsearch.enable).



- [Ente Auth](https://ente.io/auth/), an open source 2FA authenticator, with end-to-end encrypted backups. Available as [programs.ente-auth](#opt-programs.ente-auth.enable).



- [udp-over-tcp](https://github.com/mullvad/udp-over-tcp), a tunnel for proxying UDP traffic over a TCP stream. Available as `services.udp-over-tcp`.



- [Komodo Periphery](https://github.com/moghtech/komodo), a multi-server Docker and Git deployment agent by Komodo. Available as [services.komodo-periphery](#opt-services.komodo-periphery.enable).

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ 
  ./programs/dsearch.nix

  ./programs/dublin-traceroute.nix

  ./programs/ecryptfs.nix

  ./programs/ente-auth.nix

  ./programs/environment.nix

  ./programs/envision.nix

  ./programs/evince.nix

nixos/modules/programs/ente-auth.nix

0 → 100644
+27 −0
Original line number Diff line number Diff line 
{

  config,

  lib,

  pkgs,

  ...

}:

let

  cfg = config.programs.ente-auth;

in

{

  options.programs.ente-auth = {

    enable = lib.mkEnableOption "Ente Auth";

    package = lib.mkPackageOption pkgs "ente-auth" { };

  };



  config = lib.mkIf cfg.enable {

    environment.systemPackages = [ cfg.package ];

    services.gnome.gnome-keyring.enable = lib.mkIf (

      !config.services.desktopManager.plasma6.enable

    ) true;

  };



  meta.maintainers = with lib.maintainers; [

    gepbird

    yiyu

  ];

}

nixos/modules/services/misc/gitlab.md

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ configure a Gitlab Runner with caching and reasonably good security practices. 


::: {#ex-gitlab-runner-podman .example}



## Example: Gitlab Runner with `podman` and Nix Store Caching

## Gitlab Runner with `podman` and Nix Store Caching



The [VM tested `podman-runner`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/gitlab/runner/podman-runner/default.nix)

(a NixOS module for reuse) configures an advanced Gitlab runner with the following features: