Merge staging-next into staging

2026-09-30 11:50:06 +00:00 · 2025-02-28 06:05:32 +00:00
parent 041ca65952 749375426d
commit 29dcbf4823
26 changed files with 569 additions and 351 deletions
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -60,7 +60,7 @@ writeScript "update-${pname}" ''

  # this is a list of sha256 and tarballs for both arches
  # Upstream files contains python repr strings like b'somehash', hence the sed dance
-  shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep tar.xz`
+  shasums=`cat $HOME/shasums | sed -E s/"b'([a-f0-9]{64})'?(.*)"/'\1\2'/ | grep '\.tar\.[a-z0-9]\+'`

  cat > $tmpfile <<EOF
  {
@@ -75,7 +75,7 @@ writeScript "update-${pname}" ''
    #  - inteprets sha and path as 2 lines
    for line in `echo "$shasums" | \
                 grep $arch | \
-                 grep "${baseName}-$version.tar.xz$" | \
+                 grep "${baseName}-$version"'\.tar\.[a-z0-9]\+$' | \
                 tr " " ":"`; do
      # create an entry for every locale
      cat >> $tmpfile <<EOF
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -36,13 +36,13 @@
    "vendorHash": "sha256-0Tbns4vIMxmDUxN8NbCFsTwRoGB6PBzMnrstffbVm7s="
  },
  "akamai": {
-    "hash": "sha256-acGLXJclAfg43AkJRoROReIOjBEnhgSpDRgvO6LumIY=",
+    "hash": "sha256-MZF4yTG4wiFeOi4NLItQmxZ9ZcgHCryFpxpGy2jQYE8=",
    "homepage": "https://registry.terraform.io/providers/akamai/akamai",
    "owner": "akamai",
    "repo": "terraform-provider-akamai",
-    "rev": "v6.6.1",
+    "rev": "v7.0.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-3AlXMOpL5kctTSnA2V1RsMxRb9roELs1p5TL0uJFR4M="
+    "vendorHash": "sha256-NO7e8S+UhbbGWeBm4+bzm6HqqA3G3WZwj3wJmug0aSA="
  },
  "alicloud": {
    "hash": "sha256-87QLXAIIBZ4EDdN28Ti4QGtnCDqMoj/D6kGoeyjgHHM=",
@@ -117,13 +117,13 @@
    "vendorHash": null
  },
  "aws": {
-    "hash": "sha256-Ep/P1h1mR/cl8rKCWGBjYWiaUZLouMH2i+FfIg+eVjU=",
+    "hash": "sha256-SqBPe7/FYK4ybCQsEOq81/gg/mgvQYxYaYUkgg6O3w0=",
    "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
    "owner": "hashicorp",
    "repo": "terraform-provider-aws",
-    "rev": "v5.86.0",
+    "rev": "v5.88.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-jz4nDldbf/oXsQs3etDhQGROSvrylo/e0brXYRVqgZ4="
+    "vendorHash": "sha256-C3/2Kw66b37OUctT0/SdHNshs0r3wnVNP6Z3VuTwsw0="
  },
  "azuread": {
    "hash": "sha256-UV6jgVS8tzWiEBC/C/U7/2bGZ1sqk2MnS8xNRBuL+C8=",
@@ -198,13 +198,13 @@
    "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8="
  },
  "btp": {
-    "hash": "sha256-uyZ4HR9HVLHxGtRE4DTeNlG7RsYcmIxsZMxs5hQbJSc=",
+    "hash": "sha256-mLW7PD7vtDecg4oN9KEB+fbFo7STGw7ftIH50VHtuRs=",
    "homepage": "https://registry.terraform.io/providers/SAP/btp",
    "owner": "SAP",
    "repo": "terraform-provider-btp",
-    "rev": "v1.9.0",
+    "rev": "v1.10.0",
    "spdx": "Apache-2.0",
-    "vendorHash": "sha256-RnFY5fAkEV69nuFMcivCb232r/3sqqcgdMU/WYuK+yI="
+    "vendorHash": "sha256-qFOfE4yWJfdPtGiGbk+oWzA06QvW0WCd6iUqEMTxBBk="
  },
  "buildkite": {
    "hash": "sha256-ihP2q0sCKd4myqANLhKrBfIX+macLvJkQ+/3hMzVM3A=",
@@ -1111,13 +1111,13 @@
    "vendorHash": "sha256-Ry791h5AuYP03nex9nM8X5Mk6PeL7hNDbFyVRvVPJNE="
  },
  "scaleway": {
-    "hash": "sha256-8aESalFQaA6Qwod4rDeUzrKe80rbHfVJZIKtLliKUME=",
+    "hash": "sha256-ZMY69sfWN0281l+QEN6jUpVevYN7Z1CRDey+AqVDq8o=",
    "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
    "owner": "scaleway",
    "repo": "terraform-provider-scaleway",
-    "rev": "v2.49.0",
+    "rev": "v2.50.0",
    "spdx": "MPL-2.0",
-    "vendorHash": "sha256-a1xH1NX+8/A4tcPYyxvg3lY9DZPrOAEl4OvngU9+tjE="
+    "vendorHash": "sha256-TbA6GlRSdyzkc64SU9Tn6o+DAvAN9RqR5M6DH83Tjng="
  },
  "secret": {
    "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -19,21 +19,21 @@

 rustPlatform.buildRustPackage rec {
  pname = "cosmic-term";
-  version = "1.0.0-alpha.5.1";
+  version = "1.0.0-alpha.6";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-term";
    rev = "epoch-${version}";
-    hash = "sha256-uPKbh1PA8P51Gcet459ZBRKRe0JmxSWvIFn3AQIG6KY=";
+    hash = "sha256-sdeRkT6UcyBKIFnJZn3aGf8LZQimqVPqtXo7RtwUs5M=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-clGzp7pH7YHePFzlq2eLYKKx9IiFQKB5FmqPeuSuIVc=";
+  cargoHash = "sha256-Qznkqp+zWpP/ok2xG7U5lYBW0qo4+ARnm8hgxU20ha0=";

  # COSMIC applications now uses vergen for the About page
  # Update the COMMIT_DATE to match when the commit was made
-  env.VERGEN_GIT_COMMIT_DATE = "2025-01-14";
+  env.VERGEN_GIT_COMMIT_DATE = "2025-02-21";
  env.VERGEN_GIT_SHA = src.rev;

  postPatch = ''
--- a/pkgs/by-name/dd/ddnet/package.nix
+++ b/pkgs/by-name/dd/ddnet/package.nix
@@ -32,13 +32,13 @@

 stdenv.mkDerivation rec {
  pname = "ddnet";
-  version = "18.9";
+  version = "19.0";

  src = fetchFromGitHub {
    owner = "ddnet";
-    repo = pname;
-    rev = version;
-    hash = "sha256-aJzNfo7K5OOo14XJRmDOYzXFF5fZK0aXgIfVvjvzjrU=";
+    repo = "ddnet";
+    tag = version;
+    hash = "sha256-R9LXcYM96fibHzpXDWIOSASKIbh+GeiGyz7xVvV2v1Q=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
    install_name_tool -change "$out/lib/libsteam_api.dylib" "$out/lib/ddnet/libsteam_api.dylib" "$out/bin/DDNet"
  '';

-  meta = with lib; {
+  meta = {
    description = "Teeworlds modification with a unique cooperative gameplay";
    longDescription = ''
      DDraceNetwork (DDNet) is an actively maintained version of DDRace,
@@ -126,11 +126,16 @@ stdenv.mkDerivation rec {
      design your own maps, or run your own server.
    '';
    homepage = "https://ddnet.org";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
-      sirseruju
+    license = with lib.licenses; [
+      zlib
+      ofl
+      cc-by-sa-30
+    ];
+    maintainers = with lib.maintainers; [
      lom
      ncfavier
+      Scrumplex
+      sirseruju
    ];
    mainProgram = "DDNet";
  };
--- a/pkgs/by-name/le/lego/package.nix
+++ b/pkgs/by-name/le/lego/package.nix
@@ -31,6 +31,6 @@ buildGoModule rec {

  passthru.tests = {
    lego-http = nixosTests.acme.http01-builtin;
-    lego-dns = nixosTests.acme.dns01-builtin;
+    lego-dns = nixosTests.acme.dns01;
  };
 }
--- a/pkgs/by-name/nf/nfpm/package.nix
+++ b/pkgs/by-name/nf/nfpm/package.nix
@@ -9,16 +9,16 @@

 buildGoModule rec {
  pname = "nfpm";
-  version = "2.41.2";
+  version = "2.41.3";

  src = fetchFromGitHub {
    owner = "goreleaser";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-anEKmMFB4szA6xdwzU2vtJO8rH4i8TCF+kiOOv8kBHs=";
+    hash = "sha256-5pM3usXT3ukKkhKtDR5nIllaCCEUj7GVIl5HWq9DwII=";
  };

-  vendorHash = "sha256-xtfqHeWaLMxH5paFBsbiSCVd/po9c3yy0INuy1F7Yds=";
+  vendorHash = "sha256-GnAo+B4UEZIf5K3d1XSU8WpHmdMqzO1nR0reSJ2D1Yk=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/op/opshin/package.nix
+++ b/pkgs/by-name/op/opshin/package.nix
@@ -6,7 +6,7 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "opshin";
-  version = "0.23.0";
+  version = "0.24.0";

  format = "pyproject";

@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
    owner = "OpShin";
    repo = "opshin";
    tag = version;
-    hash = "sha256-H6tuSJYV9bAwXu/5Y8g6aFbbQFCpq2aqcmRaDq2cAEg=";
+    hash = "sha256-5IzPxzNvH9nlOYBCbc8kC7yzf8L8LPA5Wq9agqg9kng=";
  };

  propagatedBuildInputs = with python3.pkgs; [
--- a/pkgs/by-name/qb/qbittorrent/package.nix
+++ b/pkgs/by-name/qb/qbittorrent/package.nix
@@ -20,13 +20,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox";
-  version = "5.0.3";
+  version = "5.0.4";

  src = fetchFromGitHub {
    owner = "qbittorrent";
    repo = "qBittorrent";
    rev = "release-${finalAttrs.version}";
-    hash = "sha256-nz9no2+nsC+PEnqPyUJpup0OLsS6G+yvTwbwDPko7Eg=";
+    hash = "sha256-8gSSUgYx0CSSb3ackFknZ9r0cWFLxkC7a3Tj8QJaylc=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch
+++ b/pkgs/by-name/se/serial-studio/0001-CMake-Deploy-Fix.patch
@@ -0,0 +1,45 @@
+diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
+index e69150cd..c4ce7975 100644
+--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
+@@ -257,16 +257,16 @@ elseif(APPLE)
+   MACOSX_BUNDLE_INFO_PLIST ${INFO_MACOSX}
+  )
+ elseif(UNIX)
+- install(TARGETS ${PROJECT_EXECUTABLE} RUNTIME DESTINATION /usr/bin)
+ install(TARGETS ${PROJECT_EXECUTABLE} RUNTIME DESTINATION bin)
+ 
+  install(
+   FILES ${CMAKE_CURRENT_SOURCE_DIR}/deploy/linux/serial-studio.png
+-  DESTINATION /usr/share/pixmaps
+  DESTINATION share/pixmaps
+  )
+ 
+ install(
+  FILES ${CMAKE_CURRENT_SOURCE_DIR}/deploy/linux/serial-studio.desktop
+- DESTINATION /usr/share/applications
+ DESTINATION share/applications
+ )
+ endif()
+ 
+@@ -289,17 +289,6 @@ elseif(WIN32)
+  set(deploy_tool_options_arg --no-compiler-runtime -force-openssl --release)
+ endif()
+ 
+-qt_generate_deploy_qml_app_script(
+- TARGET ${PROJECT_EXECUTABLE}
+- OUTPUT_SCRIPT deploy_script
+- MACOS_BUNDLE_POST_BUILD
+- NO_UNSUPPORTED_PLATFORM_ERROR
+- DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM
+- DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg}
+-)
+-
+-install(SCRIPT ${deploy_script})
+-
+ #-------------------------------------------------------------------------------
+ # Packaging
+ #-------------------------------------------------------------------------------
+-- 
+2.47.2
+
--- a/pkgs/by-name/se/serial-studio/0002-Connect-Button-Fix.patch
+++ b/pkgs/by-name/se/serial-studio/0002-Connect-Button-Fix.patch
@@ -0,0 +1,16 @@
+diff --git a/app/qml/MainWindow/Panes/Toolbar.qml b/app/qml/MainWindow/Panes/Toolbar.qml
+index 9b59c0c2..fa428a2f 100644
+--- a/app/qml/MainWindow/Panes/Toolbar.qml
+++ b/app/qml/MainWindow/Panes/Toolbar.qml
+@@ -320,7 +320,7 @@ Rectangle {
+       font: Cpp_Misc_CommonFonts.boldUiFont
+       Layout.minimumWidth: metrics.width + 16
+       Layout.maximumWidth: metrics.width + 16
+-      enabled: Cpp_IO_Manager.configurationOk && !Cpp_CSV_Player.isOpen && !Cpp_MQTT_Client.isSubscribed
+      enabled: Cpp_IO_Manager.configurationOk && !Cpp_CSV_Player.isOpen
+       text: checked ? qsTr("Disconnect") : qsTr("Connect")
+       icon.source: checked ? "qrc:/rcc/icons/toolbar/connect.svg" :
+                              "qrc:/rcc/icons/toolbar/disconnect.svg"
+-- 
+2.47.2
+
--- a/pkgs/applications/misc/serial-studio/default.nix
+++ b/pkgs/applications/misc/serial-studio/default.nix
@@ -2,34 +2,44 @@
  lib,
  stdenv,
  fetchFromGitHub,
-  qmake,
-  qtquickcontrols2,
-  qtserialport,
-  qtsvg,
-  wrapQtAppsHook,
+  cmake,
+  qt6,
+  pkg-config,
 }:

 stdenv.mkDerivation rec {
  pname = "serial-studio";
-  version = "1.1.7";
+  version = "3.0.6";

  src = fetchFromGitHub {
    owner = "Serial-Studio";
    repo = "Serial-Studio";
    rev = "v${version}";
-    hash = "sha256-Tsd1PGB7cO8h3HDifOtB8jsnj+fS4a/o5nfLoohVLM4=";
+    hash = "sha256-q3RWy3HRs5NG0skFb7PSv8jK5pI5rtbccP8j38l8kjM=";
    fetchSubmodules = true;
  };

  nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    cmake
+    qt6.wrapQtAppsHook
+    pkg-config
  ];

  buildInputs = [
-    qtquickcontrols2
-    qtserialport
-    qtsvg
+    qt6.qtbase
+    qt6.qtdeclarative
+    qt6.qtsvg
+    qt6.qtgraphs
+    qt6.qtlocation
+    qt6.qtconnectivity
+    qt6.qttools
+    qt6.qtserialport
+    qt6.qtpositioning
+  ];
+
+  patches = [
+    ./0001-CMake-Deploy-Fix.patch
+    ./0002-Connect-Button-Fix.patch
  ];

  meta = with lib; {
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -62,17 +62,17 @@ in

 rustPlatform.buildRustPackage {
  pname = "servo";
-  version = "0-unstable-2025-02-20";
+  version = "0-unstable-2025-02-27";

  src = fetchFromGitHub {
    owner = "servo";
    repo = "servo";
-    rev = "54b5c7b632ecb48f134b232ee1b9aa8bc8c286c0";
-    hash = "sha256-MHxGL7NFa6+QexeBITy0WPcBLCO6NrnPOEBlJMF7iZA=";
+    rev = "0065e63190dba501d23c16759a2a1ea1e8f15cd8";
+    hash = "sha256-5VvKGNBJ+1bWW9XcXk0DU0owBmdkTpX8voAVO4QMdrQ=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-ZVHM+z1ZYAu6GIar602FoAB77EhbjV3Mf9oFHe5q3LY=";
+  cargoHash = "sha256-mfOzlqRAVR7O7uWn27pwccXp+WRl5BEO3l0KEyzjmUc=";

  postPatch = ''
    # Remap absolute path between modules to include SEMVER
--- a/pkgs/by-name/xl/xlights/package.nix
+++ b/pkgs/by-name/xl/xlights/package.nix
@@ -6,11 +6,11 @@

 appimageTools.wrapType2 rec {
  pname = "xlights";
-  version = "2025.01";
+  version = "2025.03";

  src = fetchurl {
    url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
-    hash = "sha256-Xw1sfsvaH+IuuX+4frlFb7GEaF1s8UwWj7uRydj10O4=";
+    hash = "sha256-ASDiIpVLs02Q0vfGCih+a2kKmDbK8BLM8vcdDDaKfSU=";
  };

  meta = {
--- a/pkgs/development/libraries/liquid-dsp/default.nix
+++ b/pkgs/development/libraries/liquid-dsp/default.nix
@@ -19,7 +19,16 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-3UKAwhYaYZ42+d+wiW/AB6x5TSOel8d++d3HeZqAg/8=";
  };

-  configureFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "LIBTOOL=${cctools}/bin/libtool" ];
+  configureFlags =
+    lib.optionals stdenv.hostPlatform.isDarwin [
+      "LIBTOOL=${cctools}/bin/libtool"
+    ]
+    ++ [
+      # Prevent native cpu arch from leaking into binaries. This might lead to
+      # poor performance, but having portable and working executables is more
+      # important.
+      (lib.enableFeature true "simdoverride")
+    ];

  nativeBuildInputs =
    [ autoreconfHook ]
--- a/pkgs/development/python-modules/blockfrost-python/default.nix
+++ b/pkgs/development/python-modules/blockfrost-python/default.nix
@@ -2,6 +2,7 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
+  fetchpatch2,
  # Python deps
  requests,
  setuptools,
@@ -10,8 +11,7 @@
 buildPythonPackage rec {
  pname = "blockfrost-python";
  version = "0.6.0";
-
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "blockfrost";
@@ -20,11 +20,22 @@ buildPythonPackage rec {
    hash = "sha256-mN26QXxizDR+o2V5C2MlqVEbRns1BTmwZdUnnHNcFzw=";
  };

-  propagatedBuildInputs = [
-    requests
+  patches = [
+    (fetchpatch2 {
+      name = "blockfrost-python-fix-version";
+      url = "https://github.com/blockfrost/blockfrost-python/commit/02fdc67ff6d1333c0855e740114585852bbfa0bc.patch?full_index=1";
+      hash = "sha256-070tnWxOnVNsCYXmBFo39JUgQDqphdpqx3A9OIuC94U=";
+    })
+  ];
+
+  build-system = [
    setuptools
  ];

+  dependencies = [
+    requests
+  ];
+
  pythonImportsCheck = [ "blockfrost" ];

  meta = with lib; {
--- a/pkgs/development/python-modules/cardano-tools/default.nix
+++ b/pkgs/development/python-modules/cardano-tools/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  poetry-core,
+  # Python deps
+  requests,
+  pexpect,
+}:
+
+buildPythonPackage rec {
+  pname = "cardano-tools";
+  version = "2.1.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "cardano_tools";
+    inherit version;
+    hash = "sha256-RFyKXHafV+XgRJSsTjASCCw9DxvZqertf4NNN616Bp4=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    requests
+    pexpect
+  ];
+
+  pythonImportsCheck = [ "cardano_tools" ];
+
+  meta = with lib; {
+    description = "Python module for interfacing with the Cardano blockchain";
+    homepage = "https://gitlab.com/viperscience/cardano-tools";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ t4ccer ];
+  };
+}
--- a/pkgs/development/python-modules/distrax/default.nix
+++ b/pkgs/development/python-modules/distrax/default.nix
@@ -39,6 +39,9 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "distrax" ];

  disabledTests = [
+    # Flaky: AssertionError: 1 not less than 0.7000000000000001
+    "test_von_mises_sample_uniform_ks_test"
+
    # NotImplementedError: Primitive 'square' does not have a registered inverse.
    "test_against_tfp_bijectors_square"
    "test_log_dets_square__with_device"
--- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
+++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "google-cloud-artifact-registry";
-  version = "1.15.0";
+  version = "1.15.1";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "google_cloud_artifact_registry";
    inherit version;
-    hash = "sha256-K2oFG+shUXcgg/UDzpgF9LcLuDkhSLUYwQrXfxJUDW8=";
+    hash = "sha256-k7SaOdk78EJhEwTlWRklr3+JlrRXVctekUjzgl4Xe/o=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/ogmios/default.nix
+++ b/pkgs/development/python-modules/ogmios/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  setuptools,
+  # Python deps
+  cachetools,
+  cardano-tools,
+  coloredlogs,
+  orjson,
+  pydantic,
+  websockets,
+}:
+
+buildPythonPackage rec {
+  pname = "ogmios";
+  version = "1.3.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "ogmios";
+    inherit version;
+    hash = "sha256-b5L1J9lqHEQmlw7alv5HnpXM0gpE26cGkddEKH5cSU0=";
+  };
+
+  build-system = [
+    hatchling
+    setuptools
+  ];
+
+  dependencies = [
+    cachetools
+    cardano-tools
+    coloredlogs
+    orjson
+    pydantic
+    websockets
+  ];
+
+  pythonImportsCheck = [ "ogmios" ];
+
+  meta = with lib; {
+    description = "Python client for Ogmios";
+    homepage = "https://gitlab.com/viperscience/ogmios-python";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ t4ccer ];
+  };
+}
--- a/pkgs/development/python-modules/pycardano/default.nix
+++ b/pkgs/development/python-modules/pycardano/default.nix
@@ -2,6 +2,7 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
+  pytestCheckHook,
  # Python deps
  blockfrost-python,
  cachetools,
@@ -12,12 +13,15 @@
  frozendict,
  frozenlist,
  mnemonic,
+  ogmios,
  poetry-core,
  pprintpp,
  pynacl,
+  requests,
  setuptools,
  typeguard,
  websocket-client,
+  websockets,
 }:

 let
@@ -34,18 +38,21 @@ let
 in
 buildPythonPackage rec {
  pname = "pycardano";
-  version = "0.11.1";
-
-  format = "pyproject";
+  version = "0.12.3";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "Python-Cardano";
    repo = "pycardano";
-    rev = "v${version}";
-    hash = "sha256-OWm6ztt3s3DUbxDZqpvwTO6XwdY/57AI6Bc6x6kxH7k=";
+    tag = "v${version}";
+    hash = "sha256-jxgskdQ7Us+utndUgFYK7G2IW/e5QbeXytOsxQfFiJI=";
  };

-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
    blockfrost-python
    cachetools
    cbor2
@@ -55,15 +62,21 @@ buildPythonPackage rec {
    frozendict
    frozenlist
    mnemonic
+    ogmios
    poetry-core
    pprintpp
    pynacl
-    setuptools
+    requests
    typeguard
    websocket-client
+    websockets
  ];

-  pythonRelaxDeps = [ "typeguard" ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonRelaxDeps = [ "websockets" ];

  pythonImportsCheck = [ "pycardano" ];

--- a/pkgs/development/python-modules/pymilter/default.nix
+++ b/pkgs/development/python-modules/pymilter/default.nix
@@ -5,8 +5,6 @@
  libmilter,
  berkeleydb,
  py3dns,
-  iana-etc,
-  libredirect,
  pyasyncore,
  setuptools,
 }:
@@ -26,24 +24,26 @@ buildPythonPackage rec {
  build-system = [
    setuptools
  ];
+
  buildInputs = [ libmilter ];
-  nativeCheckInputs = [ pyasyncore ];
+
+  nativeCheckInputs = [
+    pyasyncore
+  ];
+
  dependencies = [
    berkeleydb
    py3dns
  ];

  preBuild = ''
-    sed -i 's/import thread/import _thread as thread/' Milter/greylist.py
+    substituteInPlace Milter/greylist.py \
+      --replace-fail "import thread" "import _thread as thread"
  '';

-  # requires /etc/resolv.conf
  # testpolicy: requires makemap (#100419)
  #   using exec -a makemap smtpctl results in "unknown group smtpq"
  preCheck = ''
-    echo "nameserver 127.0.0.1" > resolv.conf
-    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf)
-    export LD_PRELOAD=${libredirect}/lib/libredirect.so
    sed -i '/testpolicy/d' test.py
    rm testpolicy.py
  '';
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -46,6 +46,7 @@ buildPythonPackage rec {

  nativeCheckInputs = [
    eventlet
+    libredirect.hook
    mock
    tornado
    pytest-asyncio
@@ -56,8 +57,7 @@ buildPythonPackage rec {

  preCheck = lib.optionalString stdenv.hostPlatform.isLinux ''
    echo "nameserver 127.0.0.1" > resolv.conf
-    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) \
-      LD_PRELOAD=${libredirect}/lib/libredirect.so
+    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf)
  '';

  postCheck = ''
--- a/pkgs/development/python-modules/rlax/default.nix
+++ b/pkgs/development/python-modules/rlax/default.nix
@@ -3,6 +3,11 @@
  buildPythonPackage,
  fetchFromGitHub,
  fetchpatch,
+
+  # build-system
+  setuptools,
+
+  # dependencies
  absl-py,
  chex,
  distrax,
@@ -11,6 +16,8 @@
  jaxlib,
  numpy,
  tensorflow-probability,
+
+  # tests
  dm-haiku,
  optax,
  pytest-xdist,
@@ -20,7 +27,7 @@
 buildPythonPackage rec {
  pname = "rlax";
  version = "0.1.6";
-  format = "setuptools";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "google-deepmind";
@@ -38,7 +45,11 @@ buildPythonPackage rec {
    })
  ];

-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
    absl-py
    chex
    distrax
@@ -59,7 +70,14 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "rlax" ];

  disabledTests = [
-    # RuntimeErrors
+    # AssertionError: Array(2, dtype=int32) != 0
+    "test_categorical_sample__with_device"
+    "test_categorical_sample__with_jit"
+    "test_categorical_sample__without_device"
+    "test_categorical_sample__without_jit"
+
+    # RuntimeError: Attempted to set 4 devices, but 1 CPUs already available:
+    # ensure that `set_n_cpu_devices` is executed before any JAX operation.
    "test_cross_replica_scatter_add0"
    "test_cross_replica_scatter_add1"
    "test_cross_replica_scatter_add2"
@@ -73,10 +91,11 @@ buildPythonPackage rec {
    "test_unnormalize_linear"
  ];

-  meta = with lib; {
+  meta = {
    description = "Library of reinforcement learning building blocks in JAX";
    homepage = "https://github.com/deepmind/rlax";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ onny ];
+    changelog = "https://github.com/google-deepmind/rlax/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ onny ];
  };
 }
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16099,7 +16099,6 @@ with pkgs;
  deliantra-maps = callPackage ../games/deliantra/maps.nix { };
  deliantra-data = callPackage ../games/deliantra/data.nix { };

-  ddnet = callPackage ../games/ddnet {};
  ddnet-server = ddnet.override { buildClient = false; };

  devilutionx = callPackage ../games/devilutionx {
@@ -18055,8 +18054,6 @@ with pkgs;
    pinentry = pinentry-curses;
  };

-  serial-studio = libsForQt5.callPackage ../applications/misc/serial-studio { };
-
  maphosts = callPackage ../tools/networking/maphosts { };

  tora = libsForQt5.callPackage ../development/tools/tora { };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2102,6 +2102,8 @@ self: super: with self; {

  carbon = callPackage ../development/python-modules/carbon { };

+  cardano-tools = callPackage ../development/python-modules/cardano-tools { };
+
  cardimpose = callPackage ../development/python-modules/cardimpose { };

  cart = callPackage ../development/python-modules/cart { };
@@ -9732,6 +9734,8 @@ self: super: with self; {

  oemthermostat = callPackage ../development/python-modules/oemthermostat { };

+  ogmios = callPackage ../development/python-modules/ogmios { };
+
  okonomiyaki = callPackage ../development/python-modules/okonomiyaki { };

  okta = callPackage ../development/python-modules/okta { };