Unverified Commit 92da4e79 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge staging-next into staging

parents 1f4665b1 892647f3

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

+0 −4
Original line number Diff line number Diff line
@@ -61,10 +61,6 @@ buildPythonPackage rec { 
    hash = "sha256-LqYGrrWgSZazk0hjQvTFwqtU/PtMEaPi+m1Ya8Ds+pU=";

  };



  patches = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform isa-l) [

    ./remove-isal.patch

  ];



  postPatch = ''

    rm -r vendor

    patchShebangs tools

pkgs/development/python-modules/aiohttp/remove-isal.patch

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
diff --git a/tests/conftest.py b/tests/conftest.py

index 62fb04f2e..bb5b279dd 100644

--- a/tests/conftest.py

+++ b/tests/conftest.py

@@ -12,7 +12,6 @@ from typing import Any, AsyncIterator, Callable, Generator, Iterator

 from unittest import mock

 from uuid import uuid4

 

-import isal.isal_zlib

 import pytest

 import zlib_ng.zlib_ng

 from blockbuster import blockbuster_ctx

@@ -333,7 +332,7 @@ def unused_port_socket() -> Generator[socket.socket, None, None]:

         s.close()

 

 

-@pytest.fixture(params=[zlib, zlib_ng.zlib_ng, isal.isal_zlib])

+@pytest.fixture(params=[zlib, zlib_ng.zlib_ng])

 def parametrize_zlib_backend(

     request: pytest.FixtureRequest,

 ) -> Generator[None, None, None]:

pkgs/development/tools/electron/common.nix

+10 −3
Original line number Diff line number Diff line
@@ -82,16 +82,14 @@ in 


  patches =

    base.patches

    # Fix build with Rust 1.89.0

    ++ lib.optionals (lib.versionOlder info.version "38") [

      # Fix build with Rust 1.89.0

      # https://chromium-review.googlesource.com/c/chromium/src/+/6624733

      (fetchpatch {

        name = "Define-rust-no-alloc-shim-is-unstable-v2.patch";

        url = "https://github.com/chromium/chromium/commit/6aae0e2353c857d98980ff677bf304288d7c58de.patch";

        hash = "sha256-Dd38c/0hiH+PbGPJhhEFuW6kUR45A36XZqOVExoxlhM=";

      })

    ]

    ++ lib.optionals (lib.versionOlder info.version "38") [

      # Fix build with LLVM 21+

      # https://chromium-review.googlesource.com/c/chromium/src/+/6633292

      (fetchpatch {
@@ -99,6 +97,15 @@ in 
        url = "https://github.com/chromium/chromium/commit/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch";

        hash = "sha256-YIWcsCj5w0jUd7D67hsuk0ljTA/IbHwA6db3eK4ggUY=";

      })

    ]

    ++ lib.optionals (lib.versionOlder info.version "39") [

      # Fix build with Rust 1.90.0

      # https://chromium-review.googlesource.com/c/chromium/src/+/6875644

      (fetchpatch {

        name = "Define-rust-alloc-error-handler-should-panic-v2.patch";

        url = "https://github.com/chromium/chromium/commit/23d818d3c7fba4658248f17fd7b8993199242aa9.patch";

        hash = "sha256-JVv36PgU/rr34jrhgCyf4Pp8o5j2T8fD1xBVH1avT48=";

      })

    ];



  npmRoot = "third_party/node";