Unverified Commit 7dd40eb4 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

Merge remote-tracking branch 'origin/release-23.11' into staging-next-23.11 

Use the hash for nss_latest already on staging-next-23.11, since the
source has been migrated to git there.
parents 73e17291 5fdb1f2f

nixos/modules/services/networking/x2goserver.nix

+3 −0
Original line number Diff line number Diff line
@@ -160,5 +160,8 @@ in { 
    security.sudo.extraConfig = ''

      Defaults  env_keep+=QT_GRAPHICSSYSTEM

    '';

    security.sudo-rs.extraConfig = ''

      Defaults  env_keep+=QT_GRAPHICSSYSTEM

    '';

  };

}

pkgs/applications/networking/browsers/firefox/common.nix

+2 −1
Original line number Diff line number Diff line
@@ -254,7 +254,8 @@ buildStdenv.mkDerivation { 
  ]

  ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch

  ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch

  ++ lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch

  ++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch

  ++ lib.optional (lib.versionAtLeast version "121") ./no-buildconfig-ffx121.patch

  ++ extraPatches;



  postPatch = ''

pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx121.patch

0 → 100644
+27 −0
Original line number Diff line number Diff line 
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp

index cfbc39527b02..9327631a79c5 100644

--- a/docshell/base/nsAboutRedirector.cpp

+++ b/docshell/base/nsAboutRedirector.cpp

@@ -88,9 +88,6 @@ static const RedirEntry kRedirMap[] = {

     {"about", "chrome://global/content/aboutAbout.html", 0},

     {"addons", "chrome://mozapps/content/extensions/aboutaddons.html",

      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},

-    {"buildconfig", "chrome://global/content/buildconfig.html",

-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

-         nsIAboutModule::IS_SECURE_CHROME_UI},

     {"checkerboard", "chrome://global/content/aboutCheckerboard.html",

      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

          nsIAboutModule::ALLOW_SCRIPT},

diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn

index ed7c2ad3fc30..ff54456a6582 100644

--- a/toolkit/content/jar.mn

+++ b/toolkit/content/jar.mn

@@ -41,8 +41,6 @@ toolkit.jar:

    content/global/aboutUrlClassifier.js

    content/global/aboutUrlClassifier.xhtml

    content/global/aboutUrlClassifier.css

-*   content/global/buildconfig.html

-   content/global/buildconfig.css

    content/global/contentAreaUtils.js

    content/global/datepicker.xhtml

 #ifndef MOZ_FENNEC

pkgs/applications/networking/browsers/firefox/packages.nix

+6 −4
Original line number Diff line number Diff line
@@ -30,14 +30,15 @@ 


  firefox-beta = buildMozillaMach rec {

    pname = "firefox-beta";

    version = "120.0b9";

    version = "121.0b3";

    applicationName = "Mozilla Firefox Beta";

    src = fetchurl {

      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";

      sha512 = "7ac5562ce393ea84663eac5c6ee1a0ca527ff4a8a9ec6aaaef37213ff071076846949e80af21d95ec8e32d3cbc740b772a9d7cc54965b7bbc8e015da22ae927f";

      sha512 = "95dd68c50af5784c44e40ad3a8ac6b4fb259fa8f56bc5e5de940d03dec1838b143712680826b4d260fefdad314464d24679911f21b1095512a86cdf4eb2648c9";

    };



    meta = {

      changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/";

      description = "A web browser built from Firefox Beta Release source tree";

      homepage = "http://www.mozilla.com/en-US/firefox/";

      maintainers = with lib.maintainers; [ jopejoe1 ];
@@ -58,16 +59,17 @@ 


  firefox-devedition = buildMozillaMach rec {

    pname = "firefox-devedition";

    version = "120.0b9";

    version = "121.0b3";

    applicationName = "Mozilla Firefox Developer Edition";

    requireSigning = false;

    branding = "browser/branding/aurora";

    src = fetchurl {

      url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";

      sha512 = "07bf1a58550e70c683719adef55fa3d1ee06876e0cb086c28242879c683269c4aa784b1dce639218b3ad24a546192088fe5224a52e13a0086f205ec5470e2428";

      sha512 = "a5ed25159e63122f27bd05810eaf665834022ae407c029734ad41ef1ed5e3956497873f5210b7c385245056718837bd17c47cfc2e2e438a4c3274d2462ce51f8";

    };



    meta = {

      changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/";

      description = "A web browser built from Firefox Developer Edition source tree";

      homepage = "http://www.mozilla.com/en-US/firefox/";

      maintainers = with lib.maintainers; [ jopejoe1 ];

pkgs/development/python-modules/moto/default.nix

+19 −14
Original line number Diff line number Diff line
@@ -37,19 +37,20 @@ 
# tests

, freezegun

, pytestCheckHook

, pytest-order

, pytest-xdist

}:



buildPythonPackage rec {

  pname = "moto";

  version = "4.2.6";

  version = "4.2.10";

  pyproject = true;



  disabled = pythonOlder "3.6";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-zgpV1+dWxZpaQ5LHCXqlylPgCqLdP3AACTNWvhXnrvk=";

    hash = "sha256-kllf4odHSjGsPvhHlB67CX6P+ww9bBBuR89XPbBpM7I=";

  };



  nativeBuildInputs = [
@@ -95,12 +96,20 @@ buildPythonPackage rec { 
  nativeCheckInputs = [

    freezegun

    pytestCheckHook

    pytest-order

    pytest-xdist

  ] ++ passthru.optional-dependencies.all;



  # Some tests depend on AWS credentials environment variables to be set.

  env.AWS_ACCESS_KEY_ID = "ak";

  env.AWS_SECRET_ACCESS_KEY = "sk";



  pytestFlagsArray = [

    "-m" "'not network and not requires_docker'"



    # Matches upstream configuration, presumably due to expensive setup/teardown.

    "--dist" "loadscope"



    # Fails at local name resolution

    "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header"

    "--deselect=tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins"
@@ -120,21 +129,17 @@ buildPythonPackage rec { 
    # https://github.com/getmoto/moto/pull/6938

    "--deselect=tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers"



    # Racy, expects two timestamp two differ

    # https://github.com/getmoto/moto/issues/6946

    "--deselect=tests/test_databrew/test_databrew_recipes.py::test_publish_recipe"

    # Flaky under parallel execution

    "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get"

    "--deselect=tests/test_core/test_moto_api.py::TestModelDataResetForClassDecorator::test_should_find_bucket"

  ];



  disabledTestPaths = [

    # Requires pytest-ordering, which is unmaintained

    # https://github.com/getmoto/moto/issues/6937

    # botocore.exceptions.NoCredentialsError: Unable to locate credentials

    "tests/test_dynamodb/test_dynamodb_statements.py"

    "tests/test_lakeformation/test_resource_tags_integration.py"

    "tests/test_redshiftdata/test_redshiftdata.py"

    "tests/test_s3/test_s3_file_handles.py"

    "tests/test_s3/test_s3.py"

    "tests/test_s3/test_s3_select.py"

    # Flaky under parallel execution, Connection Reset errors to localhost.

    "tests/test_moto_api/recorder/test_recorder.py"



    # Flaky under parallel execution

    "tests/test_resourcegroupstaggingapi/*.py"



    # Tries to access the network

    "tests/test_batch/test_batch_jobs.py"