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

Merge master into staging-next

parents 97def1b2 0bcf98ab

ci/OWNERS

+7 −0
Original line number Diff line number Diff line
@@ -333,6 +333,13 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt 
/pkgs/development/dhall-modules      @Gabriella439 @Profpatsch

/pkgs/development/interpreters/dhall @Gabriella439 @Profpatsch



# Agda

/pkgs/build-support/agda                  @NixOS/agda

/pkgs/top-level/agda-packages.nix         @NixOS/agda

/pkgs/development/libraries/agda          @NixOS/agda

/doc/languages-frameworks/agda.section.md @NixOS/agda

/nixos/tests/agda.nix                     @NixOS/agda



# Idris

/pkgs/development/idris-modules @Infinisil

/pkgs/development/compilers/idris2 @mattpolzin

doc/release-notes/rl-2511.section.md

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


- `neovimUtils.makeNeovimConfig` now uses `customLuaRC` parameter instead of accepting `luaRcContent`. The old usage is deprecated but still works with a warning.



- `python3Packages.pyocr` no longer supports `cuneiform` on Linux by default. It is still possible to enable it using `withCuneiformSupport` override.



- `telegram-desktop` packages now uses `Telegram` for its binary. The previous name was `telegram-desktop`. This is due to [an upstream decision](https://github.com/telegramdesktop/tdesktop/commit/56ff5808a3d766f892bc3c3305afb106b629ef6f) to make the name consistent with other platforms.



- `hsd` has been upgraded to version 8. See [their changelog](https://github.com/handshake-org/hsd/blob/v8.0.0/docs/release-notes/release-notes-8.x.md) for important instructions before upgrading.

maintainers/team-list.nix

+11 −0
Original line number Diff line number Diff line
@@ -45,6 +45,17 @@ with lib.maintainers; 
    enableFeatureFreezePing = true;

  };



  agda = {

    members = [

      alexarice

      ncfavier

      phijor

      turion

    ];

    scope = "Maintain Agda-related packages and modules.";

    shortName = "Agda";

  };



  android = {

    members = [

      adrian-gierakowski

nixos/modules/services/networking/murmur.nix

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ in 
        MemoryDenyWriteExecute = true;

        NoNewPrivileges = true;

        PrivateDevices = true;

        PrivateMounts = true;

        PrivateTmp = true;

        ProtectClock = true;

        ProtectControlGroups = true;

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

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ let 


  limesurveyConfig = pkgs.writeText "config.php" ''

    <?php

      return \array_merge(

      return \array_merge_recursive(

        \json_decode('${builtins.toJSON cfg.config}', true),

        [

          'config' => [
@@ -304,6 +304,7 @@ in 
      config = {

        tempdir = "${stateDir}/tmp";

        uploaddir = "${stateDir}/upload";

        userquestionthemerootdir = "${stateDir}/upload/themes/question";

        force_ssl = mkIf (

          cfg.virtualHost.addSSL || cfg.virtualHost.forceSSL || cfg.virtualHost.onlySSL

        ) "on";