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

Merge master into staging-nixos

parents 4a996d0d 2395e9d2

ci/github-script/lint-commits.js

+4 −2
Original line number Diff line number Diff line
@@ -32,10 +32,12 @@ async function checkCommitMessages({ github, context, core }) { 


  if (

    baseBranchType.includes('development') &&

    headBranchType.includes('development')

    headBranchType.includes('development') &&

    pr.base.repo.id === pr.head.repo?.id

  ) {

    // This matches, for example, PRs from staging-next to master, or vice versa.

    // This matches, for example, PRs from NixOS:staging-next to NixOS:master, or vice versa.

    // Ignore them: we should only care about PRs introducing *new* commits.

    // We still want to run on PRs from, e.g., Someone:master to NixOS:master, though.

    core.info(

      'This PR is from one development branch to another. Skipping checks.',

    )

doc/hooks/zig.section.md

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ stdenv.mkDerivation { 


The variables below are exclusive to `zig`.



#### `dontUseZigConfigure` {#dont-use-zig-configure}



Disables using `zigConfigurePhase`.



#### `dontUseZigBuild` {#dont-use-zig-build}



Disables using `zigBuildPhase`.

doc/redirects.json

+3 −0
Original line number Diff line number Diff line
@@ -2762,6 +2762,9 @@ 
    "index.html#zig-exclusive-variables",

    "index.html#zig-hook-exclusive-variables"

  ],

  "dont-use-zig-configure": [

    "index.html#dont-use-zig-configure"

  ],

  "dont-use-zig-build": [

    "index.html#dont-use-zig-build"

  ],

maintainers/maintainer-list.nix

+19 −0
Original line number Diff line number Diff line
@@ -6100,6 +6100,12 @@ 
    githubId = 98460960;

    email = "david.weisse@gmx.net";

  };

  davinci42 = {

    name = "Dan Xin";

    github = "davinci42";

    githubId = 4347318;

    email = "davinci42.cn@gmail.com";

  };

  davisrichard437 = {

    email = "davisrichard437@gmail.com";

    github = "davisrichard437";
@@ -17414,6 +17420,12 @@ 
    githubId = 66798382;

    name = "Sebastian Maximilian Scherthan";

  };

  miniharinn = {

    name = "Harinn";

    github = "MiniHarinn";

    githubId = 52773156;

    email = "prinn.dev@pm.me";

  };

  minijackson = {

    email = "minijackson@riseup.net";

    github = "minijackson";
@@ -18935,6 +18947,13 @@ 
    github = "niklaskorz";

    githubId = 590517;

  };

  niklasthorild = {

    name = "Niklas Thorild";

    email = "niklas@thorild.se";

    github = "niklasthorild";

    githubId = 224864856;

    keys = [ { fingerprint = "D116 2896 7DD7 4341 DF3C  AB2D 285C 222F EC9C 0336"; } ];

  };

  NiklasVousten = {

    name = "Niklas Vousten";

    email = "nixpkgs@vousten.dev";

nixos/modules/services/web-apps/mediawiki.nix

+7 −2
Original line number Diff line number Diff line
@@ -231,6 +231,9 @@ let 
        $wgRightsText = "";

        $wgRightsIcon = "";



        # Enable APCU caching

        $wgMainCacheType = CACHE_ACCEL;



        # Enabled skins.

        ${concatStringsSep "\n" (mapAttrsToList (k: v: "wfLoadSkin('${k}');") cfg.skins)}
@@ -256,8 +259,10 @@ in 
      package = mkPackageOption pkgs "mediawiki" { };



      # https://www.mediawiki.org/wiki/Compatibility#PHP

      phpPackage = mkPackageOption pkgs "php" {

        default = "php83";

      phpPackage = mkPackageOption pkgs "php" { } // {

        default = pkgs.php83.buildEnv {

          extensions = { all, enabled }: enabled ++ (with all; [ apcu ]);

        };

      };



      finalPackage = mkOption {