diff --git a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json index 46697ece448..e5e7517e38d 100644 --- a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json +++ b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json @@ -33,6 +33,13 @@ "hw-volume" ] }, + { + "name": "D50s", + "address": "~^00:13:ef:", + "no-features": [ + "hw-volume" + ] + }, { "name": "JBL Endurance RUN BT", "no-features": [ @@ -44,6 +51,18 @@ { "name": "JBL LIVE650BTNC" }, + { + "name": "Motorola DC800", + "no-features": [ + "sbc-xq" + ] + }, + { + "name": "Motorola S305", + "no-features": [ + "sbc-xq" + ] + }, { "name": "Soundcore Life P2-L", "no-features": [ @@ -191,47 +210,35 @@ }, { "sysname": "Linux", - "release": "~^5\\.(8|9|10)\\.", + "release": "~^5\\.(8|9)\\.", "no-features": [ "msbc-alt1" ] }, { "sysname": "Linux", - "release": "~^5\\.10\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50)($|[^0-9])" - }, - { - "sysname": "Linux", - "release": "~^5\\.10\\.", + "release": "~^5\\.10\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|51|52|53|54|55|56|57|58|59|60|61)($|[^0-9])", "no-features": [ "msbc-alt1" ] }, { "sysname": "Linux", - "release": "~^5\\.12\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17)($|[^0-9])" - }, - { - "sysname": "Linux", - "release": "~^5\\.12\\.", + "release": "~^5\\.12\\.(18|19)($|[^0-9])", "no-features": [ "msbc-alt1" ] }, { "sysname": "Linux", - "release": "~^5\\.13\\.(1|2)($|[^0-9])" - }, - { - "sysname": "Linux", - "release": "~^5\\.13\\.", + "release": "~^5\\.13\\.(3|4|5|6|7|8|9|10|11|12|13)($|[^0-9])", "no-features": [ "msbc-alt1" ] }, { "sysname": "Linux", - "release": "~^5\\.14\\.", + "release": "~^5\\.14($|[^0-9])", "no-features": [ "msbc-alt1" ] diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9e174707e40..406f1ec479d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -85,17 +85,18 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py - gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [ - "ffmpeg" - "snappy" + gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "95") [ + "zlib" ] ++ [ + # TODO: + # "ffmpeg" + # "snappy" "flac" "libjpeg" "libpng" "libwebp" "libxslt" "opus" - "zlib" ]; opusWithCustomModes = libopus.override { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 86ee33f3510..c4521c89caa 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_12, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand @@ -19,7 +19,7 @@ }: let - llvmPackages = llvmPackages_12; + llvmPackages = llvmPackages_13; stdenv = llvmPackages.stdenv; upstream-info = (lib.importJSON ./upstream-info.json).${channel}; @@ -54,9 +54,6 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (chromiumVersionAtLeast "93") rec { - llvmPackages = llvmPackages_13; - stdenv = llvmPackages.stdenv; }); browser = callPackage ./browser.nix { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index cc1564ef1a4..676553c5731 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "94.0.4606.31", - "sha256": "1f5hk2acd9lj88m2acz8ik85fh5h3giz65p19dpfg92zsyly54nf", - "sha256bin64": "1ypf9j51a4kmx27x3s9izzbd2r094idz194gwhbdly75l1x8hk4z", + "version": "94.0.4606.50", + "sha256": "1aqy9bvypx66bvn5p15g94p47yfbal8mixs1d0j82pznqnqgph1z", + "sha256bin64": "07hq4qnbgq6m43zhipgy84yhiiy1fs6ffjkgsi8ixhr9b5pipzpv", "deps": { "gn": { "version": "2021-08-11", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "95.0.4628.3", - "sha256": "04r2db9kl77lp4jyyj01pc70jkxrifbnz5hic4r91lf8m2gf1fa3", - "sha256bin64": "1ssf8jdk6gn2mrnyvgz2c9nkk70rsidd5y26w2kx3s0cllfr7d96", + "version": "95.0.4638.10", + "sha256": "0pgd5k24yly9fqpzigc5qqx6lvn6m95fjp7294cgmk0132icx71j", + "sha256bin64": "1gfaal3yxmi1n2nvfp39xp82g8vykzm0fjbdk0c1wh4gvlq2xx85", "deps": { "gn": { "version": "2021-08-11", @@ -44,19 +44,19 @@ } }, "ungoogled-chromium": { - "version": "92.0.4515.159", - "sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr", - "sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985", + "version": "93.0.4577.82", + "sha256": "0lr8zdq06smncdzd6knzww9hxl8ynvxadmrkyyl13fpwb1422rjx", + "sha256bin64": "0ydvcakpnl20gx7493hv6aqnyf8f28rkvzgwnm4gws92b92n9ify", "deps": { "gn": { - "version": "2021-05-07", + "version": "2021-07-08", "url": "https://gn.googlesource.com/gn", - "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", - "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" + "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8", + "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl" }, "ungoogled-patches": { - "rev": "92.0.4515.159-1", - "sha256": "1mfkpkyj0sd2k07fzmxmqc24ywqqmcv3vpg1yhh96k676q0qkpd0" + "rev": "93.0.4577.82-1", + "sha256": "199f78f5gvnkpkcvh7587pk35jslkszhvv1d648b4qphzxmw7c66" } } } diff --git a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch index 1f1a98780e9..d3851604a13 100644 --- a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index bbafa134..227d3e06 100644 +index 95632c250..a88aac6e2 100644 --- a/src/daemon/pipewire.conf.in +++ b/src/daemon/pipewire.conf.in -@@ -116,7 +116,7 @@ context.modules = [ +@@ -131,7 +131,7 @@ context.modules = [ # access.allowed to list an array of paths of allowed # apps. #access.allowed = [ @@ -11,18 +11,18 @@ index bbafa134..227d3e06 100644 #] # An array of rejected paths. -@@ -220,12 +220,12 @@ context.exec = [ +@@ -235,12 +235,12 @@ context.exec = [ # but it is better to start it as a systemd service. # Run the session manager with -h for options. # -- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } -+ @comment@{ path = "" args = "@session_manager_args@" } +- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } ++ @sm_comment@{ path = "" args = "@session_manager_args@" } # # You can optionally start the pulseaudio-server here as well # but it is better to start it as a systemd service. # It can be interesting to start another daemon here that listens # on another address with the -a option (eg. -a tcp:4713). # -- @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ @comment@{ path = "" args = "-c pipewire-pulse.conf" } +- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } ++ @pulse_comment@{ path = "" args = "-c pipewire-pulse.conf" } ] diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 1528d0a3b96..85dd7bfbff2 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -7,6 +7,7 @@ , ninja , systemd , pkg-config +, docutils , doxygen , graphviz , valgrind @@ -57,7 +58,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.34"; + version = "0.3.36"; outputs = [ "out" @@ -66,6 +67,7 @@ let "jack" "dev" "doc" + "man" "mediaSession" "installedTests" ]; @@ -75,7 +77,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-ZFARA7YuDnpObGLWbgy1Rk+wzmAxHEMuHQkb6tWD0s0="; + sha256 = "sha256-kwoffB0Hi84T4Q0NaxLxsCyPV4R0LayX9kHmXU/vRPA="; }; patches = [ @@ -94,6 +96,7 @@ let ]; nativeBuildInputs = [ + docutils doxygen graphviz meson @@ -125,7 +128,6 @@ let mesonFlags = [ "-Ddocs=enabled" - "-Dman=disabled" # we don't have xmltoman "-Dexamples=${mesonEnable withMediaSession}" # only needed for `pipewire-media-session` "-Dudevrulesdir=lib/udev/rules.d" "-Dinstalled_tests=enabled"