Merge commit '93883402a445ad467320925a0a5dbe43a949f25b'

Conflicts:
	nixpkgs/nixos/modules/programs/ssh.nix
	nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
	nixpkgs/pkgs/data/fonts/noto-fonts/default.nix
	nixpkgs/pkgs/development/go-modules/generic/default.nix
	nixpkgs/pkgs/development/interpreters/ruby/default.nix
	nixpkgs/pkgs/development/libraries/mesa/default.nix

2 files changed, 18 insertions, 111 deletions

diff --git a/overlays/patches/dino/default.nix b/overlays/patches/dino/default.nix
index 43370bf8a414..0ca4220f2f42 100644
--- a/overlays/patches/dino/default.nix
+++ b/overlays/patches/dino/default.nix
@@ -1,10 +1,13 @@
-{ dino, fetchpatch, ... } @ args:
+{ lib, dino, fetchpatch, ... } @ args:
 
 (dino.override (builtins.removeAttrs args [
   "dino" "fetchpatch"
 ])).overrideAttrs ({ patches ? [], ... }: {
   patches = patches ++ [
-    ./0001-add-an-option-to-enable-omemo-by-default-in-new-conv.patch
+    (fetchpatch {
+      url = "https://github.com/dino/dino/commit/6be319f8f9b1f19d2b775aa04660d9f2c3a04dd0.patch";
+      sha256 = "sha256-i7lJk5/1y/qwI53kChocWjlvS2ThRGrUTLxCMbyBgqs=";
+    })
     (fetchpatch {
       url = "https://github.com/dino/dino/commit/f85bf7af3d355794a2a5208aea21efeb5b6e529d.patch";
       sha256 = "0y8dldydvj75i2n53brki9czvzw1qwlk5646k3xrx5pnl31c7p5b";
diff --git a/overlays/patches/linux/eve-backlight.patch b/overlays/patches/linux/eve-backlight.patch
index b54a84356a40..00badbfab496 100644
--- a/overlays/patches/linux/eve-backlight.patch
+++ b/overlays/patches/linux/eve-backlight.patch
@@ -1,7 +1,7 @@
-From 81887483c3d8f651d49876ee96c57bded46705b0 Mon Sep 17 00:00:00 2001
+From 52e857c5b79d9da49d76738065746fe605a30ffe Mon Sep 17 00:00:00 2001
 From: Jani Nikula <jani.nikula@intel.com>
 Date: Wed, 25 Aug 2021 14:06:50 +0300
-Subject: [PATCH 1/5] drm/i915/backlight: extract backlight code to a separate
+Subject: [PATCH 1/4] drm/i915/backlight: extract backlight code to a separate
  file
 
 In a long overdue refactoring, split out backlight code to new
@@ -2664,15 +2664,15 @@ index 0ee4ff341e25..b27738df447d 100644
  #include "intel_crtc.h"
  #include "intel_de.h"
 
-base-commit: 25960cafa06e6fcd830e6c792e6a7de68c1e25ed
+base-commit: a0ebea480bb319a3ad408c99db91262dbc696b76
 -- 
-2.33.0
+2.34.1
 
 
-From 51f48c569a821c50eb1f23a60758b954c7de0c57 Mon Sep 17 00:00:00 2001
+From d4b46d294afbb60c4b700e2f97caa4d47b0fa2eb Mon Sep 17 00:00:00 2001
 From: Jani Nikula <jani.nikula@intel.com>
 Date: Wed, 25 Aug 2021 14:06:51 +0300
-Subject: [PATCH 2/5] drm/i915/backlight: mass rename functions to have
+Subject: [PATCH 2/4] drm/i915/backlight: mass rename functions to have
  intel_backlight_ prefix
 
 Follow the usual naming conventions. As a drive-by cleanup, also pass
@@ -3371,13 +3371,13 @@ index b27738df447d..76910c4b20e0 100644
  	vlv_dsi_add_properties(intel_connector);
  
 -- 
-2.33.0
+2.34.1
 
 
-From 79f3ee76e2861c09d4f8afd351b4b89c331a6a30 Mon Sep 17 00:00:00 2001
+From a352f98738d0d641437421538e6297ece3a71ac0 Mon Sep 17 00:00:00 2001
 From: Lyude Paul <lyude@redhat.com>
 Date: Fri, 5 Nov 2021 14:33:38 -0400
-Subject: [PATCH 3/5] drm/i915: Add support for panels with VESA backlights
+Subject: [PATCH 3/4] drm/i915: Add support for panels with VESA backlights
  with PWM enable/disable
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -3468,109 +3468,13 @@ index 22f15e7b2ecf..3897468140e0 100644
  		return true;
  	}
 -- 
-2.33.0
+2.34.1
 
 
-From 80bfbd23a11bd193d0eb2be3af5be61fb298fc7d Mon Sep 17 00:00:00 2001
-From: Lyude Paul <lyude@redhat.com>
-Date: Fri, 5 Nov 2021 14:33:40 -0400
-Subject: [PATCH 4/5] drm/dp: Don't read back backlight mode in
- drm_edp_backlight_enable()
-
-As it turns out, apparently some machines will actually leave additional
-backlight functionality like dynamic backlight control on before the OS
-loads. Currently we don't take care to disable unsupported features when
-writing back the backlight mode, which can lead to some rather strange
-looking behavior when adjusting the backlight.
-
-So, let's fix this by just not reading back the current backlight mode on
-initial enable. I don't think there should really be any downsides to this,
-and this will ensure we don't leave any unsupported functionality enabled.
-
-This should fix at least one (but not all) of the issues seen with DPCD
-backlight support on fi-bdw-samus
-
-v5:
-* Just avoid reading back DPCD register - Doug Anderson
-
-Signed-off-by: Lyude Paul <lyude@redhat.com>
-Fixes: 867cf9cd73c3 ("drm/dp: Extract i915's eDP backlight code into DRM helpers")
-Reviewed-by: Douglas Anderson <dianders@chromium.org>
-Message-Id: <20211105183342.130810-4-lyude@redhat.com>
-(cherry-picked from commit 646596485e1ed2182adf293dfd5aec4a96c46330)
----
- drivers/gpu/drm/drm_dp_helper.c | 40 ++++++++++-----------------------
- 1 file changed, 12 insertions(+), 28 deletions(-)
-
-diff --git a/drivers/gpu/drm/drm_dp_helper.c b/drivers/gpu/drm/drm_dp_helper.c
-index 6d0f2c447f3b..7bb24523a749 100644
---- a/drivers/gpu/drm/drm_dp_helper.c
-+++ b/drivers/gpu/drm/drm_dp_helper.c
-@@ -3214,27 +3214,13 @@ int drm_edp_backlight_enable(struct drm_dp_aux *aux, const struct drm_edp_backli
- 			     const u16 level)
- {
- 	int ret;
--	u8 dpcd_buf, new_dpcd_buf;
-+	u8 dpcd_buf = DP_EDP_BACKLIGHT_CONTROL_MODE_DPCD;
- 
--	ret = drm_dp_dpcd_readb(aux, DP_EDP_BACKLIGHT_MODE_SET_REGISTER, &dpcd_buf);
--	if (ret != 1) {
--		drm_dbg_kms(aux->drm_dev,
--			    "%s: Failed to read backlight mode: %d\n", aux->name, ret);
--		return ret < 0 ? ret : -EIO;
--	}
--
--	new_dpcd_buf = dpcd_buf;
--
--	if ((dpcd_buf & DP_EDP_BACKLIGHT_CONTROL_MODE_MASK) != DP_EDP_BACKLIGHT_CONTROL_MODE_DPCD) {
--		new_dpcd_buf &= ~DP_EDP_BACKLIGHT_CONTROL_MODE_MASK;
--		new_dpcd_buf |= DP_EDP_BACKLIGHT_CONTROL_MODE_DPCD;
--
--		if (bl->pwmgen_bit_count) {
--			ret = drm_dp_dpcd_writeb(aux, DP_EDP_PWMGEN_BIT_COUNT, bl->pwmgen_bit_count);
--			if (ret != 1)
--				drm_dbg_kms(aux->drm_dev, "%s: Failed to write aux pwmgen bit count: %d\n",
--					    aux->name, ret);
--		}
-+	if (bl->pwmgen_bit_count) {
-+		ret = drm_dp_dpcd_writeb(aux, DP_EDP_PWMGEN_BIT_COUNT, bl->pwmgen_bit_count);
-+		if (ret != 1)
-+			drm_dbg_kms(aux->drm_dev, "%s: Failed to write aux pwmgen bit count: %d\n",
-+				    aux->name, ret);
- 	}
- 
- 	if (bl->pwm_freq_pre_divider) {
-@@ -3244,16 +3230,14 @@ int drm_edp_backlight_enable(struct drm_dp_aux *aux, const struct drm_edp_backli
- 				    "%s: Failed to write aux backlight frequency: %d\n",
- 				    aux->name, ret);
- 		else
--			new_dpcd_buf |= DP_EDP_BACKLIGHT_FREQ_AUX_SET_ENABLE;
-+			dpcd_buf |= DP_EDP_BACKLIGHT_FREQ_AUX_SET_ENABLE;
- 	}
- 
--	if (new_dpcd_buf != dpcd_buf) {
--		ret = drm_dp_dpcd_writeb(aux, DP_EDP_BACKLIGHT_MODE_SET_REGISTER, new_dpcd_buf);
--		if (ret != 1) {
--			drm_dbg_kms(aux->drm_dev, "%s: Failed to write aux backlight mode: %d\n",
--				    aux->name, ret);
--			return ret < 0 ? ret : -EIO;
--		}
-+	ret = drm_dp_dpcd_writeb(aux, DP_EDP_BACKLIGHT_MODE_SET_REGISTER, dpcd_buf);
-+	if (ret != 1) {
-+		drm_dbg_kms(aux->drm_dev, "%s: Failed to write aux backlight mode: %d\n",
-+			    aux->name, ret);
-+		return ret < 0 ? ret : -EIO;
- 	}
- 
- 	ret = drm_edp_backlight_set_level(aux, bl, level);
--- 
-2.33.0
-
-
-From 51fe90de28690e72b886b936bbb69f9f107cf74c Mon Sep 17 00:00:00 2001
+From 23f71728b29bc8f9949bb05729fc2dd86eaeea8e Mon Sep 17 00:00:00 2001
 From: Lyude Paul <lyude@redhat.com>
 Date: Fri, 5 Nov 2021 14:33:41 -0400
-Subject: [PATCH 5/5] drm/dp, drm/i915: Add support for VESA backlights using
+Subject: [PATCH 4/4] drm/dp, drm/i915: Add support for VESA backlights using
  PWM for brightness control
 
 Now that we've added support to i915 for controlling panel backlights that
@@ -3877,5 +3781,5 @@ index 1d5b3dbb6e56..2b12e2b0f372 100644
  
  int
 -- 
-2.33.0
+2.34.1