Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'

Conflicts:
	nixpkgs/nixos/modules/misc/documentation.nix
	nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/go-modules/generic/default.nix
	nixpkgs/pkgs/development/interpreters/ruby/default.nix
	nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix
	nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
	nixpkgs/pkgs/servers/mail/mailman/web.nix
	nixpkgs/pkgs/top-level/aliases.nix
	nixpkgs/pkgs/top-level/all-packages.nix
	nixpkgs/pkgs/top-level/impure.nix

2 files changed, 25 insertions, 187 deletions

diff --git a/overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch b/overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch
index 7485fcc69f8b..007f056a4673 100644
--- a/overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch
+++ b/overlays/patches/gh/Support-reading-auth-token-from-file-descriptor.patch
@@ -1,4 +1,4 @@
-From 796721d5e0529a952e905497b2d57d2d471799af Mon Sep 17 00:00:00 2001
+From ffca80c699d1705dd9d6efd774b7467aa5945836 Mon Sep 17 00:00:00 2001
 From: Alyssa Ross <hi@alyssa.is>
 Date: Mon, 29 Mar 2021 14:12:17 +0000
 Subject: [PATCH] Support reading auth token from file descriptor
@@ -10,23 +10,22 @@ This is a quick hack:
   propagating this to children.
 * `gh auth status' doesn't work.
 ---
- internal/config/from_env.go | 26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
+ internal/config/from_env.go | 25 ++++++++++++++++++++++++-
+ 1 file changed, 24 insertions(+), 1 deletion(-)
 
 diff --git a/internal/config/from_env.go b/internal/config/from_env.go
-index 6373f169..1af9dfe6 100644
+index ad31537f..5f3fb82f 100644
 --- a/internal/config/from_env.go
 +++ b/internal/config/from_env.go
-@@ -2,13 +2,16 @@ package config
+@@ -2,6 +2,7 @@ package config
  
  import (
  	"fmt"
 +	"io"
  	"os"
-+	"strconv"
+ 	"strconv"
  
- 	"github.com/cli/cli/v2/internal/ghinstance"
- )
+@@ -10,6 +11,7 @@ import (
  
  const (
  	GH_HOST                 = "GH_HOST"
@@ -34,7 +33,7 @@ index 6373f169..1af9dfe6 100644
  	GH_TOKEN                = "GH_TOKEN"
  	GITHUB_TOKEN            = "GITHUB_TOKEN"
  	GH_ENTERPRISE_TOKEN     = "GH_ENTERPRISE_TOKEN"
-@@ -84,7 +87,27 @@ func (c *envConfig) CheckWriteable(hostname, key string) error {
+@@ -86,7 +88,27 @@ func (c *envConfig) CheckWriteable(hostname, key string) error {
  	return c.Config.CheckWriteable(hostname, key)
  }
  
@@ -62,7 +61,7 @@ index 6373f169..1af9dfe6 100644
  	if ghinstance.IsEnterprise(hostname) {
  		if token := os.Getenv(GH_ENTERPRISE_TOKEN); token != "" {
  			return token, GH_ENTERPRISE_TOKEN
-@@ -101,7 +124,8 @@ func AuthTokenFromEnv(hostname string) (string, string) {
+@@ -111,7 +133,8 @@ func AuthTokenFromEnv(hostname string) (string, string) {
  }
  
  func AuthTokenProvidedFromEnv() bool {
diff --git a/overlays/patches/linux/eve-backlight.patch b/overlays/patches/linux/eve-backlight.patch
index 02f6b39b0e5d..6df8577008c5 100644
--- a/overlays/patches/linux/eve-backlight.patch
+++ b/overlays/patches/linux/eve-backlight.patch
@@ -1,4 +1,4 @@
-From bf76d1b99b14e3847f4abef54f7a0bfb505bf0a4 Mon Sep 17 00:00:00 2001
+From 4b5c309e05e3033ebc2dc00c17a1884449cf4e2b Mon Sep 17 00:00:00 2001
 From: Alyssa Ross <hi@alyssa.is>
 Date: Thu, 24 Jun 2021 00:46:26 +0000
 Subject: [PATCH 1/2] Revert "drm/i915/dp: Don't use DPCD backlights that need
@@ -10,30 +10,28 @@ This reverts commit fe7d52bccab674a22776a2f31236bf4232e85410.
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
-index 8e9ac9ba1d38..f678499577a6 100644
+index c82f8febe730..82d1fcc095f2 100644
 --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
 +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
-@@ -586,14 +586,9 @@ intel_dp_aux_supports_vesa_backlight(struct intel_connector *connector)
+@@ -345,12 +345,7 @@ intel_dp_aux_supports_vesa_backlight(struct intel_connector *connector)
+ 	struct intel_dp *intel_dp = intel_attached_dp(connector);
  	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
  
- 	/* Check the eDP Display control capabilities registers to determine if
--	 * the panel can support backlight control over the aux channel.
--	 *
--	 * TODO: We currently only support AUX only backlight configurations, not backlights which
+-	/* TODO: We currently only support AUX only backlight configurations, not backlights which
 -	 * require a mix of PWM and AUX controls to work. In the mean time, these machines typically
 -	 * work just fine using normal PWM controls anyway.
-+	 * the panel can support backlight control over the aux channel
- 	 */
- 	if (intel_dp->edp_dpcd[1] & DP_EDP_TCON_BACKLIGHT_ADJUSTMENT_CAP &&
--	    (intel_dp->edp_dpcd[1] & DP_EDP_BACKLIGHT_AUX_ENABLE_CAP) &&
- 	    (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_AUX_SET_CAP)) {
+-	 */
+-	if ((intel_dp->edp_dpcd[1] & DP_EDP_BACKLIGHT_AUX_ENABLE_CAP) &&
+-	    drm_edp_backlight_supported(intel_dp->edp_dpcd)) {
++	if (drm_edp_backlight_supported(intel_dp->edp_dpcd)) {
  		drm_dbg_kms(&i915->drm, "AUX Backlight Control Supported!\n");
  		return true;
+ 	}
 -- 
 2.33.0
 
 
-From af00b92f217e559e4f2c5a852a84bc2843d00c3b Mon Sep 17 00:00:00 2001
+From 023170bb983f59dff1f249500262d15705bc4c6f Mon Sep 17 00:00:00 2001
 From: Kevin Chowski <chowski@google.com>
 Date: Sat, 8 Aug 2020 15:40:51 -0600
 Subject: [PATCH 2/2] CHROMIUM: Changes needed for backlight control on Eve-5.4
@@ -83,145 +81,14 @@ Conflicts:
 Signed-off-by: Guenter Roeck <groeck@chromium.org>
 (cherry picked from commit 37af4b996c1e25b7be4a00e5c5bcf29bc37cd51a)
 ---
- .../drm/i915/display/intel_dp_aux_backlight.c | 143 ++++++++++++++++--
- drivers/gpu/drm/i915/i915_params.c            |   3 +
- drivers/gpu/drm/i915/i915_params.h            |   3 +-
- 3 files changed, 139 insertions(+), 10 deletions(-)
+ .../drm/i915/display/intel_dp_aux_backlight.c | 57 +++++++++++++++++++
+ 1 file changed, 57 insertions(+)
 
 diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
-index f678499577a6..edbc0f728d1b 100644
+index 82d1fcc095f2..a139b7e29aa3 100644
 --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
 +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
-@@ -385,10 +385,16 @@ static bool intel_dp_aux_vesa_set_pwm_freq(struct intel_connector *connector)
- {
- 	struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
- 	struct intel_dp *intel_dp = intel_attached_dp(connector);
--	const u8 pn = connector->panel.backlight.edp.vesa.pwmgen_bit_count;
--	int freq, fxp, f, fxp_actual, fxp_min, fxp_max;
-+	int freq, fxp, fxp_min, fxp_max, fxp_actual, f = 1;
-+	u8 pn, pn_min, pn_max;
- 
-+	/* Find desired value of (F x P)
-+	 * Note that, if F x P is out of supported range, the maximum value or
-+	 * minimum value will applied automatically. So no need to check that.
-+	 */
- 	freq = dev_priv->vbt.backlight.pwm_freq_hz;
-+	drm_dbg_kms(&dev_priv->drm,
-+		    "VBT defined backlight frequency %u Hz\n", freq);
- 	if (!freq) {
- 		drm_dbg_kms(&dev_priv->drm,
- 			    "Use panel default backlight frequency\n");
-@@ -396,18 +402,50 @@ static bool intel_dp_aux_vesa_set_pwm_freq(struct intel_connector *connector)
- 	}
- 
- 	fxp = DIV_ROUND_CLOSEST(KHz(DP_EDP_BACKLIGHT_FREQ_BASE_KHZ), freq);
--	f = clamp(DIV_ROUND_CLOSEST(fxp, 1 << pn), 1, 255);
--	fxp_actual = f << pn;
- 
--	/* Ensure frequency is within 25% of desired value */
-+	/* Use highest possible value of Pn for more granularity of brightness
-+	 * adjustment while satifying the conditions below.
-+	 * - Pn is in the range of Pn_min and Pn_max
-+	 * - F is in the range of 1 and 255
-+	 * - FxP is within 25% of desired value.
-+	 *   Note: 25% is arbitrary value and may need some tweak.
-+	 */
-+	if (drm_dp_dpcd_readb(&intel_dp->aux,
-+			       DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN, &pn_min) != 1) {
-+		drm_dbg_kms(&dev_priv->drm,
-+			    "Failed to read pwmgen bit count cap min\n");
-+		return false;
-+	}
-+	if (drm_dp_dpcd_readb(&intel_dp->aux,
-+			       DP_EDP_PWMGEN_BIT_COUNT_CAP_MAX, &pn_max) != 1) {
-+		drm_dbg_kms(&dev_priv->drm,
-+			    "Failed to read pwmgen bit count cap max\n");
-+		return false;
-+	}
-+	pn_min &= DP_EDP_PWMGEN_BIT_COUNT_MASK;
-+	pn_max &= DP_EDP_PWMGEN_BIT_COUNT_MASK;
-+
- 	fxp_min = DIV_ROUND_CLOSEST(fxp * 3, 4);
- 	fxp_max = DIV_ROUND_CLOSEST(fxp * 5, 4);
--
--	if (fxp_min > fxp_actual || fxp_actual > fxp_max) {
--		drm_dbg_kms(&dev_priv->drm, "Actual frequency out of range\n");
-+	if (fxp_min < (1 << pn_min) || (255 << pn_max) < fxp_max) {
-+		drm_dbg_kms(&dev_priv->drm,
-+			    "VBT defined backlight frequency out of range\n");
- 		return false;
- 	}
- 
-+	for (pn = pn_max; pn >= pn_min; pn--) {
-+		f = clamp(DIV_ROUND_CLOSEST(fxp, 1 << pn), 1, 255);
-+		fxp_actual = f << pn;
-+		if (fxp_min <= fxp_actual && fxp_actual <= fxp_max)
-+			break;
-+	}
-+
-+	if (drm_dp_dpcd_writeb(&intel_dp->aux,
-+			       DP_EDP_PWMGEN_BIT_COUNT, pn) < 0) {
-+		drm_dbg_kms(&dev_priv->drm,
-+			    "Failed to write aux pwmgen bit count\n");
-+		return false;
-+	}
- 	if (drm_dp_dpcd_writeb(&intel_dp->aux,
- 			       DP_EDP_BACKLIGHT_FREQ_SET, (u8) f) < 0) {
- 		drm_dbg_kms(&dev_priv->drm,
-@@ -417,6 +455,26 @@ static bool intel_dp_aux_vesa_set_pwm_freq(struct intel_connector *connector)
- 	return true;
- }
- 
-+/*
-+ * Set minimum / maximum dynamic brightness percentage. This value is expressed
-+ * as the percentage of normal brightness in 5% increments.
-+ */
-+static bool
-+intel_dp_aux_set_dynamic_backlight_percent(struct intel_dp *intel_dp,
-+					   u32 min, u32 max)
-+{
-+	struct drm_i915_private *i915 = dp_to_i915(intel_dp);
-+	u8 dbc[] = { DIV_ROUND_CLOSEST(min, 5), DIV_ROUND_CLOSEST(max, 5) };
-+
-+	if (drm_dp_dpcd_write(&intel_dp->aux, DP_EDP_DBC_MINIMUM_BRIGHTNESS_SET,
-+			  dbc, sizeof(dbc)) < 0) {
-+		drm_dbg_kms(&i915->drm,
-+			    "Failed to write aux DBC brightness level\n");
-+		return false;
-+	}
-+	return true;
-+}
-+
- static void
- intel_dp_aux_vesa_enable_backlight(const struct intel_crtc_state *crtc_state,
- 				   const struct drm_connector_state *conn_state, u32 level)
-@@ -459,6 +517,16 @@ intel_dp_aux_vesa_enable_backlight(const struct intel_crtc_state *crtc_state,
- 		break;
- 	}
- 
-+	if (i915_modparams.enable_dbc &&
-+	    (intel_dp->edp_dpcd[2] & DP_EDP_DYNAMIC_BACKLIGHT_CAP)) {
-+		if (intel_dp_aux_set_dynamic_backlight_percent(intel_dp,
-+						0, 100)) {
-+			new_dpcd_buf |= DP_EDP_DYNAMIC_BACKLIGHT_ENABLE;
-+			drm_dbg_kms(&i915->drm,
-+				    "Enable dynamic brightness.\n");
-+		}
-+	}
-+
- 	if (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_FREQ_AUX_SET_CAP)
- 		if (intel_dp_aux_vesa_set_pwm_freq(connector))
- 			new_dpcd_buf |= DP_EDP_BACKLIGHT_FREQ_AUX_SET_ENABLE;
-@@ -588,7 +656,7 @@ intel_dp_aux_supports_vesa_backlight(struct intel_connector *connector)
- 	/* Check the eDP Display control capabilities registers to determine if
- 	 * the panel can support backlight control over the aux channel
- 	 */
--	if (intel_dp->edp_dpcd[1] & DP_EDP_TCON_BACKLIGHT_ADJUSTMENT_CAP &&
-+	if ((intel_dp->edp_dpcd[1] & DP_EDP_TCON_BACKLIGHT_ADJUSTMENT_CAP) &&
- 	    (intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_AUX_SET_CAP)) {
- 		drm_dbg_kms(&i915->drm, "AUX Backlight Control Supported!\n");
- 		return true;
-@@ -596,6 +664,59 @@ intel_dp_aux_supports_vesa_backlight(struct intel_connector *connector)
+@@ -352,6 +352,59 @@ intel_dp_aux_supports_vesa_backlight(struct intel_connector *connector)
  	return false;
  }
  
@@ -281,7 +148,7 @@ index f678499577a6..edbc0f728d1b 100644
  static const struct intel_panel_bl_funcs intel_dp_hdr_bl_funcs = {
  	.setup = intel_dp_aux_hdr_setup_backlight,
  	.enable = intel_dp_aux_hdr_enable_backlight,
-@@ -673,6 +794,10 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *connector)
+@@ -429,6 +482,10 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *connector)
  		return 0;
  	}
  
@@ -292,34 +159,6 @@ index f678499577a6..edbc0f728d1b 100644
  	if (try_vesa_interface && intel_dp_aux_supports_vesa_backlight(connector)) {
  		drm_dbg_kms(dev, "Using VESA eDP backlight controls\n");
  		panel->backlight.funcs = &intel_dp_vesa_bl_funcs;
-diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
-index e07f4cfea63a..8f27cb4e094f 100644
---- a/drivers/gpu/drm/i915/i915_params.c
-+++ b/drivers/gpu/drm/i915/i915_params.c
-@@ -187,6 +187,9 @@ i915_param_named(enable_dpcd_backlight, int, 0400,
- 	"Enable support for DPCD backlight control"
- 	"(-1=use per-VBT LFP backlight type setting [default], 0=disabled, 1=enable, 2=force VESA interface, 3=force Intel interface)");
- 
-+i915_param_named(enable_dbc, bool, 0600,
-+	"Enable support for dynamic backlight control (default:false)");
-+
- #if IS_ENABLED(CONFIG_DRM_I915_GVT)
- i915_param_named(enable_gvt, bool, 0400,
- 	"Enable support for Intel GVT-g graphics virtualization host support(default:false)");
-diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
-index f27eceb82c0f..02b551796476 100644
---- a/drivers/gpu/drm/i915/i915_params.h
-+++ b/drivers/gpu/drm/i915/i915_params.h
-@@ -82,7 +82,8 @@ struct drm_printer;
- 	param(bool, verbose_state_checks, true, 0) \
- 	param(bool, nuclear_pageflip, false, 0400) \
- 	param(bool, enable_dp_mst, true, 0600) \
--	param(bool, enable_gvt, false, IS_ENABLED(CONFIG_DRM_I915_GVT) ? 0400 : 0)
-+	param(bool, enable_gvt, false, IS_ENABLED(CONFIG_DRM_I915_GVT) ? 0400 : 0) \
-+	param(bool, enable_dbc, false, 0600)
- 
- #define MEMBER(T, member, ...) T member;
- struct i915_params {
 -- 
 2.33.0