Unverified Commit 1e9a1505 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge branch 'staging' into staging-next

parents 1026f9e4 355eb2c1

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

+2 −0
Original line number Diff line number Diff line
@@ -231,6 +231,8 @@ In addition to numerous new and upgraded packages, this release has the followin 
  [upstream's release notes](https://github.com/iputils/iputils/releases/tag/20221126)

  for more details and available replacements.



- The ppp plugin `rp-pppoe.so` has been renamed to `pppoe.so` in ppp 2.4.9. Starting from ppp 2.5.0, there is no longer a alias for backwards compatiblity. Configurations that use this plugin must be updated accordingly from `plugin rp-pppoe.so` to `plugin pppoe.so`. See [upstream change](https://github.com/ppp-project/ppp/commit/610a7bd76eb1f99f22317541b35001b1e24877ed).



- [services.xserver.videoDrivers](options.html#opt-services.xserver.videoDrivers) now defaults to the `modesetting` driver over device-specific ones. The `radeon`, `amdgpu` and `nouveau` drivers are still available, but effectively unmaintained and not recommended for use.



- To enable the HTTP3 (QUIC) protocol for a nginx virtual host, set the `quic` attribute on it to true, e.g. `services.nginx.virtualHosts.<name>.quic = true;`.

nixos/tests/pppd.nix

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import ./make-test-python.nix ( 
            "ppp/pppoe-server-options".text = ''

              lcp-echo-interval 10

              lcp-echo-failure 2

              plugin rp-pppoe.so

              plugin pppoe.so

              require-chap

              nobsdcomp

              noccp
@@ -43,7 +43,7 @@ import ./make-test-python.nix ( 
          enable = true;

          peers.test = {

            config = ''

              plugin rp-pppoe.so eth1

              plugin pppoe.so eth1

              name "flynn"

              noipdefault

              persist

pkgs/applications/audio/fluidsynth/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-BSJu3jB7b5G2ThXBUHUNnBGl55EXe3nIzdBdgfOWDSM=";

  };



  outputs = [ "out" "dev" "man" ];



  nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ];



  buildInputs = [ glib libsndfile libjack2 ]

pkgs/applications/audio/mpg123/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec { 
    hash = "sha256-HKd9Omml/4RbegU294P+5VThBBE5prl49q/hT1gUrRo=";

  };



  outputs = [ "out" ] ++ lib.optional withConplay "conplay";

  outputs = [ "out" "dev" "man" ] ++ lib.optional withConplay "conplay";



  nativeBuildInputs = lib.optionals (!libOnly) (

    lib.optionals withConplay [ makeWrapper ]

pkgs/applications/editors/neovim/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ in 
      export VIMRUNTIME=$PWD/runtime

    '';



    separateDebugInfo = true;



    meta = with lib; {

      description = "Vim text editor fork focused on extensibility and agility";

      longDescription = ''