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

staging-next 2025-03-03 (#386822)

parents 5a59e705 cc157d6c

nixos/modules/services/desktops/pipewire/pipewire.nix

+10 −30
Original line number Diff line number Diff line
@@ -58,12 +58,9 @@ let 


  configPackages = cfg.configPackages;



  extraConfigPkg =

    extraConfigPkgFromFiles [ "pipewire" "client" "client-rt" "jack" "pipewire-pulse" ]

      (

  extraConfigPkg = extraConfigPkgFromFiles [ "pipewire" "client" "jack" "pipewire-pulse" ] (

    mapToFiles "pipewire" cfg.extraConfig.pipewire

    // mapToFiles "client" cfg.extraConfig.client

        // mapToFiles "client-rt" cfg.extraConfig.client-rt

    // mapToFiles "jack" cfg.extraConfig.jack

    // mapToFiles "pipewire-pulse" cfg.extraConfig.pipewire-pulse

  );
@@ -205,27 +202,6 @@ in 
            [wiki]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-client

          '';

        };

        client-rt = mkOption {

          type = attrsOf json.type;

          default = { };

          example = {

            "10-alsa-linear-volume" = {

              "alsa.properties" = {

                "alsa.volume-method" = "linear";

              };

            };

          };

          description = ''

            Additional configuration for the PipeWire client library, used by real-time applications and legacy ALSA clients.



            Every item in this attrset becomes a separate drop-in file in `/etc/pipewire/client-rt.conf.d`.



            See the [PipeWire wiki][wiki] for examples of general configuration, and [PipeWire wiki - ALSA][wiki-alsa] for ALSA clients.



            [wiki]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-client

            [wiki-alsa]: https://gitlab.freedesktop.org/pipewire/pipewire/-/wikis/Config-ALSA

          '';

        };

        jack = mkOption {

          type = attrsOf json.type;

          default = { };
@@ -341,6 +317,10 @@ in 
      pipewire-media-session is no longer supported upstream and has been removed.

      Please switch to `services.pipewire.wireplumber` instead.

    '')

    (mkRemovedOptionModule [ "services" "pipewire" "extraConfig" "client-rt" ] ''

      `services.pipewire.extraConfig.client-rt` is no longer applicable, as `client-rt.conf` has been

      removed upstream. Please move your customizations to `services.pipewire.extraConfig.client`.

    '')

  ];



  ###### implementation

nixos/modules/system/boot/systemd.nix

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ let 
      "sys-fs-fuse-connections.mount"

      ] ++ (optional (!config.boot.isContainer) "sys-kernel-config.mount") ++ [

      "sys-kernel-debug.mount"

      "sys-kernel-tracing.mount"



      # Maintaining state across reboots.

      "systemd-random-seed.service"

nixos/tests/installed-tests/xdg-desktop-portal.nix

+23 −13
Original line number Diff line number Diff line 
{ pkgs, makeInstalledTest, ... }:

{

  lib,

  pkgs,

  makeInstalledTest,

  ...

}:



makeInstalledTest {

  tested = pkgs.xdg-desktop-portal;



  # Red herring

  # Failed to load RealtimeKit property: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.freedesktop.RealtimeKit1 was not provided by any .service files

  # Maybe a red herring, enabling PipeWire doesn't fix the location test.

  # Failed connect to PipeWire: Couldn't connect to PipeWire

  testConfig = {

    environment.variables = {

      TEST_IN_CI = 1;

      XDG_DATA_DIRS = "${pkgs.xdg-desktop-portal.installedTests}/share/installed-tests/xdg-desktop-portal/share";

      GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" [

        pkgs.glib.out

        pkgs.umockdev.out

      ];

      # need to set this ourselves, because the tests will set LD_PRELOAD=libumockdev-preload.so,

      # which can't be found because it's not in default rpath

      LD_PRELOAD = "${pkgs.umockdev.out}/lib/libumockdev-preload.so";

      XDP_TEST_IN_CI = 1;

    };

    # Broken, see comment in the package file.

    #services.geoclue2 = {

    #  enable = true;

    #  enableDemoAgent = true;

    #};

    #location.provider = "geoclue2";

    environment.systemPackages = with pkgs; [

      umockdev

      wireless-regdb

    ];

    services.geoclue2 = {

      enable = true;

      enableDemoAgent = true;

    };

    location.provider = "geoclue2";

  };

}

pkgs/applications/audio/ardour/7.nix

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
  soundtouch,

  sratom,

  suil,

  taglib,

  taglib_1,

  vamp-plugin-sdk,

  wafHook,

  xjadeo,
@@ -166,7 +166,7 @@ stdenv.mkDerivation rec { 
      soundtouch

      sratom

      suil

      taglib

      taglib_1

      vamp-plugin-sdk

    ]

    ++ lib.optionals videoSupport [

pkgs/applications/audio/clementine/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
  qtbase,

  qtx11extras,

  qttools,

  taglib,

  taglib_1,

  fftw,

  glew,

  qjson,
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { 
      qtx11extras

      qttools

      sqlite

      taglib

      taglib_1

      alsa-lib

    ]

    # gst_plugins needed for setup-hooks