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

Merge master into staging-next

parents ce8a2c27 915af63a

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -17701,6 +17701,12 @@ 
    githubId = 145816;

    name = "David McKay";

  };

  rayhem = {

    email = "glosser1@gmail.com";

    github = "rayhem";

    githubId = 49202382;

    name = "Connor Glosser";

  };

  raylas = {

    email = "r@raymond.sh";

    github = "raylas";

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

+2 −0
Original line number Diff line number Diff line
@@ -437,6 +437,8 @@ 
- `zx` was updated to v8, which introduces several breaking changes.

  See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information.



- `feishin` removed support for Navidrome `< v0.53.2` due to an API change; more information in the [v0.10.0 release notes](https://github.com/jeffvli/feishin/releases/tag/v0.10.0).



- The `dnscrypt-wrapper` module was removed since the project has been effectively unmaintained since 2018; moreover the NixOS module had to rely on an abandoned version of dnscrypt-proxy v1 for the rotation of keys.

  To wrap a resolver with DNSCrypt you can instead use `dnsdist`. See options `services.dnsdist.dnscrypt.*`

nixos/modules/services/web-servers/nginx/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ in 
            '';

          };

          "memcached" = {

            servers."unix:/run//memcached/memcached.sock" = {};

            servers."unix:/run/memcached/memcached.sock" = {};

          };

        };

      };

pkgs/applications/audio/ledfx/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ 


python3.pkgs.buildPythonPackage rec {

  pname = "ledfx";

  version = "2.0.100";

  version = "2.0.104";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-IRwzm0ODeT+umLvIjNURdTE9igpJ03r+ArjNN3y//z0=";

    hash = "sha256-Hs21Okf0gt8eHTuGMW8L2ioW+hv7QDFOP4oJDQfRba0=";

  };



  pythonRelaxDeps = true;

pkgs/applications/audio/praat/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "praat";

  version = "6.4.20";

  version = "6.4.21";



  src = fetchFromGitHub {

    owner = "praat";

    repo = "praat";

    rev = "v${finalAttrs.version}";

    hash = "sha256-qal7eIKht0XkRDEsAfNkNDwmDYrr/cLQV4pMMWE+kFk=";

    hash = "sha256-2OeipesVdonv1XACbt9o99M9bxzxE0WQzCU2KWJmuzQ=";

  };



  nativeBuildInputs = [