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

Merge master into staging-next

parents ace5ad92 dbfe1b17
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ patch-rc-path-hooks.section.md
perl.section.md
pkg-config.section.md
postgresql-test-hook.section.md
premake.section.md
python.section.md
scons.section.md
tetex-tex-live.section.md
+7 −0
Original line number Diff line number Diff line
# Premake {#premake-hook}

This setup hook attempts to configure the package using [the Premake build configuration system](https://premake.github.io/). It overrides the `configurePhase` by default, if none exists.

[]{#premake-hook-premakefile} The Premakefile to use can be specified by setting `premakefile` in the derivation.

[]{#premake-hook-premakeFlagsArray} The flags passed to Premake can be configured by adding strings to the `premakeFlags` list.
+4 −1
Original line number Diff line number Diff line
@@ -3277,7 +3277,10 @@
    github = "callumio";
    githubId = 16057677;
    name = "Callum Leslie";
    keys = [ { fingerprint = "BC82 4BB5 1656 D144 285E  A0EC D382 C4AF EECE AA90"; } ];
    keys = [
      { fingerprint = "BC82 4BB5 1656 D144 285E  A0EC D382 C4AF EECE AA90"; }
      { fingerprint = "890B 06FB 209A 3E44 9491  C028 03B0 1F42 7831 BCFD"; }
    ];
  };
  calvertvl = {
    email = "calvertvl@gmail.com";
+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@

- `forgejo` and `forgejo-lts` no longer support the opt-in feature [PAM (Pluggable Authentication Module)](https://forgejo.org/docs/latest/user/authentication/#pam-pluggable-authentication-module).

- `gitea` no longer supports the opt-in feature [PAM (Pluggable Authentication Module)][https://docs.gitea.com/usage/authentication#pam-pluggable-authentication-module].
- `gitea` no longer supports the opt-in feature [PAM (Pluggable Authentication Module)](https://docs.gitea.com/usage/authentication#pam-pluggable-authentication-module).

- `services.ddclient.use` has been deprecated: `ddclient` now supports separate IPv4 and IPv6 configuration. Use `services.ddclient.usev4` and `services.ddclient.usev6` instead.

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ in
      default = { };
      description = ''
        Configuration for dendrite, see:
        <https://github.com/matrix-org/dendrite/blob/master/dendrite-config.yaml>
        <https://github.com/matrix-org/dendrite/blob/main/dendrite-sample.yaml>
        for available options with which to populate settings.
      '';
    };
Loading