Unverified Commit bb02d6c3 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

[python-updates] minor updates (2024-09-29) (#345326)

parents 197eb560 7e35720b
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
diff --git a/src/pretix/testutils/mock.py b/src/pretix/testutils/mock.py
index 66ee3fb52..9d9ba02bd 100644
--- a/src/pretix/testutils/mock.py
+++ b/src/pretix/testutils/mock.py
@@ -38,4 +38,4 @@ def mocker_context():
 
 
 def get_redis_connection(alias="default", write=True):
-    return fakeredis.FakeStrictRedis(server=fakeredis.FakeServer.get_server("127.0.0.1:None:v(7, 0)", (7, 0)))
+    return fakeredis.FakeStrictRedis(server=fakeredis.FakeServer.get_server("127.0.0.1:None:v(7, 0)", (7, 0), server_type="redis"))
+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ python.pkgs.buildPythonApplication rec {
    # Discover pretix.plugin entrypoints during build and add them into
    # INSTALLED_APPS, so that their static files are collected.
    ./plugin-build.patch

    # TypeError: FakeServer.get_server() missing 1 required positional argument: 'server_type'
    ./fakeredis-0.25-compat.patch
  ];

  pythonRelaxDeps = [
@@ -98,6 +101,7 @@ python.pkgs.buildPythonApplication rec {
    "protobuf"
    "pyjwt"
    "python-bidi"
    "redis"
    "requests"
    "sentry-sdk"
  ];
+3 −3
Original line number Diff line number Diff line
@@ -7,18 +7,18 @@

rustPlatform.buildRustPackage rec {
  pname = "selenium-manager";
  version = "4.24.0";
  version = "4.25.0";

  src = fetchFromGitHub {
    owner = "SeleniumHQ";
    repo = "selenium";
    rev = "selenium-${version}";
    hash = "sha256-AsQr9kGv2dxkiFzptDA0D27OXZjYj7oDKz2oEQ2qW7s=";
    hash = "sha256-ykZdL2Rn+bU8do3e9zf9pJtInBNRGLcXi5pD1vm7OJY=";
  };

  sourceRoot = "${src.name}/rust";

  cargoHash = "sha256-mirEeOi6CfKjb8ZuqardJeYy9EGnpsw5fkUw7umhkro=";
  cargoHash = "sha256-8is7lQ+V1Xf+Aturg836jRMoHIJzDoSVJT5ZOd8W51k=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
    darwin.apple_sdk.frameworks.SystemConfiguration
+2 −2
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@
      sourceVersion = {
        major = "3";
        minor = "12";
        patch = "6";
        patch = "7";
        suffix = "";
      };
      hash = "sha256-GZllgpjPL7g33/7Y/zwDPvDJjvIM9zxdX2a+1auJaXw=";
      hash = "sha256-JIh7kuKv1KKsYCQZrUtZY3L2esmwdxkPRZq6OQ+vVVA=";
    };
  };

+6 −0
Original line number Diff line number Diff line
{ stdenv
, lib
, fetchurl
, fetchpatch2
, glib
, flex
, bison
@@ -60,6 +61,11 @@ stdenv.mkDerivation (finalAttrs: {
      src = ./absolute_shlib_path.patch;
      inherit nixStoreDir;
    })
    (fetchpatch2 {
      name = "setuptools-74.0-compat.patch";
      url = "https://github.com/GNOME/gobject-introspection/commit/a2139dba59eac283a7f543ed737f038deebddc19.patch";
      hash = "sha256-n++wpQuJhAEYtcu8LZDC4+Tx1MYuFIMysFgrvz68jWU=";
    })
  ] ++ lib.optionals x11Support [
    # Hardcode the cairo shared library path in the Cairo gir shipped with this package.
    # https://github.com/NixOS/nixpkgs/issues/34080
Loading