From 5302d519f98fdb78d387165b278a127158fe342a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 21 Nov 2024 01:05:40 +0100
Subject: [PATCH 01/75] ubports-pdk: init at 0-unstable-2024-08-28

---
 pkgs/by-name/ub/ubports-pdk/package.nix | 69 +++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 pkgs/by-name/ub/ubports-pdk/package.nix

diff --git a/pkgs/by-name/ub/ubports-pdk/package.nix b/pkgs/by-name/ub/ubports-pdk/package.nix
new file mode 100644
index 000000000000..8d3f124a6804
--- /dev/null
+++ b/pkgs/by-name/ub/ubports-pdk/package.nix
@@ -0,0 +1,69 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  bash,
+  coreutils,
+  dosfstools,
+  makeWrapper,
+  mtools,
+  wget,
+  which,
+  xz,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "ubports-pdk";
+  version = "0-unstable-2024-08-28";
+
+  src = fetchFromGitHub {
+    owner = "ubports";
+    repo = "ubports-pdk";
+    rev = "ce16915f1ec2aa54bc0f010db7603fbb0deebf4b";
+    hash = "sha256-jxlia3RgH3DAUO5OK3jB4IH0vUoG2XZKmODq4VhwJFE=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [
+    bash
+    coreutils
+    dosfstools
+    mtools
+    wget
+    which
+    xz
+  ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+
+    install -Dm755 ubuntu-touch-pdk $out/share/ubuntu-touch-pdk/ubuntu-touch-pdk
+    cp -R scripts $out/share/ubuntu-touch-pdk/
+
+    makeWrapper $out/share/ubuntu-touch-pdk/ubuntu-touch-pdk $out/bin/ubuntu-touch-pdk \
+      --prefix PATH : ${lib.makeBinPath finalAttrs.finalPackage.buildInputs}
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Platform Development Kit for Ubuntu Touch";
+    homepage = "https://github.com/ubports/ubports-pdk";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "ubuntu-touch-pdk";
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.unix;
+    # setup wants to use brew to install extra prerequisites
+    broken = stdenvNoCC.hostPlatform.isDarwin;
+  };
+})

From 823e1c0800b2e382fe196ad2cb64763cd8ccae4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Jan 2025 12:56:25 +0000
Subject: [PATCH 02/75] jan: 0.5.13 -> 0.5.14

---
 pkgs/by-name/ja/jan/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index a29891f11a10..376c920a9853 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -5,10 +5,10 @@
 
 let
   pname = "jan";
-  version = "0.5.13";
+  version = "0.5.14";
   src = fetchurl {
     url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage";
-    hash = "sha256-QetnD+0SCzn5Zx5v1EJNjhx8U9ueHdp+zZu/Yf77AdY=";
+    hash = "sha256-NYTOuoFpeqj6aCclkM0hzYQ3esjbI9g0vMHrZXpaOq0=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

From 1d706ae8086e983e95df64db5c496b64488c6ec1 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 27 Jan 2025 18:40:17 +0100
Subject: [PATCH 03/75] mmtui: init at 0.1.1

[mmtui](https://github.com/SL-RU/mmtui) is a TUI interface to manage udisk2 mounts, written in rust.
---
 pkgs/by-name/mm/mmtui/package.nix | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/mm/mmtui/package.nix

diff --git a/pkgs/by-name/mm/mmtui/package.nix b/pkgs/by-name/mm/mmtui/package.nix
new file mode 100644
index 000000000000..4407075258b9
--- /dev/null
+++ b/pkgs/by-name/mm/mmtui/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "mmtui";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "SL-RU";
+    repo = "mmtui";
+    tag = "v${version}";
+    hash = "sha256-s+50kz6OODZ0xKz8oNF2YEzk+mLZ6gXXynl8g6Uwdo4=";
+  };
+
+  cargoHash = "sha256-9F1YMepkWksTQRrkziNhLxVJnhoDH17lSKef5kOjp3Y=";
+  useFetchCargoVendor = true;
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/SL-RU/mmtui/releases/tag/v${version}";
+    description = "TUI disk mount manager for TUI file managers";
+    homepage = "https://github.com/SL-RU/mmtui";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ grimmauld ];
+    mainProgram = "mmtui";
+    platforms = lib.platforms.linux;
+  };
+}

From 82c62d132e3f8a087bdaa6941800fcd157dffa99 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 2 Feb 2025 13:50:17 +0100
Subject: [PATCH 04/75] nixosTests.terminal-emulators.lomiri-terminal-app: Drop

---
 nixos/tests/lomiri.nix                                     | 5 -----
 nixos/tests/terminal-emulators.nix                         | 5 -----
 .../lomiri/applications/lomiri-terminal-app/default.nix    | 7 ++++++-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix
index 4e400ccf121e..dbc99843d556 100644
--- a/nixos/tests/lomiri.nix
+++ b/nixos/tests/lomiri.nix
@@ -256,9 +256,6 @@ in
               machine.send_key("ctrl-alt-t")
               wait_for_text(r"(${user}|machine)")
               machine.screenshot("terminal_opens")
-
-              # lomiri-terminal-app has a separate VM test to test its basic functionality
-
               machine.send_key("alt-f4")
 
           # We want the ability to launch applications
@@ -449,8 +446,6 @@ in
               wait_for_text(r"(${user}|machine)")
               machine.screenshot("terminal_opens")
 
-              # lomiri-terminal-app has a separate VM test to test its basic functionality
-
               # for the LSS lomiri-content-hub test to work reliably, we need to kick off peer collecting
               machine.send_chars("lomiri-content-hub-test-importer\n")
               wait_for_text(r"(/build/source|hub.cpp|handler.cpp|void|virtual|const)") # awaiting log messages from lomiri-content-hub
diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix
index 3fc820d3ac8b..6b209b8b3368 100644
--- a/nixos/tests/terminal-emulators.nix
+++ b/nixos/tests/terminal-emulators.nix
@@ -65,11 +65,6 @@ let
 
     konsole.pkg = p: p.plasma5Packages.konsole;
 
-    lomiri-terminal-app.pkg = p: p.lomiri.lomiri-terminal-app;
-    # after recent Mesa change, borked software rendering config under x86_64 icewm?
-    # BGR colour display on x86_64, RGB on aarch64
-    lomiri-terminal-app.colourTest = false;
-
     lxterminal.pkg = p: p.lxterminal;
 
     mate-terminal.pkg = p: p.mate.mate-terminal;
diff --git a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
index 6701f56b35ec..3fc7c5432716 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
@@ -61,7 +61,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   passthru = {
-    tests.vm-test = nixosTests.terminal-emulators.lomiri-terminal-app;
+    tests = {
+      # The way the test works sometimes causes segfaults in qtfeedback
+      # https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/issues/117
+      # vm-test = nixosTests.terminal-emulators.lomiri-terminal-app;
+      inherit (nixosTests.lomiri) desktop-basics desktop-appinteractions;
+    };
     updateScript = gitUpdater {
       rev-prefix = "v";
     };

From 30d3f9efff0a0ca2b47acabdb21ff1bf71f34c8d Mon Sep 17 00:00:00 2001
From: Nikita Tikhonov <nekitdevofficial@gmail.com>
Date: Mon, 3 Feb 2025 16:27:26 +0300
Subject: [PATCH 05/75] maintainers: add nekitdev

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a3cc89d57ed7..4b1ebd45c6d9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16034,6 +16034,12 @@
     githubId = 1859691;
     name = "Amedeo Molnár";
   };
+  nekitdev = {
+    email = "nekit@nekit.dev";
+    github = "nekitdev";
+    githubId = 43587167;
+    name = "Nikita Tikhonov";
+  };
   nelsonjeppesen = {
     email = "nix@jeppesen.io";
     github = "NelsonJeppesen";

From 3ad21240eb23b6b87e2f809dd2d32874b588dc32 Mon Sep 17 00:00:00 2001
From: Nikita Tikhonov <nekitdevofficial@gmail.com>
Date: Mon, 3 Feb 2025 16:43:49 +0300
Subject: [PATCH 06/75] changelogging: init at 0.7.0

---
 pkgs/by-name/ch/changelogging/package.nix | 36 +++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/ch/changelogging/package.nix

diff --git a/pkgs/by-name/ch/changelogging/package.nix b/pkgs/by-name/ch/changelogging/package.nix
new file mode 100644
index 000000000000..5610d401744b
--- /dev/null
+++ b/pkgs/by-name/ch/changelogging/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  fetchCrate,
+  rustPlatform,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "changelogging";
+  version = "0.7.0";
+
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-orTUCBHacD0MQNfhOUWdh9RxT/9YNvgfCHFDr2eNQic=";
+  };
+
+  cargoHash = "sha256-2uYNwKjD0vX+C2Sj2epyTqe4sMqPa7cwVwoUHs3vtQE=";
+
+  useFetchCargoVendor = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "CLI tool for building changelogs from fragments";
+    homepage = "https://github.com/nekitdev/changelogging";
+    changelog = "https://github.com/nekitdev/changelogging/releases/tag/v${version}";
+    platforms = lib.platforms.all;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.nekitdev ];
+    mainProgram = "changelogging";
+  };
+}

From e927eba03b4161ce9ca8ec1a495ff1431daf0d64 Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Mon, 20 Jan 2025 22:54:46 +0800
Subject: [PATCH 07/75] racket and racket-minimal: separate recipes

---
 .../interpreters/racket/default.nix           | 242 +++++-------------
 .../interpreters/racket/minimal.nix           | 172 +++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +-
 3 files changed, 238 insertions(+), 178 deletions(-)
 create mode 100644 pkgs/development/interpreters/racket/minimal.nix

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index b5c40f363e3f..adefea1dd036 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -2,15 +2,10 @@
   lib,
   stdenv,
   fetchurl,
+  racket-minimal,
 
-  libiconvReal,
-  libz,
-  lz4,
-  ncurses,
   openssl,
 
-  isMinimal ? false,
-
   cairo,
   fontconfig,
   glib,
@@ -29,10 +24,11 @@
   disableDocs ? false,
 
   callPackage,
-  writers,
 }:
 
 let
+  minimal = racket-minimal.override { inherit disableDocs; };
+
   makeLibPaths = lib.concatMapStringsSep " " (
     lib.flip lib.pipe [
       lib.getLib
@@ -41,9 +37,12 @@ let
   );
 
   manifest = lib.importJSON ./manifest.json;
-  inherit (stdenv.hostPlatform) isDarwin isStatic;
+  inherit (stdenv.hostPlatform) isDarwin;
+
+  runtimeDeps = [
+    openssl
+  ];
 
-  runtimeDeps = [ openssl ];
   mainDistDeps = [
     (if isDarwin then libiodbc else unixODBC)
     cairo
@@ -58,83 +57,22 @@ let
   ];
 in
 
-stdenv.mkDerivation (finalAttrs: {
-  pname = "racket";
-  inherit (manifest) version;
-
-  src =
-    let
-      info = manifest.${if isMinimal then "minimal" else "full"};
-    in
-    fetchurl {
-      url = "https://mirror.racket-lang.org/installers/${manifest.version}/${info.filename}";
-      inherit (info) sha256;
+minimal.overrideAttrs (
+  finalAttrs: prevAttrs: {
+    src = fetchurl {
+      url = "https://mirror.racket-lang.org/installers/${manifest.version}/${manifest.full.filename}";
+      inherit (manifest.full) sha256;
     };
 
-  nativeBuildInputs = lib.optionals (!isMinimal) [
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    libiconvReal
-    libz
-    lz4
-    ncurses
-  ];
-
-  patches = lib.optionals isDarwin [
-    /*
-      The entry point binary $out/bin/racket is codesigned at least once. The
-      following error is triggered as a result.
-      (error 'add-ad-hoc-signature "file already has a signature")
-      We always remove the existing signature then call add-ad-hoc-signature to
-      circumvent this error.
-    */
-    ./patches/force-remove-codesign-then-add.patch
-  ];
-
-  preConfigure =
-    /*
-      The configure script forces using `libtool -o` as AR on Darwin. But, the
-      `-o` option is only available from Apple libtool. GNU ar works here.
-    */
-    lib.optionalString isDarwin ''
-      substituteInPlace src/ChezScheme/zlib/configure \
-          --replace-fail 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"'
-    ''
-    + ''
-      mkdir src/build
-      cd src/build
-    '';
-
-  configureScript = "../configure";
-
-  configureFlags =
-    [
-      "--enable-check"
-      "--enable-csonly"
-      "--enable-liblz4"
-      "--enable-libz"
-    ]
-    ++ lib.optional disableDocs "--disable-docs"
-    ++ lib.optionals (!isStatic) [
-      # instead of `--disable-static` that `stdenv` assumes
-      "--disable-libs"
-      # "not currently supported" in `configure --help-cs` but still emphasized in README
-      "--enable-shared"
-    ]
-    ++ lib.optionals isDarwin [
-      "--disable-strip"
-      # "use Unix style (e.g., use Gtk) for Mac OS", which eliminates many problems
-      "--enable-xonx"
+    nativeBuildInputs = [
+      wrapGAppsHook3
     ];
 
-  preBuild =
-    let
-      libPaths = makeLibPaths mainDistDeps;
-      libPathsVar = if isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH";
-    in
-    lib.optionalString (!isMinimal) (
+    preBuild =
+      let
+        libPaths = makeLibPaths mainDistDeps;
+        libPathsVar = if isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH";
+      in
       /*
         Makes FFIs available for setting up `main-distribution` and its
         dependencies, which is integrated into the build process of Racket
@@ -148,81 +86,50 @@ stdenv.mkDerivation (finalAttrs: {
       + ''
         export FONTCONFIG_FILE=${makeFontsConf { fontDirectories = [ ]; }}
         export XDG_CACHE_HOME=$(mktemp -d)
-      ''
-    );
+      '';
 
-  dontStrip = isDarwin;
-
-  preFixup = lib.optionalString (!isMinimal && !isDarwin) ''
-    gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive")
-  '';
-
-  postFixup =
-    let
-      libPaths = makeLibPaths (runtimeDeps ++ lib.optionals (!isMinimal) mainDistDeps);
-    in
-    ''
-      $out/bin/racket -f - <<EOF
-      (require setup/dirs)
-
-      (define config-path (build-path (find-config-dir) "config.rktd"))
-
-      (define prev-config (with-input-from-file config-path read))
-      (define prev-lib-search-dirs (hash-ref prev-config 'lib-search-dirs '(#f)))
-
-      (define lib-search-dirs (append '(${libPaths}) prev-lib-search-dirs))
-      (define config (hash-set prev-config 'lib-search-dirs lib-search-dirs))
-
-      (with-output-to-file config-path (thunk (pretty-write config))
-        #:exists 'replace)
-      EOF
+    preFixup = lib.optionalString (!isDarwin) ''
+      gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive")
     '';
 
-  passthru = {
-    # Functionalities #
-    updateScript = {
-      command = ./update.py;
-      attrPath = "racket";
-      supportedFeatures = [ "commit" ];
-    };
-    writeScript =
-      nameOrPath:
-      {
-        libraries ? [ ],
-        ...
-      }@config:
-      assert lib.assertMsg (libraries == [ ]) "library integration for Racket has not been implemented";
-      writers.makeScriptWriter (
-        builtins.removeAttrs config [ "libraries" ]
-        // {
-          interpreter = "${lib.getExe finalAttrs.finalPackage}";
-        }
-      ) nameOrPath;
-    writeScriptBin = name: finalAttrs.passthru.writeScript "/bin/${name}";
-
-    # Tests #
-    tests = builtins.mapAttrs (name: path: callPackage path { racket = finalAttrs.finalPackage; }) (
-      {
-        ## Basic ##
-        write-greeting = ./tests/write-greeting.nix;
-        get-version-and-variant = ./tests/get-version-and-variant.nix;
-        load-openssl = ./tests/load-openssl.nix;
-
-        ## Nixpkgs supports ##
-        nix-write-script = ./tests/nix-write-script.nix;
-      }
-      // lib.optionalAttrs (!isMinimal) {
-        ## `main-distribution` ##
-        draw-crossing = ./tests/draw-crossing.nix;
-      }
-    );
-  };
-
-  meta = {
-    description =
-      "Programmable programming language" + lib.optionalString isMinimal " (minimal distribution)";
-    longDescription =
+    postFixup =
+      let
+        libPaths = makeLibPaths (runtimeDeps ++ mainDistDeps);
+      in
       ''
+        $out/bin/racket -f - <<EOF
+        (require setup/dirs)
+
+        (define config-path (build-path (find-config-dir) "config.rktd"))
+
+        (define prev-config (with-input-from-file config-path read))
+        (define prev-lib-search-dirs (hash-ref prev-config 'lib-search-dirs '(#f)))
+
+        (define lib-search-dirs (append '(${libPaths}) prev-lib-search-dirs))
+        (define config (hash-set prev-config 'lib-search-dirs lib-search-dirs))
+
+        (with-output-to-file config-path (thunk (pretty-write config))
+          #:exists 'replace)
+        EOF
+      '';
+
+    passthru =
+      let
+        notUpdated = x: !builtins.isAttrs x || lib.isDerivation x;
+        stopPred =
+          _: lhs: rhs:
+          notUpdated lhs || notUpdated rhs;
+      in
+      lib.recursiveUpdateUntil stopPred prevAttrs.passthru {
+        tests = builtins.mapAttrs (name: path: callPackage path { racket = finalAttrs.finalPackage; }) {
+          ## `main-distribution` ##
+          draw-crossing = ./tests/draw-crossing.nix;
+        };
+      };
+
+    meta = prevAttrs.meta // {
+      description = "Programmable programming language";
+      longDescription = ''
         Racket is a full-spectrum programming language. It goes beyond
         Lisp and Scheme with dialects that support objects, types,
         laziness, and more. Racket enables programmers to link
@@ -230,28 +137,9 @@ stdenv.mkDerivation (finalAttrs: {
         programmers to create new, project-specific dialects. Racket's
         libraries support applications from web servers and databases to
         GUIs and charts.
-      ''
-      + lib.optionalString isMinimal ''
-
-        This minimal distribution includes just enough of Racket that you can
-        use `raco pkg` to install more.
       '';
-    homepage = "https://racket-lang.org/";
-    changelog = "https://github.com/racket/racket/releases/tag/v${finalAttrs.version}";
-    /*
-      > Racket is distributed under the MIT license and the Apache version 2.0
-      > license, at your option.
-
-      > The Racket runtime system embeds Chez Scheme, which is distributed
-      > under the Apache version 2.0 license.
-    */
-    license = with lib.licenses; [
-      asl20
-      mit
-    ];
-    maintainers = with lib.maintainers; [ rc-zb ];
-    mainProgram = "racket";
-    platforms = lib.platforms.${if isMinimal then "all" else "unix"};
-    badPlatforms = lib.platforms.darwin;
-  };
-})
+      platforms = lib.platforms.unix;
+      badPlatforms = lib.platforms.darwin;
+    };
+  }
+)
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
new file mode 100644
index 000000000000..c1abd3f983b1
--- /dev/null
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -0,0 +1,172 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+
+  libiconvReal,
+  libz,
+  lz4,
+  ncurses,
+  openssl,
+
+  disableDocs ? false,
+
+  callPackage,
+  writers,
+}:
+
+let
+  manifest = lib.importJSON ./manifest.json;
+
+  inherit (stdenv.hostPlatform) isDarwin isStatic;
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "racket";
+  inherit (manifest) version;
+
+  src = fetchurl {
+    url = "https://mirror.racket-lang.org/installers/${manifest.version}/${manifest.minimal.filename}";
+    inherit (manifest.minimal) sha256;
+  };
+
+  buildInputs = [
+    libiconvReal
+    libz
+    lz4
+    ncurses
+  ];
+
+  patches = lib.optionals isDarwin [
+    /*
+      The entry point binary $out/bin/racket is codesigned at least once. The
+      following error is triggered as a result.
+      (error 'add-ad-hoc-signature "file already has a signature")
+      We always remove the existing signature then call add-ad-hoc-signature to
+      circumvent this error.
+    */
+    ./patches/force-remove-codesign-then-add.patch
+  ];
+
+  preConfigure =
+    /*
+      The configure script forces using `libtool -o` as AR on Darwin. But, the
+      `-o` option is only available from Apple libtool. GNU ar works here.
+    */
+    lib.optionalString isDarwin ''
+      substituteInPlace src/ChezScheme/zlib/configure \
+          --replace-fail 'ARFLAGS="-o"' 'AR=ar; ARFLAGS="rc"'
+    ''
+    + ''
+      mkdir src/build
+      cd src/build
+    '';
+
+  configureScript = "../configure";
+
+  configureFlags =
+    [
+      "--enable-check"
+      "--enable-csonly"
+      "--enable-liblz4"
+      "--enable-libz"
+    ]
+    ++ lib.optional disableDocs "--disable-docs"
+    ++ lib.optionals (!isStatic) [
+      # instead of `--disable-static` that `stdenv` assumes
+      "--disable-libs"
+      # "not currently supported" in `configure --help-cs` but still emphasized in README
+      "--enable-shared"
+    ]
+    ++ lib.optionals isDarwin [
+      "--disable-strip"
+      # "use Unix style (e.g., use Gtk) for Mac OS", which eliminates many problems
+      "--enable-xonx"
+    ];
+
+  dontStrip = isDarwin;
+
+  postFixup = ''
+    $out/bin/racket -f - <<EOF
+    (require setup/dirs)
+
+    (define config-path (build-path (find-config-dir) "config.rktd"))
+
+    (define prev-config (with-input-from-file config-path read))
+    (define prev-lib-search-dirs (hash-ref prev-config 'lib-search-dirs '(#f)))
+
+    (define lib-search-dirs (append '("${lib.getLib openssl}/lib") prev-lib-search-dirs))
+    (define config (hash-set prev-config 'lib-search-dirs lib-search-dirs))
+
+    (with-output-to-file config-path (thunk (pretty-write config))
+      #:exists 'replace)
+    EOF
+  '';
+
+  passthru = {
+    # Functionalities #
+    updateScript = {
+      command = ./update.py;
+      attrPath = "racket";
+      supportedFeatures = [ "commit" ];
+    };
+    writeScript =
+      nameOrPath:
+      {
+        libraries ? [ ],
+        ...
+      }@config:
+      assert lib.assertMsg (libraries == [ ]) "library integration for Racket has not been implemented";
+      writers.makeScriptWriter (
+        builtins.removeAttrs config [ "libraries" ]
+        // {
+          interpreter = "${lib.getExe finalAttrs.finalPackage}";
+        }
+      ) nameOrPath;
+    writeScriptBin = name: finalAttrs.passthru.writeScript "/bin/${name}";
+
+    # Tests #
+    tests = builtins.mapAttrs (name: path: callPackage path { racket = finalAttrs.finalPackage; }) {
+      ## Basic ##
+      write-greeting = ./tests/write-greeting.nix;
+      get-version-and-variant = ./tests/get-version-and-variant.nix;
+      load-openssl = ./tests/load-openssl.nix;
+
+      ## Nixpkgs supports ##
+      nix-write-script = ./tests/nix-write-script.nix;
+    };
+  };
+
+  meta = {
+    description = "Programmable programming language (minimal distribution)";
+    longDescription = ''
+      Racket is a full-spectrum programming language. It goes beyond
+      Lisp and Scheme with dialects that support objects, types,
+      laziness, and more. Racket enables programmers to link
+      components written in different dialects, and it empowers
+      programmers to create new, project-specific dialects. Racket's
+      libraries support applications from web servers and databases to
+      GUIs and charts.
+
+      This minimal distribution includes just enough of Racket that you can
+      use `raco pkg` to install more.
+    '';
+    homepage = "https://racket-lang.org/";
+    changelog = "https://github.com/racket/racket/releases/tag/v${finalAttrs.version}";
+    /*
+      > Racket is distributed under the MIT license and the Apache version 2.0
+      > license, at your option.
+
+      > The Racket runtime system embeds Chez Scheme, which is distributed
+      > under the Apache version 2.0 license.
+    */
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    maintainers = with lib.maintainers; [ rc-zb ];
+    mainProgram = "racket";
+    platforms = lib.platforms.all;
+    badPlatforms = lib.platforms.darwin;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa6cdc64dc4f..ab1b2c3e64f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7285,7 +7285,7 @@ with pkgs;
   wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { };
 
   racket = callPackage ../development/interpreters/racket { };
-  racket-minimal = racket.override { isMinimal = true; };
+  racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { };
 
   rakudo = callPackage ../development/interpreters/rakudo { };
   moarvm = darwin.apple_sdk_11_0.callPackage ../development/interpreters/rakudo/moarvm.nix {

From 9f953c133d4ba0608f9b0bee2b5b1aa66a67d258 Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Wed, 22 Jan 2025 11:43:53 +0800
Subject: [PATCH 08/75] racket-minimal: fix docs failure for lack of SQLite

---
 .../racket/configure-installation.rkt         | 27 +++++++++
 .../interpreters/racket/default.nix           | 55 +++++--------------
 .../interpreters/racket/minimal.nix           | 29 +++++-----
 3 files changed, 53 insertions(+), 58 deletions(-)
 create mode 100644 pkgs/development/interpreters/racket/configure-installation.rkt

diff --git a/pkgs/development/interpreters/racket/configure-installation.rkt b/pkgs/development/interpreters/racket/configure-installation.rkt
new file mode 100644
index 000000000000..ffc72b14d243
--- /dev/null
+++ b/pkgs/development/interpreters/racket/configure-installation.rkt
@@ -0,0 +1,27 @@
+#lang racket/base
+(require
+ racket/function
+ racket/list
+ racket/pretty
+ racket/string
+ setup/dirs
+ )
+
+(define config-file (build-path (find-config-dir) "config.rktd"))
+
+(define lib-paths
+  ((compose remove-duplicates
+            (curry map (curryr string-trim "-L" #:right? #f))
+            (curry filter (curryr string-prefix? "-L"))
+            string-split)
+   (getenv "NIX_LDFLAGS")))
+
+(define config
+  (let* ([prev-config (read-installation-configuration-table)]
+         [prev-lib-search-dirs (hash-ref prev-config 'lib-search-dirs '(#f))]
+         [lib-search-dirs (remove-duplicates (append lib-paths prev-lib-search-dirs))])
+    (hash-set prev-config 'lib-search-dirs lib-search-dirs)))
+
+(call-with-output-file config-file
+  #:exists 'replace
+  (curry pretty-write config))
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index adefea1dd036..2f624f400611 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -4,8 +4,6 @@
   fetchurl,
   racket-minimal,
 
-  openssl,
-
   cairo,
   fontconfig,
   glib,
@@ -17,7 +15,6 @@
   libpng,
   makeFontsConf,
   pango,
-  sqlite,
   unixODBC,
   wrapGAppsHook3,
 
@@ -38,23 +35,6 @@ let
 
   manifest = lib.importJSON ./manifest.json;
   inherit (stdenv.hostPlatform) isDarwin;
-
-  runtimeDeps = [
-    openssl
-  ];
-
-  mainDistDeps = [
-    (if isDarwin then libiodbc else unixODBC)
-    cairo
-    fontconfig
-    glib
-    gtk3
-    libGL
-    libjpeg
-    libpng
-    pango
-    sqlite
-  ];
 in
 
 minimal.overrideAttrs (
@@ -64,13 +44,25 @@ minimal.overrideAttrs (
       inherit (manifest.full) sha256;
     };
 
+    buildInputs = prevAttrs.buildInputs ++ [
+      (if isDarwin then libiodbc else unixODBC)
+      cairo
+      fontconfig.lib
+      glib
+      gtk3
+      libGL
+      libjpeg
+      libpng
+      pango
+    ];
+
     nativeBuildInputs = [
       wrapGAppsHook3
     ];
 
     preBuild =
       let
-        libPaths = makeLibPaths mainDistDeps;
+        libPaths = makeLibPaths finalAttrs.buildInputs;
         libPathsVar = if isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else "LD_LIBRARY_PATH";
       in
       /*
@@ -92,27 +84,6 @@ minimal.overrideAttrs (
       gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive")
     '';
 
-    postFixup =
-      let
-        libPaths = makeLibPaths (runtimeDeps ++ mainDistDeps);
-      in
-      ''
-        $out/bin/racket -f - <<EOF
-        (require setup/dirs)
-
-        (define config-path (build-path (find-config-dir) "config.rktd"))
-
-        (define prev-config (with-input-from-file config-path read))
-        (define prev-lib-search-dirs (hash-ref prev-config 'lib-search-dirs '(#f)))
-
-        (define lib-search-dirs (append '(${libPaths}) prev-lib-search-dirs))
-        (define config (hash-set prev-config 'lib-search-dirs lib-search-dirs))
-
-        (with-output-to-file config-path (thunk (pretty-write config))
-          #:exists 'replace)
-        EOF
-      '';
-
     passthru =
       let
         notUpdated = x: !builtins.isAttrs x || lib.isDerivation x;
diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix
index c1abd3f983b1..60e33859afee 100644
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -8,6 +8,7 @@
   lz4,
   ncurses,
   openssl,
+  sqlite,
 
   disableDocs ? false,
 
@@ -35,6 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
     libz
     lz4
     ncurses
+    openssl
+    sqlite.out
   ];
 
   patches = lib.optionals isDarwin [
@@ -86,22 +89,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontStrip = isDarwin;
 
-  postFixup = ''
-    $out/bin/racket -f - <<EOF
-    (require setup/dirs)
-
-    (define config-path (build-path (find-config-dir) "config.rktd"))
-
-    (define prev-config (with-input-from-file config-path read))
-    (define prev-lib-search-dirs (hash-ref prev-config 'lib-search-dirs '(#f)))
-
-    (define lib-search-dirs (append '("${lib.getLib openssl}/lib") prev-lib-search-dirs))
-    (define config (hash-set prev-config 'lib-search-dirs lib-search-dirs))
-
-    (with-output-to-file config-path (thunk (pretty-write config))
-      #:exists 'replace)
-    EOF
-  '';
+  postFixup =
+    let
+      configureInstallation = builtins.path {
+        name = "configure-installation.rkt";
+        path = ./configure-installation.rkt;
+      };
+    in
+    ''
+      $out/bin/racket -U -u ${configureInstallation}
+    '';
 
   passthru = {
     # Functionalities #

From 3a8ef07df70750437bf783c1448379369f7d9d25 Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Thu, 30 Jan 2025 22:39:54 +0800
Subject: [PATCH 09/75] racket: fix failure to find executable

Fix #377763.
---
 .../interpreters/racket/default.nix           |  9 +++
 .../racket/patches/force-cs-variant.patch     | 12 ++++
 .../racket/tests/get-version-and-variant.nix  | 58 ++++++++++++-------
 3 files changed, 59 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/interpreters/racket/patches/force-cs-variant.patch

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 2f624f400611..45ee63f0ec7e 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -60,6 +60,15 @@ minimal.overrideAttrs (
       wrapGAppsHook3
     ];
 
+    patches = prevAttrs.patches or [ ] ++ [
+      /*
+        Hardcode variant detection because nixpkgs wraps the Racket binary making it
+        fail to detect its variant at runtime.
+        https://github.com/NixOS/nixpkgs/issues/114993#issuecomment-812951247
+      */
+      ./patches/force-cs-variant.patch
+    ];
+
     preBuild =
       let
         libPaths = makeLibPaths finalAttrs.buildInputs;
diff --git a/pkgs/development/interpreters/racket/patches/force-cs-variant.patch b/pkgs/development/interpreters/racket/patches/force-cs-variant.patch
new file mode 100644
index 000000000000..52bb537a1f06
--- /dev/null
+++ b/pkgs/development/interpreters/racket/patches/force-cs-variant.patch
@@ -0,0 +1,12 @@
+--- old/collects/setup/variant.rkt
++++ new/collects/setup/variant.rkt
+@@ -7,7 +7,8 @@
+ (provide variant-suffix
+          script-variant?)
+
+-(define plain-variant
++(define plain-variant 'cs)
++#;(define plain-variant
+   (delay/sync
+    (cond
+      [(cross-installation?)
diff --git a/pkgs/development/interpreters/racket/tests/get-version-and-variant.nix b/pkgs/development/interpreters/racket/tests/get-version-and-variant.nix
index c81cb7719380..870542f8f6c0 100644
--- a/pkgs/development/interpreters/racket/tests/get-version-and-variant.nix
+++ b/pkgs/development/interpreters/racket/tests/get-version-and-variant.nix
@@ -1,27 +1,45 @@
-{ runCommandLocal, racket }:
+{
+  lib,
+  runCommandLocal,
+  racket,
+}:
 
 runCommandLocal "racket-test-get-version-and-variant"
   {
     nativeBuildInputs = [ racket ];
   }
-  ''
-    expectation="${racket.version}"
+  (
+    lib.concatLines (
+      builtins.map
+        (
+          { expectation, output }:
+          ''
+            expectation="${expectation}"
 
-    output="$(racket -e '(display (version))')"
+            output="${output}"
 
-    if test "$output" != "$expectation"; then
-        echo "output mismatch: expected ''${expectation}, but got ''${output}"
-        exit 1
-    fi
-
-    expectation="cs"
-
-    output="$(racket -e '(require launcher/launcher) (display (current-launcher-variant))')"
-
-    if test "$output" != "$expectation"; then
-        echo "output mismatch: expected ''${expectation}, but got ''${output}"
-        exit 1
-    fi
-
-    touch $out
-  ''
+            if test "$output" != "$expectation"; then
+                echo "output mismatch: expected ''${expectation}, but got ''${output}"
+                exit 1
+            fi
+          ''
+        )
+        [
+          {
+            expectation = racket.version;
+            output = "$(racket -e '(display (version))')";
+          }
+          {
+            expectation = "cs";
+            output = "$(racket -e '(require launcher/launcher) (display (current-launcher-variant))')";
+          }
+          {
+            expectation = "${lib.getExe racket}";
+            output = "$(racket -e '(require compiler/find-exe) (display (find-exe))')";
+          }
+        ]
+    )
+    + ''
+      touch $out
+    ''
+  )

From e499f37df93149dce44b74834cfe37f5ab32114c Mon Sep 17 00:00:00 2001
From: Pedro Mendes <pedrohrmendes@proton.me>
Date: Tue, 4 Feb 2025 23:54:12 -0300
Subject: [PATCH 10/75] mantainers: add phrmendes

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f3d03f99db7f..5efe71182de0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18123,6 +18123,12 @@
     githubId = 301903;
     name = "Chip Collier";
   };
+  phrmendes = {
+    name = "Pedro Mendes";
+    email = "pedrohrmendes@proton.me";
+    github = "phrmendes";
+    githubId = 22376151;
+  };
   phrogg = {
     name = "Phil Roggenbuck";
     email = "nixpkgs@phrogg.de";

From 1c699b8921e759f147668ad10be3e436ab9e4032 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Thu, 6 Feb 2025 09:57:05 +0100
Subject: [PATCH 11/75] shark: fix build with boost187

---
 pkgs/by-name/sh/shark/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/sh/shark/package.nix b/pkgs/by-name/sh/shark/package.nix
index 1bd6a9ab94c3..4219153a78ab 100644
--- a/pkgs/by-name/sh/shark/package.nix
+++ b/pkgs/by-name/sh/shark/package.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
   # c.f https://github.com/Shark-ML/Shark/commit/221c1f2e8abfffadbf3c5ef7cf324bc6dc9b4315
   patches = [ ./shark-2-ext-num-literals-all.diff ];
 
+  # Remove explicitly setting C++11, because boost::math headers need C++14 since Boost187.
+  postPatch = ''
+    sed -i '/CXX_STANDARD/d' src/CMakeLists.txt
+  '';
+
   # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/blob/develop/SuperBuild/CMake/External_shark.cmake?ref_type=heads
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"

From 6c28f61e895b4ee0e10d8cb1c5607faa38a8370f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Feb 2025 19:03:48 +0000
Subject: [PATCH 12/75] lock: 1.3.9 -> 1.4.1

---
 pkgs/by-name/lo/lock/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix
index 2f998f4cdbe2..e71e434c84ff 100644
--- a/pkgs/by-name/lo/lock/package.nix
+++ b/pkgs/by-name/lo/lock/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lock";
-  version = "1.3.9";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aRXwRJ4FTdIef1UHBJ9877d86uxm5GHML//IqOGEGXs=";
+    hash = "sha256-DTq3hJVWoLnosjN5XWUNaQCdXut4nqGeD6XutzBAKa8=";
   };
 
   strictDeps = true;

From 14a9b932cd0e871d559086c8dd674d3e045df289 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Feb 2025 06:28:16 +0000
Subject: [PATCH 13/75] diesel-cli: 2.2.6 -> 2.2.7

---
 pkgs/by-name/di/diesel-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index 2a46df08ac50..6c15ad70cfb8 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -27,16 +27,16 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-jKTQxlmpTlb0eITwNbnYfONknGhHsO/nzdup04ikEB0=";
+    hash = "sha256-0rmuOeWPczO5XRlpkeFC7FXMSnWSy5FBd9GpClA+i7c=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-mMXLivUWH5LIdFbAxgkha8oEYZFt0eUVCxtyPlBPpVI=";
+  cargoHash = "sha256-waX8wkbU8rXN183j0RDfszHKsLxQdq19UMwrqI8gBOY=";
 
   nativeBuildInputs = [
     installShellFiles

From 5ee577c1df6a15bebc47e0a708227bdfbd7c10af Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Fri, 7 Feb 2025 16:42:45 +0000
Subject: [PATCH 14/75] python313Packages.dataproperty: refactor, use
 setuptools-scm

setuptools-scm is required to report the correct package version
---
 .../python-modules/dataproperty/default.nix     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix
index 1b65ced8353f..050d0351fff3 100644
--- a/pkgs/development/python-modules/dataproperty/default.nix
+++ b/pkgs/development/python-modules/dataproperty/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools-scm,
   loguru,
   mbstrdecoder,
   pytestCheckHook,
@@ -14,18 +15,20 @@
 buildPythonPackage rec {
   pname = "dataproperty";
   version = "1.1.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "thombashi";
-    repo = pname;
+    repo = "dataproperty";
     tag = "v${version}";
     hash = "sha256-IEEwdOcC9nKwVumWnjpZlqYKCFGwZebMh7nGdGVjibE=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools-scm ];
+
+  dependencies = [
     mbstrdecoder
     typepy
     tcolorpy
@@ -42,11 +45,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dataproperty" ];
 
-  meta = with lib; {
+  meta = {
     description = "Library for extracting properties from data";
-    homepage = "https://github.com/thombashi/dataproperty";
+    homepage = "https://github.com/thombashi/DataProperty";
     changelog = "https://github.com/thombashi/DataProperty/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ genericnerdyusername ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ genericnerdyusername ];
   };
 }

From 87ba9a0fc0a51f29674bb71bf05afa7b332ddff1 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Fri, 7 Feb 2025 16:42:45 +0000
Subject: [PATCH 15/75] python313Packages.pytablewriter: refactor, use
 setuptools-scm

setuptools-scm is required to report the correct package version
---
 .../python-modules/pytablewriter/default.nix     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix
index 26807a887cda..75ec06feea3f 100644
--- a/pkgs/development/python-modules/pytablewriter/default.nix
+++ b/pkgs/development/python-modules/pytablewriter/default.nix
@@ -12,7 +12,7 @@
   pytestCheckHook,
   pythonOlder,
   pyyaml,
-  setuptools,
+  setuptools-scm,
   simplejson,
   tabledata,
   tcolorpy,
@@ -25,20 +25,20 @@
 buildPythonPackage rec {
   pname = "pytablewriter";
   version = "1.2.1";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "thombashi";
-    repo = pname;
+    repo = "pytablewriter";
     tag = "v${version}";
     hash = "sha256-YuuSMKTSG3oybvA6TDWNnGg4EiDAw2tRlM0S9mBQlkc=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     dataproperty
     mbstrdecoder
     pathvalidate
@@ -103,11 +103,11 @@ buildPythonPackage rec {
     "test/writer/test_elasticsearch_writer.py"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Library to write a table in various formats";
     homepage = "https://github.com/thombashi/pytablewriter";
     changelog = "https://github.com/thombashi/pytablewriter/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ genericnerdyusername ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ genericnerdyusername ];
   };
 }

From e024f6f2935c4c58974c01d13c216a4af2826002 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Fri, 7 Feb 2025 16:42:45 +0000
Subject: [PATCH 16/75] python313Packages.tabledata: refactor, use
 setuptools-scm

setuptools-scm is required to report the correct package version
---
 .../python-modules/tabledata/default.nix          | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/tabledata/default.nix b/pkgs/development/python-modules/tabledata/default.nix
index c995f8b36a1d..ea20066ae34d 100644
--- a/pkgs/development/python-modules/tabledata/default.nix
+++ b/pkgs/development/python-modules/tabledata/default.nix
@@ -2,6 +2,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   lib,
+  setuptools-scm,
   dataproperty,
   typepy,
   pytestCheckHook,
@@ -10,27 +11,29 @@
 buildPythonPackage rec {
   pname = "tabledata";
   version = "1.3.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thombashi";
-    repo = pname;
+    repo = "tabledata";
     tag = "v${version}";
     hash = "sha256-kZAEKUOcxb3fK3Oh6+4byJJlB/xzDAEGNpUDEKyVkhs=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools-scm ];
+
+  dependencies = [
     dataproperty
     typepy
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/thombashi/tabledata";
     description = "Library to represent tabular data";
     changelog = "https://github.com/thombashi/tabledata/releases/tag/${src.tag}";
-    maintainers = with maintainers; [ genericnerdyusername ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ genericnerdyusername ];
+    license = lib.licenses.mit;
   };
 }

From 1b092ec7710b17cd2609a30fb80e2654d4a33b42 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Fri, 7 Feb 2025 16:42:45 +0000
Subject: [PATCH 17/75] python313Packages.typepy: refactor, use setuptools-scm

setuptools-scm is required to report the correct package version
---
 .../development/python-modules/typepy/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix
index 313e04cd4a5f..1e5e8b2f7059 100644
--- a/pkgs/development/python-modules/typepy/default.nix
+++ b/pkgs/development/python-modules/typepy/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools-scm,
   mbstrdecoder,
   python-dateutil,
   pytz,
@@ -14,18 +15,20 @@
 buildPythonPackage rec {
   pname = "typepy";
   version = "1.3.4";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "thombashi";
-    repo = pname;
+    repo = "typepy";
     tag = "v${version}";
     hash = "sha256-lgwXoEtv2nBRKiWQH5bDrAIfikKN3cOqcHLEdnSAMpc=";
   };
 
-  propagatedBuildInputs = [ mbstrdecoder ];
+  build-system = [ setuptools-scm ];
+
+  dependencies = [ mbstrdecoder ];
 
   optional-dependencies = {
     datetime = [
@@ -42,11 +45,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "typepy" ];
 
-  meta = with lib; {
+  meta = {
     description = "Library for variable type checker/validator/converter at a run time";
     homepage = "https://github.com/thombashi/typepy";
     changelog = "https://github.com/thombashi/typepy/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ genericnerdyusername ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ genericnerdyusername ];
   };
 }

From f4288c287800e96b08730d1d92875fe33209eee7 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Sun, 9 Feb 2025 11:34:46 +0800
Subject: [PATCH 18/75] python313Packages.traits: 6.4.3 -> 7.0.2

---
 pkgs/development/python-modules/traits/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix
index aea469d1523f..e2932c101665 100644
--- a/pkgs/development/python-modules/traits/default.nix
+++ b/pkgs/development/python-modules/traits/default.nix
@@ -9,24 +9,16 @@
 
 buildPythonPackage rec {
   pname = "traits";
-  version = "6.4.3";
+  version = "7.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qbv9ngwIt94H6G72TmnLlqKcIQWkO/gyzYsWL6HiL0Q=";
+    hash = "sha256-pWNRWAnLORGXXeWlQgmFXwtv23ymkSpegd4mUp9wQow=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/enthought/traits/commit/a20f2154b2c79eb8550ea9228d1a4415ff51b72a.patch";
-      hash = "sha256-ycStcpxlvmobL3ZXaSbGrXAzk/Tkjs3BJ67lnwZpeVA=";
-      excludes = [ ".github/*" ];
-    })
-  ];
-
   build-system = [ setuptools ];
 
   pythonImportsCheck = [ "traits" ];

From 1cb9c4550dc2dee415980f21e276578948071ad0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 11:45:28 +0100
Subject: [PATCH 19/75] python312Packages.dask-expr: remove (now included in
 dask)

---
 .../python-modules/dask-expr/default.nix      | 65 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 pkgs/development/python-modules/dask-expr/default.nix

diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix
deleted file mode 100644
index c7bb6c734ee9..000000000000
--- a/pkgs/development/python-modules/dask-expr/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  setuptools,
-  versioneer,
-
-  # dependencies
-  dask,
-  pandas,
-  pyarrow,
-
-  # checks
-  jinja2,
-  pytestCheckHook,
-  xarray,
-}:
-
-buildPythonPackage rec {
-  pname = "dask-expr";
-  version = "1.1.21";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "dask";
-    repo = "dask-expr";
-    tag = "v${version}";
-    hash = "sha256-t1vPlTxV5JYArg/a7CzPP13NHbstEoCgHRmd8Y9mDfA=";
-  };
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "versioneer[toml]==0.28" "versioneer[toml]"
-  '';
-
-  build-system = [
-    setuptools
-    versioneer
-  ];
-
-  dependencies = [
-    dask
-    pandas
-    pyarrow
-  ];
-
-  pythonImportsCheck = [ "dask_expr" ];
-
-  nativeCheckInputs = [
-    jinja2
-    pytestCheckHook
-    xarray
-  ];
-
-  __darwinAllowLocalNetworking = true;
-
-  meta = {
-    description = "Rewrite of Dask DataFrame that includes query optimization and generally improved organization";
-    homepage = "https://github.com/dask/dask-expr";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ GaetanLepage ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 434e1b6f3cd9..c87843dcb618 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -142,6 +142,7 @@ mapAliases ({
   cx_Freeze = cx-freeze; # added 2023-08-02
   cx_oracle = cx-oracle; # added 2024-01-03
   d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30
+  dask-expr = throw "dask-expr was removed because its features are available in dask"; # added 2025-02-07
   dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24
   dash-renderer = throw "dash-renderer has been removed since it is abandoned"; # added 2025-01-01
   dateutil = python-dateutil; # added 2021-07-03
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84f44003ad7a..5a0133d8743d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2961,8 +2961,6 @@ self: super: with self; {
 
   dask-awkward = callPackage ../development/python-modules/dask-awkward { };
 
-  dask-expr = callPackage ../development/python-modules/dask-expr { };
-
   dask-gateway = callPackage ../development/python-modules/dask-gateway { };
 
   dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { };

From 24c5862bbec741e99e5b288c7de2177e4f5ae74b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 11:46:55 +0100
Subject: [PATCH 20/75] python312Packages.dask: 2024.12.1 -> 2025.1.0

Diff: https://github.com/dask/dask/compare/refs/tags/2024.12.1...2025.1.0

Changelog: https://docs.dask.org/en/latest/changelog.html
---
 .../python-modules/dask/default.nix           | 272 ++++++++----------
 1 file changed, 115 insertions(+), 157 deletions(-)

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 93b38b11b1f7..b37ddce56526 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -27,168 +26,127 @@
   jinja2,
 
   # tests
-  arrow-cpp,
-  dask-expr,
   hypothesis,
   pytest-asyncio,
+  pytest-mock,
   pytest-rerunfailures,
   pytest-xdist,
   pytestCheckHook,
+  versionCheckHook,
 }:
 
-let
-  self = buildPythonPackage rec {
-    pname = "dask";
-    version = "2024.12.1";
-    pyproject = true;
+buildPythonPackage rec {
+  pname = "dask";
+  version = "2025.1.0";
+  pyproject = true;
 
-    src = fetchFromGitHub {
-      owner = "dask";
-      repo = "dask";
-      tag = version;
-      hash = "sha256-QqvdldAHW2UYt1NXfk3Aa+oe97e+OpRbF8d6eKV3OJ4=";
-    };
-
-    build-system = [ setuptools ];
-
-    dependencies = [
-      click
-      cloudpickle
-      fsspec
-      packaging
-      partd
-      pyyaml
-      importlib-metadata
-      toolz
-    ];
-
-    optional-dependencies = lib.fix (self: {
-      array = [ numpy ];
-      complete =
-        [
-          pyarrow
-          lz4
-        ]
-        ++ self.array
-        ++ self.dataframe
-        ++ self.distributed
-        ++ self.diagnostics;
-      dataframe = [
-        # dask-expr -> circular dependency with dask-expr
-        numpy
-        pandas
-      ];
-      distributed = [ distributed ];
-      diagnostics = [
-        bokeh
-        jinja2
-      ];
-    });
-
-    nativeCheckInputs =
-      [
-        dask-expr
-        pytestCheckHook
-        pytest-rerunfailures
-        pytest-xdist
-        # from panda[test]
-        hypothesis
-        pytest-asyncio
-      ]
-      ++ self.optional-dependencies.array
-      ++ self.optional-dependencies.dataframe
-      ++ lib.optionals (!arrow-cpp.meta.broken) [
-        # support is sparse on aarch64
-        pyarrow
-      ];
-
-    dontUseSetuptoolsCheck = true;
-
-    postPatch = ''
-      # versioneer hack to set version of GitHub package
-      echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
-
-      substituteInPlace setup.py \
-        --replace-fail "import versioneer" "" \
-        --replace-fail "version=versioneer.get_version()," "version='${version}'," \
-        --replace-fail "cmdclass=versioneer.get_cmdclass()," ""
-
-      substituteInPlace pyproject.toml \
-        --replace-fail ', "versioneer[toml]==0.29"' "" \
-        --replace-fail " --durations=10" "" \
-        --replace-fail " --cov-config=pyproject.toml" "" \
-        --replace-fail "\"-v" "\" "
-    '';
-
-    pytestFlagsArray = [
-      # Rerun failed tests up to three times
-      "--reruns 3"
-      # Don't run tests that require network access
-      "-m 'not network'"
-    ];
-
-    disabledTests =
-      lib.optionals stdenv.hostPlatform.isDarwin [
-        # Test requires features of python3Packages.psutil that are
-        # blocked in sandboxed-builds
-        "test_auto_blocksize_csv"
-        # AttributeError: 'str' object has no attribute 'decode'
-        "test_read_dir_nometa"
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-        # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly...
-        "test_foldby_tree_reduction"
-        "test_to_bag"
-      ]
-      ++ [
-        # https://github.com/dask/dask/issues/10347#issuecomment-1589683941
-        "test_concat_categorical"
-        # AttributeError: 'ArrowStringArray' object has no attribute 'tobytes'. Did you mean: 'nbytes'?
-        "test_dot"
-        "test_dot_nan"
-        "test_merge_column_with_nulls"
-        # FileNotFoundError: [Errno 2] No such file or directory: '/build/tmp301jryv_/createme/0.part'
-        "test_to_csv_nodir"
-        "test_to_json_results"
-        # FutureWarning: Those tests should be working fine when pandas will have been upgraded to 2.1.1
-        "test_apply"
-        "test_apply_infer_columns"
-      ];
-
-    __darwinAllowLocalNetworking = true;
-
-    pythonImportsCheck = [
-      "dask"
-      "dask.bag"
-      "dask.bytes"
-      "dask.diagnostics"
-    ];
-
-    doCheck = false;
-
-    # Enable tests via passthru to avoid cyclic dependency with dask-expr.
-    passthru.tests = {
-      check = self.overridePythonAttrs (old: {
-        doCheck = true;
-        pythonImportsCheck = [
-          # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs`
-          "dask.array"
-          # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs`
-          "dask.dataframe"
-          "dask.dataframe.io"
-          "dask.dataframe.tseries"
-        ] ++ old.pythonImportsCheck;
-      });
-    };
-
-    meta = {
-      description = "Minimal task scheduling abstraction";
-      mainProgram = "dask";
-      homepage = "https://dask.org/";
-      changelog = "https://docs.dask.org/en/latest/changelog.html";
-      license = lib.licenses.bsd3;
-      maintainers = with lib.maintainers; [ GaetanLepage ];
-    };
+  src = fetchFromGitHub {
+    owner = "dask";
+    repo = "dask";
+    tag = version;
+    hash = "sha256-KBqOyf471mNg3L9dYmR7IRSltEtC+VgC+6ptsoKgVmM=";
   };
-in
-self
+
+  postPatch = ''
+    # versioneer hack to set version of GitHub package
+    echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
+
+    substituteInPlace setup.py \
+      --replace-fail "import versioneer" "" \
+      --replace-fail "version=versioneer.get_version()," "version='${version}'," \
+      --replace-fail "cmdclass=versioneer.get_cmdclass()," ""
+
+    substituteInPlace pyproject.toml \
+      --replace-fail ', "versioneer[toml]==0.29"' "" \
+      --replace-fail " --durations=10" "" \
+      --replace-fail " --cov-config=pyproject.toml" "" \
+      --replace-fail "\"-v" "\" "
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    click
+    cloudpickle
+    fsspec
+    packaging
+    partd
+    pyyaml
+    importlib-metadata
+    toolz
+  ];
+
+  optional-dependencies = lib.fix (self: {
+    array = [ numpy ];
+    complete =
+      [
+        pyarrow
+        lz4
+      ]
+      ++ self.array
+      ++ self.dataframe
+      ++ self.distributed
+      ++ self.diagnostics;
+    dataframe = [
+      pandas
+      pyarrow
+    ] ++ self.array;
+    distributed = [ distributed ];
+    diagnostics = [
+      bokeh
+      jinja2
+    ];
+  });
+
+  nativeCheckInputs =
+    [
+      hypothesis
+      pytest-asyncio
+      pytest-mock
+      pytest-rerunfailures
+      pytest-xdist
+      pytestCheckHook
+      versionCheckHook
+      pyarrow
+    ]
+    ++ optional-dependencies.array
+    ++ optional-dependencies.dataframe;
+  versionCheckProgramArg = [ "--version" ];
+
+  pytestFlagsArray = [
+    # Rerun failed tests up to three times
+    "--reruns 3"
+    # Don't run tests that require network access
+    "-m 'not network'"
+  ];
+
+  disabledTests = [
+    # UserWarning: Insufficient elements for `head`. 10 elements requested, only 5 elements available. Try passing larger `npartitions` to `head`.
+    "test_set_index_head_nlargest_string"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  pythonImportsCheck = [
+    "dask"
+    "dask.bag"
+    "dask.bytes"
+    "dask.diagnostics"
+
+    # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs`
+    "dask.array"
+    # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs`
+    "dask.dataframe"
+    "dask.dataframe.io"
+    "dask.dataframe.tseries"
+  ];
+
+  meta = {
+    description = "Minimal task scheduling abstraction";
+    mainProgram = "dask";
+    homepage = "https://dask.org/";
+    changelog = "https://docs.dask.org/en/latest/changelog.html";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}

From 43ef67841e9ccc78e7b9d9684b741f9b9c4cab77 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 12:41:10 +0100
Subject: [PATCH 21/75] python312Packages.streamz: cleanup

---
 .../python-modules/streamz/default.nix        | 58 ++++++++-----------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix
index eea52b8fa8f2..4a4e8855d22a 100644
--- a/pkgs/development/python-modules/streamz/default.nix
+++ b/pkgs/development/python-modules/streamz/default.nix
@@ -1,23 +1,24 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
+
+  # build-system
   setuptools,
-  confluent-kafka,
-  dask,
-  dask-expr,
-  distributed,
-  flaky,
-  graphviz,
-  networkx,
-  pytest-asyncio,
-  pytestCheckHook,
-  requests,
+
+  # dependencies
   six,
   toolz,
   tornado,
   zict,
+
+  # tests
+  dask,
+  distributed,
+  flaky,
+  pandas,
+  pyarrow,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -25,17 +26,16 @@ buildPythonPackage rec {
   version = "0.6.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-VXfWkEwuxInBQVQJV3IQXgGVRkiBmYfUZCBMbjyWNPM=";
+  src = fetchFromGitHub {
+    owner = "python-streamz";
+    repo = "streamz";
+    tag = version;
+    hash = "sha256-lSb3gl+TSIzz4BZzxH8zXu74HvzSntOAoVQUUJKIEvA=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
-    networkx
     six
     toolz
     tornado
@@ -43,15 +43,12 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    confluent-kafka
     dask
-    dask-expr
     distributed
     flaky
-    graphviz
-    pytest-asyncio
+    pandas
+    pyarrow
     pytestCheckHook
-    requests
   ];
 
   pythonImportsCheck = [ "streamz" ];
@@ -63,24 +60,17 @@ buildPythonPackage rec {
     "test_partition_then_scatter_sync"
     "test_sync"
     "test_sync_2"
-    # Test fail in the sandbox
-    "test_tcp_async"
-    "test_tcp"
-    "test_partition_timeout"
+
     # Tests are flaky
-    "test_from_iterable"
     "test_buffer"
   ];
 
-  disabledTestPaths = [
-    # Disable kafka tests
-    "streamz/tests/test_kafka.py"
-  ];
+  __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Pipelines to manage continuous streams of data";
     homepage = "https://github.com/python-streamz/streamz";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }

From 57778e074c29671facff76729fad59aa3b3af92e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 12:41:38 +0100
Subject: [PATCH 22/75] python312Packages.streamz: add GaetanLepage as
 maintainer

---
 pkgs/development/python-modules/streamz/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix
index 4a4e8855d22a..5aab96e7c462 100644
--- a/pkgs/development/python-modules/streamz/default.nix
+++ b/pkgs/development/python-modules/streamz/default.nix
@@ -71,6 +71,6 @@ buildPythonPackage rec {
     description = "Pipelines to manage continuous streams of data";
     homepage = "https://github.com/python-streamz/streamz";
     license = lib.licenses.bsd3;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }

From b6cc264c8a30a2d9171732946301d58a7674ac13 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 14:29:01 +0100
Subject: [PATCH 23/75] python312Packages.narwhals: 1.22.0 -> 1.25.2

Diff: https://github.com/narwhals-dev/narwhals/compare/refs/tags/v1.22.0...v1.25.2

Changelog: https://github.com/narwhals-dev/narwhals/releases/tag/v1.25.2
---
 .../python-modules/narwhals/default.nix       | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix
index 5aa36f62364c..f96998a32908 100644
--- a/pkgs/development/python-modules/narwhals/default.nix
+++ b/pkgs/development/python-modules/narwhals/default.nix
@@ -1,34 +1,36 @@
 {
   lib,
   buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # optional-dependencies
   # cudf,
   dask,
-  dask-expr,
-  duckdb,
-  fetchFromGitHub,
-  hatchling,
-  hypothesis,
   # modin,
   pandas,
   polars,
   pyarrow,
+
+  # tests
+  duckdb,
+  hypothesis,
   pytest-env,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "narwhals";
-  version = "1.22.0";
+  version = "1.25.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "narwhals-dev";
     repo = "narwhals";
     tag = "v${version}";
-    hash = "sha256-I6nJJiiW1v04YH70OPxXKeO80N52nnCPKRzJLILEWmw=";
+    hash = "sha256-cp/Ang5RXLpgTdpOHRKz9fGN9D+SgFC5KhF3ukf8G+w=";
   };
 
   build-system = [
@@ -39,7 +41,6 @@ buildPythonPackage rec {
     # cudf = [ cudf ];
     dask = [
       dask
-      dask-expr
     ];
     # modin = [ modin ];
     pandas = [ pandas ];
@@ -64,7 +65,7 @@ buildPythonPackage rec {
   meta = {
     description = "Lightweight and extensible compatibility layer between dataframe libraries";
     homepage = "https://github.com/narwhals-dev/narwhals";
-    changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/${src.tag}";
+    changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };

From f1309365070057256fdd32bc63ece36278ec3b5d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 14:37:28 +0100
Subject: [PATCH 24/75] python312Packages.dask-glm: add GaetanLepage as
 maintainer

---
 pkgs/development/python-modules/dask-glm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix
index a4bead52b43b..7fbb0359e2ca 100644
--- a/pkgs/development/python-modules/dask-glm/default.nix
+++ b/pkgs/development/python-modules/dask-glm/default.nix
@@ -63,5 +63,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/dask/dask-glm/";
     license = licenses.bsd3;
     maintainers = [ ];
+    maintainers = with maintainers; [ GaetanLepage ];
   };
 }

From 8e0c34c2824abbd1fbf9360b535980fbf02fe8bf Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 14:38:52 +0100
Subject: [PATCH 25/75] python312Packages.dask-glm: fix build

---
 .../python-modules/dask-glm/default.nix       | 59 ++++++++++---------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix
index 7fbb0359e2ca..97cfa6100313 100644
--- a/pkgs/development/python-modules/dask-glm/default.nix
+++ b/pkgs/development/python-modules/dask-glm/default.nix
@@ -1,34 +1,46 @@
 {
   lib,
   buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools-scm,
+
+  # dependencies
   cloudpickle,
-  dask,
   distributed,
-  fetchPypi,
   multipledispatch,
-  pytestCheckHook,
-  pythonOlder,
   scikit-learn,
   scipy,
-  setuptools-scm,
   sparse,
+  dask,
+
+  # tests
+  pytest-xdist,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "dask-glm";
   version = "0.3.2";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-yUelZoZmmKAdeZeK5zIzy16DitXq1ghRQ1gsXpMLmko=";
+  src = fetchFromGitHub {
+    owner = "dask";
+    repo = "dask-glm";
+    tag = version;
+    hash = "sha256-q98QMmw1toashimS16of54cgZgIPqkua3xGD1FZ1nTc=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  # ValueError: The truth value of an empty array is ambiguous. Use `array.size > 0` to check that an array is not empty.
+  postPatch = ''
+    substituteInPlace dask_glm/utils.py \
+      --replace-fail "if arr:" "if (arr is not None) and (arr.size > 0):"
+  '';
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools-scm ];
+
+  dependencies = [
     cloudpickle
     distributed
     multipledispatch
@@ -38,31 +50,24 @@ buildPythonPackage rec {
   ] ++ dask.optional-dependencies.array;
 
   nativeCheckInputs = [
-    sparse
+    pytest-xdist
     pytestCheckHook
   ];
 
   pythonImportsCheck = [ "dask_glm" ];
 
-  disabledTestPaths = [
-    # Circular dependency with dask-ml
-    "dask_glm/tests/test_estimators.py"
-    # Test tries to imort an obsolete method
-    "dask_glm/tests/test_utils.py"
-  ];
-
   disabledTests = [
-    # missing fixture with distributed>=2022.8.0
-    "test_determinism_distributed"
+    # ValueError: <class 'bool'> can be computed for one-element arrays only.
+    "test_dot_with_sparse"
   ];
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Generalized Linear Models with Dask";
     homepage = "https://github.com/dask/dask-glm/";
-    license = licenses.bsd3;
-    maintainers = [ ];
-    maintainers = with maintainers; [ GaetanLepage ];
+    changelog = "https://github.com/dask/dask-glm/releases/tag/${version}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }

From 1d52622529ec21840a1684142bd320a0f8d7203e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 15:12:52 +0100
Subject: [PATCH 26/75] python312Packages.sparse: add GaetanLepage as
 maintainer

---
 pkgs/development/python-modules/sparse/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix
index c09040d2beaa..215b826b477d 100644
--- a/pkgs/development/python-modules/sparse/default.nix
+++ b/pkgs/development/python-modules/sparse/default.nix
@@ -59,5 +59,6 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}";
     license = licenses.bsd3;
     maintainers = [ ];
+    maintainers = with maintainers; [ GaetanLepage ];
   };
 }

From f4fd33f95e10a48d18374114444e9b5467e1da47 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 15:13:02 +0100
Subject: [PATCH 27/75] python312Packages.sparse: cleanup & mark as broken on
 aarch64-linux

---
 .../python-modules/sparse/default.nix         | 53 ++++++++++---------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix
index 215b826b477d..81e567f46ec4 100644
--- a/pkgs/development/python-modules/sparse/default.nix
+++ b/pkgs/development/python-modules/sparse/default.nix
@@ -1,15 +1,21 @@
 {
   lib,
   buildPythonPackage,
-  dask,
-  fetchPypi,
-  numba,
-  numpy,
-  pytest7CheckHook,
-  pythonOlder,
+  fetchFromGitHub,
+
+  # build-system
   setuptools,
   setuptools-scm,
+
+  # dependencies
+  numba,
+  numpy,
   scipy,
+
+  # tests
+  dask,
+  pytest-cov-stub,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -17,18 +23,13 @@ buildPythonPackage rec {
   version = "0.15.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-THbODJb1zVwxt+eeZQ8AIkJMKxbwXxAEnpxjge5L4mY=";
+  src = fetchFromGitHub {
+    owner = "pydata";
+    repo = "sparse";
+    tag = version;
+    hash = "sha256-W4rcq7G/bQsT9oTLieOzWNst5LnIAelRMbm+uUPeQgs=";
   };
 
-  postPatch = ''
-    substituteInPlace pytest.ini \
-      --replace-fail "--cov-report term-missing --cov-report html --cov-report=xml --cov-report=term --cov sparse --cov-config .coveragerc --junitxml=junit/test-results.xml" ""
-  '';
-
   build-system = [
     setuptools
     setuptools-scm
@@ -42,23 +43,23 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     dask
-    pytest7CheckHook
+    pytest-cov-stub
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [ "sparse" ];
 
-  pytestFlagsArray = [
-    "-W"
-    "ignore::pytest.PytestRemovedIn8Warning"
-  ];
-
-  meta = with lib; {
+  meta = {
     description = "Sparse n-dimensional arrays computations";
     homepage = "https://sparse.pydata.org/";
     changelog = "https://sparse.pydata.org/en/stable/changelog.html";
     downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}";
-    license = licenses.bsd3;
-    maintainers = [ ];
-    maintainers = with maintainers; [ GaetanLepage ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+    badPlatforms = [
+      # Most tests fail with: Fatal Python error: Segmentation fault
+      # numba/typed/typedlist.py", line 344 in append
+      "aarch64-linux"
+    ];
   };
 }

From e6ea345642291962533b3fbccb27dd63ace175c9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 16:27:40 +0100
Subject: [PATCH 28/75] python312Packages.devito: fix build

---
 .../python-modules/devito/default.nix         | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix
index 4c9ee562011f..a69ae736a22a 100644
--- a/pkgs/development/python-modules/devito/default.nix
+++ b/pkgs/development/python-modules/devito/default.nix
@@ -1,27 +1,32 @@
 {
   lib,
   stdenv,
-  anytree,
   buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
   setuptools,
+
+  # dependencies
+  anytree,
   cached-property,
   cgen,
   click,
   codepy,
   distributed,
-  fetchFromGitHub,
-  gcc,
   llvmPackages,
-  matplotlib,
   multidict,
   nbval,
   psutil,
   py-cpuinfo,
-  pytest-xdist,
-  pytestCheckHook,
-  pythonOlder,
   scipy,
   sympy,
+
+  # tests
+  gcc,
+  matplotlib,
+  pytest-xdist,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -29,8 +34,6 @@ buildPythonPackage rec {
   version = "4.8.11";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "devitocodes";
     repo = "devito";
@@ -42,6 +45,9 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace requirements-testing.txt \
       --replace-fail 'pooch; python_version >= "3.8"' "pooch"
+
+    substituteInPlace tests/test_builtins.py \
+      --replace-fail "from scipy.misc import ascent" "from scipy.datasets import ascent"
   '';
 
   pythonRemoveDeps = [ "pip" ];
@@ -99,6 +105,10 @@ buildPythonPackage rec {
       "test_stability_mpi"
       "test_subdomainset_mpi"
       "test_subdomains_mpi"
+
+      # Download dataset from the internet
+      "test_gs_2d_float"
+      "test_gs_2d_int"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
       # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False

From d506ad7f5c0fadd3994c2895ebb68ed4aba61856 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Feb 2025 17:59:30 +0100
Subject: [PATCH 29/75] python312Packages.catboost: mark as broken

---
 pkgs/development/python-modules/catboost/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix
index d0fc77b70038..86c1211aead0 100644
--- a/pkgs/development/python-modules/catboost/default.nix
+++ b/pkgs/development/python-modules/catboost/default.nix
@@ -22,8 +22,8 @@ buildPythonPackage rec {
     pname
     version
     src
-    meta
     ;
+
   pyproject = true;
 
   sourceRoot = "${src.name}/catboost/python-package";
@@ -55,4 +55,9 @@ buildPythonPackage rec {
   doCheck = false;
 
   pythonImportsCheck = [ "catboost" ];
+
+  meta = catboost.meta // {
+    # Incompatible with numpy >= 2.0
+    broken = true;
+  };
 }

From cdbaefe74329ed3587d686720e5de04919306292 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 8 Feb 2025 11:49:04 +0100
Subject: [PATCH 30/75] python312Packages.dask-ml: 2024.4.4 -> 2025.1.0

Diff: https://github.com/dask/dask-ml/compare/refs/tags/v2024.4.4...v2025.1.0
---
 .../python-modules/dask-ml/default.nix        | 46 ++++---------------
 1 file changed, 9 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix
index e3949fde678b..f30adb7ff246 100644
--- a/pkgs/development/python-modules/dask-ml/default.nix
+++ b/pkgs/development/python-modules/dask-ml/default.nix
@@ -3,14 +3,13 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   hatch-vcs,
   hatchling,
-  setuptools-scm,
 
   # dependencies
-  dask-expr,
   dask-glm,
   distributed,
   multipledispatch,
@@ -29,25 +28,23 @@
 
 buildPythonPackage rec {
   pname = "dask-ml";
-  version = "2024.4.4";
+  version = "2025.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-ml";
     tag = "v${version}";
-    hash = "sha256-ZiBpCk3b4Tk0Hwb4uapJLEx+Nb/qHFROCnkBTNGDzoU=";
+    hash = "sha256-DHxx0LFuJmGWYuG/WGHj+a5XHAEekBmlHUUb90rl2IY=";
   };
 
   build-system = [
     hatch-vcs
     hatchling
-    setuptools-scm
   ];
 
   dependencies =
     [
-      dask-expr
       dask-glm
       distributed
       multipledispatch
@@ -73,39 +70,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTestPaths =
-    [
-      # AttributeError: 'csr_matrix' object has no attribute 'A'
-      # Fixed in https://github.com/dask/dask-ml/pull/996
-      "tests/test_svd.py"
-
-      # Tests fail with dask>=0.11.2
-      # RuntimeError: Not enough arguments provided
-      # Reported in https://github.com/dask/dask-ml/issues/1003
-      "tests/model_selection/test_incremental.py"
-    ]
-    ++ lib.optionals stdenv.isDarwin [
-      # RuntimeError: Not enough arguments provided: missing keys
-      "tests/model_selection/test_hyperband.py"
-      "tests/model_selection/test_incremental.py"
-      "tests/model_selection/test_incremental_warns.py"
-      "tests/model_selection/test_successive_halving.py"
-    ];
+  disabledTestPaths = [
+    # AttributeError: module 'numpy' has no attribute 'product'
+    "tests/test_svd.py"
+  ];
 
   disabledTests = [
-    # Flaky: `Arrays are not almost equal to 3 decimals` (although values do actually match)
-    "test_whitening"
-
-    # Tests fail with dask>=0.11.2
-    # RuntimeError: Not enough arguments provided
-    # Reported in https://github.com/dask/dask-ml/issues/1003
-    "test_basic"
-    "test_hyperband_patience"
-    "test_same_random_state_same_params"
-    "test_search_patience_infeasible_tol"
-    "test_sha_max_iter_and_metadata"
-    "test_warns_decay_rate"
-    "test_warns_decay_rate_wanted"
+    # AssertionError: Regex pattern did not match.
+    "test_unknown_category_transform_array"
   ];
 
   __darwinAllowLocalNetworking = true;

From 64249c9b7d2d80d7983a1efc382b3a53b6a9ae6b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 8 Feb 2025 21:52:02 +0100
Subject: [PATCH 31/75] python312Packages.dask-histogram: 2024.12.1 -> 2025.2.0

Diff: https://github.com/dask-contrib/dask-histogram/compare/refs/tags/2024.12.1...2025.2.0

Changelog: https://github.com/dask-contrib/dask-histogram/releases/tag/2025.2.0
---
 .../development/python-modules/dask-histogram/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix
index fc6af4c39c6b..98692269069d 100644
--- a/pkgs/development/python-modules/dask-histogram/default.nix
+++ b/pkgs/development/python-modules/dask-histogram/default.nix
@@ -10,6 +10,7 @@
   # dependencies
   boost-histogram,
   dask,
+  dask-awkward,
 
   # tests
   pytestCheckHook,
@@ -17,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "dask-histogram";
-  version = "2024.12.1";
+  version = "2025.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask-contrib";
     repo = "dask-histogram";
     tag = version;
-    hash = "sha256-chznfEsMFuIioIlTz6uNpVAkjMMoMXjS62R4luKxVZQ=";
+    hash = "sha256-5Ec/qzVc/7LDG6SJym1e76BbxmbVjKKQHckwtTs1+6M=";
   };
 
   build-system = [
@@ -35,6 +36,7 @@ buildPythonPackage rec {
   dependencies = [
     boost-histogram
     dask
+    dask-awkward
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
@@ -44,7 +46,7 @@ buildPythonPackage rec {
   meta = {
     description = "Histograms with task scheduling";
     homepage = "https://dask-histogram.readthedocs.io/";
-    changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${src.tag}";
+    changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${version}";
     license = with lib.licenses; [ bsd3 ];
     maintainers = with lib.maintainers; [ veprbl ];
   };

From cb32a8ad1cba105da078243a973927f194e4f821 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 8 Feb 2025 21:54:54 +0100
Subject: [PATCH 32/75] python312Packages.dask-awkward: 2024.12.2 -> 2025.2.0

Diff: https://github.com/dask-contrib/dask-awkward/compare/refs/tags/2024.12.2...2025.2.0

Changelog: https://github.com/dask-contrib/dask-awkward/releases/tag/2025.2.0
---
 .../python-modules/dask-awkward/default.nix          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix
index a0d8b63fe06a..8031a140ffbf 100644
--- a/pkgs/development/python-modules/dask-awkward/default.nix
+++ b/pkgs/development/python-modules/dask-awkward/default.nix
@@ -16,7 +16,7 @@
   # optional-dependencies
   pyarrow,
 
-  # checks
+  # tests
   dask-histogram,
   distributed,
   hist,
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "dask-awkward";
-  version = "2024.12.2";
+  version = "2025.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask-contrib";
     repo = "dask-awkward";
     tag = version;
-    hash = "sha256-pL1LDW/q78V/c3Bha38k40018MFO+i8X6htYNdcsy7s=";
+    hash = "sha256-hhAY2cPUOYnP86FGsLvxlMeoEwY+sTrjPMKyuZrO0/M=";
   };
 
   build-system = [
@@ -53,8 +53,8 @@ buildPythonPackage rec {
     io = [ pyarrow ];
   };
 
-  checkInputs = [
-    dask-histogram
+  nativeCheckInputs = [
+    # dask-histogram (circular dependency)
     distributed
     hist
     pandas
@@ -86,7 +86,7 @@ buildPythonPackage rec {
   meta = {
     description = "Native Dask collection for awkward arrays, and the library to use it";
     homepage = "https://github.com/dask-contrib/dask-awkward";
-    changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${src.tag}";
+    changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${version}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
   };

From 3af88eb4248b0a96e82a307ab0104e45a5d01d82 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 8 Feb 2025 21:59:59 +0100
Subject: [PATCH 33/75] python312Packages.awkward-cpp: 43 -> 44

---
 pkgs/development/python-modules/awkward-cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix
index 0063cd3f851f..ce96b50ca49b 100644
--- a/pkgs/development/python-modules/awkward-cpp/default.nix
+++ b/pkgs/development/python-modules/awkward-cpp/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "awkward-cpp";
-  version = "43";
+  version = "44";
   pyproject = true;
 
   src = fetchPypi {
     pname = "awkward_cpp";
     inherit version;
-    hash = "sha256-we11WW7IKvZm2ghLW/gF2bcsg1MtA10rZeB5WQXSXq0=";
+    hash = "sha256-jcSZKI1tFrLqILUaJ9UEflGiR7aqz8vLOzAsrW08h9g=";
   };
 
   build-system = [

From 5de8457c08fdaf5ba12e2d1bab418c5c6c5f5114 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 8 Feb 2025 21:58:04 +0100
Subject: [PATCH 34/75] python312Packages.awkward: 2.7.2 -> 2.7.4

Diff: https://github.com/scikit-hep/awkward/compare/refs/tags/v2.7.2...v2.7.4

Changelog: https://github.com/scikit-hep/awkward/releases/tag/v2.7.4
---
 .../python-modules/awkward/default.nix        | 51 +++++++++++--------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index 8722a72cf635..6124a408e605 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -13,29 +13,27 @@
   fsspec,
   numpy,
   packaging,
-  typing-extensions,
-  importlib-metadata,
 
-  # checks
+  # tests
   numba,
-  setuptools,
   numexpr,
   pandas,
   pyarrow,
   pytest-xdist,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "2.7.2";
+  version = "2.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "awkward";
     tag = "v${version}";
-    hash = "sha256-nOKMwAQ5t8tc64bEKz0j8JxxoVQQu39Iu8Zr9cqSx7A=";
+    hash = "sha256-OXSl+8sfrx+JlLu40wHf+98WVNNwm9uxvsnGXRDztDg=";
   };
 
   build-system = [
@@ -43,15 +41,12 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  dependencies =
-    [
-      awkward-cpp
-      fsspec
-      numpy
-      packaging
-    ]
-    ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
-    ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ];
+  dependencies = [
+    awkward-cpp
+    fsspec
+    numpy
+    packaging
+  ];
 
   dontUseCmakeConfigure = true;
 
@@ -60,19 +55,35 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     fsspec
     numba
-    setuptools
     numexpr
     pandas
     pyarrow
     pytest-xdist
     pytestCheckHook
+    setuptools
   ];
 
-  disabledTestPaths = [
-    # Need to be run on a GPU platform.
-    "tests-cuda"
+  disabledTests = [
+    # pyarrow.lib.ArrowInvalid
+    "test_recordarray"
   ];
 
+  disabledTestPaths =
+    [
+      # Need to be run on a GPU platform.
+      "tests-cuda"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+      # Fatal Python error: Segmentation fault at:
+      # numba/typed/typedlist.py", line 344 in append
+      "tests/test_0118_numba_cpointers.py"
+      "tests/test_0397_arrays_as_constants_in_numba.py"
+      "tests/test_1677_array_builder_in_numba.py"
+      "tests/test_2055_array_builder_check.py"
+      "tests/test_2349_growablebuffer_in_numba.py"
+      "tests/test_2408_layoutbuilder_in_numba.py"
+    ];
+
   meta = {
     description = "Manipulate JSON-like data with NumPy-like idioms";
     homepage = "https://github.com/scikit-hep/awkward";

From 8d23cded07fe77e45db1ada00ff3a3bbda2b51ae Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 8 Feb 2025 22:08:22 +0100
Subject: [PATCH 35/75] python312Packages.mplhep: 0.3.55 -> 0.3.56

Diff: https://github.com/scikit-hep/mplhep/compare/refs/tags/v0.3.55...v0.3.56
---
 .../python-modules/mplhep/default.nix         | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix
index 604eea8a8489..a5c167aa603f 100644
--- a/pkgs/development/python-modules/mplhep/default.nix
+++ b/pkgs/development/python-modules/mplhep/default.nix
@@ -2,36 +2,42 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
-  setuptools-scm,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
   matplotlib,
   mplhep-data,
   numpy,
   packaging,
   uhi,
+
+  # tests
+  hist,
+  pytest-mock,
+  pytest-mpl,
   pytestCheckHook,
   scipy,
-  pytest-mpl,
-  pytest-mock,
   uproot,
-  hist,
 }:
 
 buildPythonPackage rec {
   pname = "mplhep";
-  version = "0.3.55";
+  version = "0.3.56";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "mplhep";
     tag = "v${version}";
-    hash = "sha256-7YkrrH9Bfn3ctjv+H6TXEDE8yS/wnjO7umuHIXeYTDU=";
+    hash = "sha256-sMJpJUEtIqmu7kCgZp43t9XLy/6nkDgKcxC4nFb+1po=";
   };
 
   build-system = [
-    setuptools
-    setuptools-scm
+    hatch-vcs
+    hatchling
   ];
 
   dependencies = [
@@ -43,12 +49,12 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    hist
+    pytest-mock
+    pytest-mpl
     pytestCheckHook
     scipy
-    pytest-mpl
-    pytest-mock
     uproot
-    hist
   ];
 
   disabledTests = [
@@ -62,6 +68,7 @@ buildPythonPackage rec {
   meta = {
     description = "Extended histogram plots on top of matplotlib and HEP compatible styling similar to current collaboration requirements (ROOT)";
     homepage = "https://github.com/scikit-hep/mplhep";
+    changelog = "https://github.com/scikit-hep/mplhep/releases/tag/v${version}";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ veprbl ];
   };

From 5b73ca5a0c6930c157c36983ed4fd54bc90fd5f7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 8 Feb 2025 22:15:52 +0100
Subject: [PATCH 36/75] python312Packages.coffea: fix build

---
 pkgs/development/python-modules/coffea/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix
index 5e61b17c5c2d..0710ca0f5dba 100644
--- a/pkgs/development/python-modules/coffea/default.nix
+++ b/pkgs/development/python-modules/coffea/default.nix
@@ -57,6 +57,10 @@ buildPythonPackage rec {
     hatch-vcs
   ];
 
+  pythonRelaxDeps = [
+    "dask"
+  ];
+
   dependencies = [
     aiohttp
     awkward
@@ -106,6 +110,10 @@ buildPythonPackage rec {
     # AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array
     "test_apply_to_fileset"
     "test_lorentz_behavior"
+
+    # ValueError: The array to mask was deleted before it could be masked.
+    # If you want to construct this mask, you must either keep the array alive or use 'ak.mask' explicitly.
+    "test_read_nanomc"
   ];
 
   __darwinAllowLocalNetworking = true;

From ff787004396499583498584e78d705f1f820b592 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 9 Feb 2025 12:28:47 +0100
Subject: [PATCH 37/75] python312Packages.dask-image: fix build

---
 .../python-modules/dask-image/default.nix     | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix
index a297902bc684..599e99853ad8 100644
--- a/pkgs/development/python-modules/dask-image/default.nix
+++ b/pkgs/development/python-modules/dask-image/default.nix
@@ -1,15 +1,21 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
   setuptools-scm,
+
+  # dependencies
   dask,
   numpy,
   scipy,
   pandas,
   pims,
+
+  # tests
+  pyarrow,
   pytestCheckHook,
   scikit-image,
 }:
@@ -19,8 +25,6 @@ buildPythonPackage rec {
   version = "2024.5.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-image";
@@ -28,6 +32,11 @@ buildPythonPackage rec {
     hash = "sha256-kXCAqJ2Zgo/2Khvo2YcK+n4oGM219GyQ2Hsq9re1Lac=";
   };
 
+  postPatch = ''
+    substituteInPlace dask_image/ndinterp/__init__.py \
+      --replace-fail "out_bounds.ptp(axis=1)" "np.ptp(out_bounds, axis=1)"
+  '';
+
   build-system = [
     setuptools
     setuptools-scm
@@ -42,15 +51,27 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    pyarrow
     pytestCheckHook
     scikit-image
   ];
 
   pythonImportsCheck = [ "dask_image" ];
 
+  disabledTests = [
+    # The following tests are from 'tests/test_dask_image/test_ndmeasure/test_find_objects.py' and
+    # fail because of errrors on numpy slices
+    # AttributeError: 'str' object has no attribute 'start'
+    "test_find_objects"
+    "test_3d_find_objects"
+    # AssertionError (comparing slices)
+    "test_find_objects_with_empty_chunks"
+  ];
+
   meta = {
     description = "Distributed image processing";
     homepage = "https://github.com/dask/dask-image";
+    changelog = "https://github.com/dask/dask-image/releases/tag/v${version}";
     license = lib.licenses.bsdOriginal;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };

From 0a07262b0f60dd0a1b87474610eba4b6306918a9 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 24 Jan 2025 11:27:49 +0100
Subject: [PATCH 38/75] lomiri.lomiri-music-app: init at 3.2.2

---
 .../applications/lomiri-music-app/default.nix | 122 ++++++++++++++++++
 pkgs/desktops/lomiri/default.nix              |   1 +
 2 files changed, 123 insertions(+)
 create mode 100644 pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix

diff --git a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
new file mode 100644
index 000000000000..23551fc2dc93
--- /dev/null
+++ b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
@@ -0,0 +1,122 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  fetchpatch,
+  gitUpdater,
+  cmake,
+  gettext,
+  gst_all_1,
+  libusermetrics,
+  lomiri-content-hub,
+  lomiri-thumbnailer,
+  lomiri-ui-toolkit,
+  qtbase,
+  qtdeclarative,
+  qtmultimedia,
+  qtsystems,
+  wrapGAppsHook3,
+  wrapQtAppsHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "lomiri-music-app";
+  version = "3.2.2";
+
+  src = fetchFromGitLab {
+    owner = "ubports";
+    repo = "development/apps/lomiri-music-app";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-tHCbZF+7i/gYs8WqM5jDBhhKmM4ZeUbG3DYBdQAiUT8=";
+  };
+
+  patches = [
+    # Remove when version > 3.2.2
+    (fetchpatch {
+      name = "0001-lomiri-music-app-Fix-GNUInstallDirs-usage.patch";
+      url = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/commit/32591f2332aa204b9ee2857992e50594db0e6ff2.patch";
+      hash = "sha256-SXn+7jItzi1Q0xK0iK57+W3SpEdSCx1dKSfeghOCePg=";
+    })
+
+    # Remove when version > 3.2.2
+    (fetchpatch {
+      name = "0002-lomiri-music-app-bindtextdomain.patch";
+      url = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/commit/4e950521a67e201f3d02b3b71c6bb1ddce8ef2b2.patch";
+      hash = "sha256-HgGKk44FU+IXRVx2NK3iGSo/wPJce1T2k/vP8nZtewQ=";
+    })
+  ];
+
+  postPatch = ''
+    # We don't want absolute paths in desktop files
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'ICON ''${DATA_DIR}/''${ICON_FILE}' 'ICON lomiri-music-app' \
+      --replace-fail 'SPLASH ''${DATA_DIR}/''${SPLASH_FILE}' 'SPLASH lomiri-app-launch/splash/lomiri-music-app.svg'
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    gettext
+    wrapGAppsHook3
+    wrapQtAppsHook
+  ];
+
+  buildInputs =
+    [
+      qtbase
+      qtdeclarative
+
+      # QML
+      libusermetrics
+      lomiri-content-hub
+      lomiri-thumbnailer
+      lomiri-ui-toolkit
+      qtmultimedia
+      qtsystems
+    ]
+    # QtMultimedia playback support
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-bad
+    ]);
+
+  dontWrapGApps = true;
+
+  cmakeFlags = [
+    (lib.cmakeBool "CLICK_MODE" false)
+    (lib.cmakeBool "INSTALL_TESTS" false)
+  ];
+
+  # Only autopilot tests
+  doCheck = false;
+
+  postInstall = ''
+    mkdir -p $out/share/{icons/hicolor/scalable/apps,lomiri-app-launch/splash}
+
+    ln -s $out/share/{lomiri-music-app/app/graphics/music-app.svg,icons/hicolor/scalable/apps/lomiri-music-app.svg}
+    ln -s $out/share/{lomiri-music-app/app/graphics/music-app-splash.svg,lomiri-app-launch/splash/lomiri-music-app.svg}
+  '';
+
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  passthru = {
+    updateScript = gitUpdater { };
+  };
+
+  meta = {
+    description = "Default Music application for Ubuntu devices";
+    homepage = "https://gitlab.com/ubports/development/apps/lomiri-music-app";
+    changelog = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/blob/v${finalAttrs.version}/ChangeLog";
+    license = with lib.licenses; [
+      gpl3Only
+    ];
+    mainProgram = "lomiri-music-app";
+    maintainers = lib.teams.lomiri.members;
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index bd26af310969..483eacaeb58a 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -21,6 +21,7 @@ let
       lomiri-filemanager-app = callPackage ./applications/lomiri-filemanager-app { };
       lomiri-gallery-app = callPackage ./applications/lomiri-gallery-app { };
       lomiri-mediaplayer-app = callPackage ./applications/lomiri-mediaplayer-app { };
+      lomiri-music-app = callPackage ./applications/lomiri-music-app { };
       lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { };
       lomiri-system-settings = callPackage ./applications/lomiri-system-settings/wrapper.nix { };
       lomiri-terminal-app = callPackage ./applications/lomiri-terminal-app { };

From bc7133b8764d3ec0f4e34043bfcbbaff74149420 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 15 Dec 2024 14:37:22 +0100
Subject: [PATCH 39/75] nixos/lomiri: Fix mediascanner2 service

---
 .../services/desktop-managers/lomiri.nix      | 63 ++++++++++++-------
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index 8f04e33291ac..5c5cca1bc330 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -198,37 +198,54 @@ in
         "/share/sounds"
       ];
 
-      systemd.user.services = {
-        # Unconditionally run service that collects system-installed URL handlers before LUD
-        # TODO also run user-installed one?
-        "lomiri-url-dispatcher-update-system-dir" = {
-          description = "Lomiri URL dispatcher system directory updater";
-          wantedBy = [ "lomiri-url-dispatcher.service" ];
-          before = [ "lomiri-url-dispatcher.service" ];
-          serviceConfig = {
-            Type = "oneshot";
-            ExecStart = "${pkgs.lomiri.lomiri-url-dispatcher}/libexec/lomiri-url-dispatcher/lomiri-update-directory /run/current-system/sw/share/lomiri-url-dispatcher/urls/";
-          };
-        };
-
-        "lomiri-polkit-agent" = rec {
-          description = "Lomiri Polkit agent";
-          wantedBy = [
+      systemd.user.services =
+        let
+          lomiriServiceNames = [
             "lomiri.service"
             "lomiri-full-greeter.service"
             "lomiri-full-shell.service"
             "lomiri-greeter.service"
             "lomiri-shell.service"
           ];
-          after = [ "graphical-session.target" ];
-          partOf = wantedBy;
-          serviceConfig = {
-            Type = "simple";
-            Restart = "always";
-            ExecStart = "${pkgs.lomiri.lomiri-polkit-agent}/libexec/lomiri-polkit-agent/policykit-agent";
+        in
+        {
+          # Unconditionally run service that collects system-installed URL handlers before LUD
+          # TODO also run user-installed one?
+          "lomiri-url-dispatcher-update-system-dir" = {
+            description = "Lomiri URL dispatcher system directory updater";
+            wantedBy = [ "lomiri-url-dispatcher.service" ];
+            before = [ "lomiri-url-dispatcher.service" ];
+            serviceConfig = {
+              Type = "oneshot";
+              ExecStart = "${pkgs.lomiri.lomiri-url-dispatcher}/libexec/lomiri-url-dispatcher/lomiri-update-directory /run/current-system/sw/share/lomiri-url-dispatcher/urls/";
+            };
+          };
+
+          "lomiri-polkit-agent" = {
+            description = "Lomiri Polkit agent";
+            wantedBy = lomiriServiceNames;
+            after = [ "graphical-session.target" ];
+            partOf = lomiriServiceNames;
+            serviceConfig = {
+              Type = "simple";
+              Restart = "always";
+              ExecStart = "${pkgs.lomiri.lomiri-polkit-agent}/libexec/lomiri-polkit-agent/policykit-agent";
+            };
+          };
+
+          "mediascanner-2.0" = {
+            description = "Media Scanner";
+            wantedBy = lomiriServiceNames;
+            before = lomiriServiceNames;
+            partOf = lomiriServiceNames;
+            serviceConfig = {
+              Type = "dbus";
+              BusName = "com.lomiri.MediaScanner2.Daemon";
+              Restart = "on-failure";
+              ExecStart = "${lib.getExe pkgs.lomiri.mediascanner2}";
+            };
           };
         };
-      };
 
       systemd.services = {
         "dbus-com.lomiri.UserMetrics" = {

From 6fd46df8a62f13d174ab39a86ee3f05383216fd8 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 15 Dec 2024 14:37:52 +0100
Subject: [PATCH 40/75] nixos/lomiri: Add music app

---
 nixos/modules/services/desktop-managers/lomiri.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index 5c5cca1bc330..638c1ef9bfcc 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -95,6 +95,7 @@ in
             lomiri-gallery-app
             lomiri-history-service
             lomiri-mediaplayer-app
+            lomiri-music-app
             lomiri-polkit-agent
             lomiri-schemas # exposes some required dbus interfaces
             lomiri-session # wrappers to properly launch the session

From 4b3bdd486aac8dd3494dd4ff8736fcf7f6e56e12 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 16 Dec 2024 22:50:04 +0100
Subject: [PATCH 41/75] lomiri.lomiri-session: Force xdg-user-dirs-update to be
 run

mediascanner2 expects xdg-user-dirs to be set up properly, otherwise its g_get_user_special_dir() calls fail.

Lomiri, by itself, doesn't seem to ensure this by default, so hack in a call of this.
---
 pkgs/desktops/lomiri/data/lomiri-session/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/pkgs/desktops/lomiri/data/lomiri-session/default.nix
index 960fb2794c84..fdc7b90ad875 100644
--- a/pkgs/desktops/lomiri/data/lomiri-session/default.nix
+++ b/pkgs/desktops/lomiri/data/lomiri-session/default.nix
@@ -13,6 +13,7 @@
   makeWrapper,
   pkg-config,
   systemd,
+  xdg-user-dirs,
 }:
 
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -34,6 +35,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     substituteInPlace systemd/CMakeLists.txt \
       --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'
+
+    # Inject a call to xdg-user-dirs-update, so when mediascanner2 launches, it can actually scan for files
+    substituteInPlace desktop/dm-lomiri-session.in \
+      --replace-fail '@CMAKE_INSTALL_FULL_LIBEXECDIR@/lomiri-session/run-systemd-session' '${lib.getExe' xdg-user-dirs "xdg-user-dirs-update"} && @CMAKE_INSTALL_FULL_LIBEXECDIR@/lomiri-session/run-systemd-session'
   '';
 
   nativeBuildInputs = [

From c4c8c1181fdab6ece6f74dfeccf6f65a3a95d829 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 9 Feb 2025 15:39:44 +0100
Subject: [PATCH 42/75] nixosTests.lomiri-music-app: init

---
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/lomiri-music-app.nix              | 193 ++++++++++++++++++
 .../applications/lomiri-music-app/default.nix |   2 +
 .../services/lomiri-thumbnailer/default.nix   |   6 +-
 .../lomiri/services/mediascanner2/default.nix |   8 +-
 5 files changed, 208 insertions(+), 2 deletions(-)
 create mode 100644 nixos/tests/lomiri-music-app.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index cb7f599eb6ea..24d6e0725f2a 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -569,6 +569,7 @@ in {
   lomiri-docviewer-app = runTest ./lomiri-docviewer-app.nix;
   lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix;
   lomiri-mediaplayer-app = runTest ./lomiri-mediaplayer-app.nix;
+  lomiri-music-app = runTest ./lomiri-music-app.nix;
   lomiri-gallery-app = runTest ./lomiri-gallery-app.nix;
   lomiri-system-settings = handleTest ./lomiri-system-settings.nix {};
   lorri = handleTest ./lorri/default.nix {};
diff --git a/nixos/tests/lomiri-music-app.nix b/nixos/tests/lomiri-music-app.nix
new file mode 100644
index 000000000000..93a3889c9127
--- /dev/null
+++ b/nixos/tests/lomiri-music-app.nix
@@ -0,0 +1,193 @@
+{ lib, ... }:
+let
+  ocrContent = "Music Test";
+  musicFile = "test.mp3";
+
+  ocrPauseColor = "#FF00FF";
+  ocrStartColor = "#00FFFF";
+in
+{
+  name = "lomiri-music-app-standalone";
+  meta = {
+    maintainers = lib.teams.lomiri.members;
+    # This needs a Linux VM
+    platforms = lib.platforms.linux;
+  };
+
+  nodes.machine =
+    { config, pkgs, ... }:
+    {
+      imports = [
+        ./common/auto.nix
+        ./common/user-account.nix
+        ./common/x11.nix
+      ];
+
+      services.xserver.enable = true;
+
+      environment = {
+        # Setup video
+        etc."${musicFile}".source =
+          pkgs.runCommand musicFile
+            {
+              nativeBuildInputs = with pkgs; [
+                ffmpeg # produce music
+                (imagemagick.override { ghostscriptSupport = true; }) # produce OCR-able cover image
+              ];
+            }
+            ''
+              magick -size 400x400 canvas:white -pointsize 40 -fill black -annotate +100+100 '${ocrContent}' output.png
+              ffmpeg -re \
+                -f lavfi -i anullsrc=channel_layout=mono:sample_rate=44100 \
+                -i output.png \
+                -map 0:0 -map 1:0 \
+                -id3v2_version 3 \
+                -metadata:s:v title="Album cover" \
+                -metadata:s:v comment="Cover (front)" \
+                -t 120 \
+                $out -loglevel fatal
+            '';
+
+        systemPackages =
+          with pkgs;
+          [
+            xdg-user-dirs # generate XDG dirs
+            xdotool # mouse movement
+          ]
+          ++ (with pkgs.lomiri; [
+            mediascanner2
+            lomiri-music-app
+            lomiri-thumbnailer
+            # To check if playback actually works, or is broken due to missing codecs, we need to make the app's icons more OCR-able
+            (lib.meta.hiPrio (
+              suru-icon-theme.overrideAttrs (oa: {
+                # Colour the background in special colours, which we can OCR for
+                postPatch =
+                  (oa.postPatch or "")
+                  + ''
+                    substituteInPlace suru/actions/scalable/media-playback-pause.svg \
+                      --replace-fail 'fill:none' 'fill:${ocrPauseColor}'
+
+                    substituteInPlace suru/actions/scalable/media-playback-start.svg \
+                      --replace-fail 'fill:none' 'fill:${ocrStartColor}'
+                  '';
+              })
+            ))
+          ]);
+
+        variables = {
+          UITK_ICON_THEME = "suru";
+        };
+      };
+
+      # Get mediascanner-2.0.service
+      services.desktopManager.lomiri.enable = lib.mkForce true;
+
+      # ...but stick with icewm
+      services.displayManager.defaultSession = lib.mkForce "none+icewm";
+
+      systemd.tmpfiles.settings = {
+        "10-lomiri-music-app-test-setup" = {
+          "/root/Music".d = {
+            mode = "0755";
+            user = "root";
+            group = "root";
+          };
+          "/root/Music/${musicFile}"."C+".argument = "/etc/${musicFile}";
+        };
+      };
+
+      i18n.supportedLocales = [ "all" ];
+    };
+
+  enableOCR = true;
+
+  testScript = ''
+    from collections.abc import Callable
+    import tempfile
+    import subprocess
+
+    pauseColor: str = "${ocrPauseColor}"
+    startColor: str = "${ocrStartColor}"
+
+    # Based on terminal-emulators.nix' check_for_pink
+    def check_for_color(color: str) -> Callable[[bool], bool]:
+        def check_for_color_retry(final=False) -> bool:
+            with tempfile.NamedTemporaryFile() as tmpin:
+                machine.send_monitor_command("screendump {}".format(tmpin.name))
+
+                cmd = 'convert {} -define histogram:unique-colors=true -format "%c" histogram:info:'.format(
+                    tmpin.name
+                )
+                ret = subprocess.run(cmd, shell=True, capture_output=True)
+                if ret.returncode != 0:
+                    raise Exception(
+                        "image analysis failed with exit code {}".format(ret.returncode)
+                    )
+
+                text = ret.stdout.decode("utf-8")
+                return color in text
+
+        return check_for_color_retry
+
+    machine.wait_for_x()
+
+    # mediascanner2 needs XDG dirs to exist
+    machine.succeed("xdg-user-dirs-update")
+
+    # mediascanner2 needs to have run, is only started automatically by Lomiri
+    machine.systemctl("start mediascanner-2.0.service", "root")
+
+    with subtest("lomiri music launches"):
+        machine.succeed("lomiri-music-app >&2 &")
+        machine.wait_for_text("favorite music")
+        machine.send_key("alt-f10")
+        machine.screenshot("lomiri-music")
+
+    with subtest("lomiri music plays music"):
+        machine.succeed("xdotool mousemove 30 720 click 1") # Skip intro
+        machine.wait_for_text("Albums")
+        machine.succeed("xdotool mousemove 25 45 click 1") # Open categories
+        machine.wait_for_text("Tracks")
+        machine.succeed("xdotool mousemove 25 240 click 1") # Switch to Tracks category
+        machine.wait_for_text("test") # the test file
+        machine.screenshot("lomiri-music_listing")
+
+        # Ensure pause colours isn't present already
+        assert (
+            check_for_color(pauseColor)(True) == False
+        ), "pauseColor {} was present on the screen before we selected anything!".format(pauseColor)
+
+        machine.succeed("xdotool mousemove 25 120 click 1") # Select the track
+
+        # Waiting for pause icon to be displayed
+        with machine.nested("Waiting for the screen to have pauseColor {} on it:".format(pauseColor)):
+            retry(check_for_color(pauseColor))
+
+        machine.screenshot("lomiri-music_playback")
+
+        # Ensure play colours isn't present already
+        assert (
+            check_for_color(startColor)(True) == False
+        ), "startColor {} was present on the screen before we were expecting it to be!".format(startColor)
+
+        machine.succeed("xdotool mousemove 860 480 click 1") # Pause track (only works if app can actually decode the file)
+
+        # Waiting for play icon to be displayed
+        with machine.nested("Waiting for the screen to have startColor {} on it:".format(startColor)):
+            retry(check_for_color(startColor))
+
+        machine.screenshot("lomiri-music_paused")
+
+        # Lastly, check if generated cover image got extracted properly
+        # if not, indicates an issue with mediascanner / lomiri-thumbnailer
+        machine.wait_for_text("${ocrContent}")
+
+    machine.succeed("pkill -f lomiri-music-app")
+
+    with subtest("lomiri music localisation works"):
+        machine.succeed("env LANG=de_DE.UTF-8 lomiri-music-app .mp4 >&2 &")
+        machine.wait_for_text("Titel")
+        machine.screenshot("lomiri-music_localised")
+  '';
+}
diff --git a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
index 23551fc2dc93..f3688b33d9e3 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitLab,
   fetchpatch,
   gitUpdater,
+  nixosTests,
   cmake,
   gettext,
   gst_all_1,
@@ -105,6 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
+    tests.vm = nixosTests.lomiri-music-app;
     updateScript = gitUpdater { };
   };
 
diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
index 925f5592c34d..a9cb0b7da1d9 100644
--- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix
@@ -176,7 +176,11 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     tests = {
       # gallery app delegates to thumbnailer, tests various formats
-      vm = nixosTests.lomiri-gallery-app;
+      gallery-app = nixosTests.lomiri-gallery-app;
+
+      # music app relies on thumbnailer to extract embedded cover art
+      music-app = nixosTests.lomiri-music-app;
+
       pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
     };
     updateScript = gitUpdater { };
diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index 0401e42ca78a..a6dafcc45fd1 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -3,6 +3,7 @@
   lib,
   fetchFromGitLab,
   gitUpdater,
+  nixosTests,
   testers,
   # dbus-cpp not compatible with Boost 1.87
   # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8
@@ -101,7 +102,12 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    tests = {
+      # music app needs mediascanner to work properly, so it can find files
+      music-app = nixosTests.lomiri-music-app;
+
+      pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+    };
     updateScript = gitUpdater { };
   };
 

From fe7d0cd8a81956527332e09cdd0cecee4cf63b1f Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 9 Feb 2025 17:45:30 +0100
Subject: [PATCH 43/75] lomiri.mediascanner2: Apply patch for
 desktop-independance

---
 pkgs/desktops/lomiri/services/mediascanner2/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index a6dafcc45fd1..86172e2774c6 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
   nixosTests,
   testers,
@@ -45,6 +46,14 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
+  patches = [
+    (fetchpatch {
+      name = "0001-mediascanner2-scannerdaemon-Drop-desktop-and-MEDIASCANNER_RUN-check.patch";
+      url = "https://gitlab.com/ubports/development/core/mediascanner2/-/commit/1e65b32e32a0536b9e2f283ba563fa78b6ef6d61.patch";
+      hash = "sha256-Xhm5+/E/pP+mn+4enqdsor1oRqfYTzabg1ODVfIhra4=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"

From a161ff01c7de59e6ee0949d1ac386a026ad653ea Mon Sep 17 00:00:00 2001
From: Chuang Zhu <git@chuang.cz>
Date: Mon, 10 Feb 2025 04:58:24 +0800
Subject: [PATCH 44/75] python3Packages.wn: fix build

---
 pkgs/development/python-modules/wn/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/wn/default.nix b/pkgs/development/python-modules/wn/default.nix
index 586f0cafd721..b742ee5902b4 100644
--- a/pkgs/development/python-modules/wn/default.nix
+++ b/pkgs/development/python-modules/wn/default.nix
@@ -4,8 +4,8 @@
   fetchPypi,
   pytestCheckHook,
   pythonOlder,
-  flit-core,
-  requests,
+  hatchling,
+  httpx,
   tomli,
 }:
 
@@ -14,17 +14,17 @@ buildPythonPackage rec {
   version = "0.11.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-TDvTNh+5cxgBoy9nuXItHOdtfbsP+3F16egZjUBSpak=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [
-    requests
+  dependencies = [
+    httpx
     tomli
   ];
 

From d2636f9978302a5aaa8b7adcc8bb45257b649f32 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Thu, 6 Feb 2025 15:18:45 +0100
Subject: [PATCH 45/75] spatialite_tools: adopt package under geospatial team

---
 pkgs/by-name/sp/spatialite_tools/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sp/spatialite_tools/package.nix b/pkgs/by-name/sp/spatialite_tools/package.nix
index 03deae8f639c..958c5f845ac5 100644
--- a/pkgs/by-name/sp/spatialite_tools/package.nix
+++ b/pkgs/by-name/sp/spatialite_tools/package.nix
@@ -58,16 +58,16 @@ stdenv.mkDerivation rec {
     version = "${libspatialite.version}";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Complete sqlite3-compatible CLI front-end for libspatialite";
     homepage = "https://www.gaia-gis.it/fossil/spatialite-tools";
-    license = with licenses; [
+    license = with lib.licenses; [
       mpl11
       gpl2Plus
       lgpl21Plus
     ];
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ dotlambda ];
+    platforms = lib.platforms.unix;
+    maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ dotlambda ]);
     mainProgram = "spatialite_tool";
   };
 }

From c59f85e660f352570910c4d1ae31c164a9a63c60 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Thu, 6 Feb 2025 15:31:09 +0100
Subject: [PATCH 46/75] spatialite_tools: rename package to spatialite-tools

---
 .../sp/{spatialite_tools => spatialite-tools}/package.nix     | 4 ++--
 pkgs/top-level/aliases.nix                                    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename pkgs/by-name/sp/{spatialite_tools => spatialite-tools}/package.nix (96%)

diff --git a/pkgs/by-name/sp/spatialite_tools/package.nix b/pkgs/by-name/sp/spatialite-tools/package.nix
similarity index 96%
rename from pkgs/by-name/sp/spatialite_tools/package.nix
rename to pkgs/by-name/sp/spatialite-tools/package.nix
index 958c5f845ac5..b19c2f08a648 100644
--- a/pkgs/by-name/sp/spatialite_tools/package.nix
+++ b/pkgs/by-name/sp/spatialite-tools/package.nix
@@ -15,7 +15,7 @@
   readosm,
   sqlite,
   testers,
-  spatialite_tools,
+  spatialite-tools,
 }:
 
 stdenv.mkDerivation rec {
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru.tests.version = testers.testVersion {
-    package = spatialite_tools;
+    package = spatialite-tools;
     command = "! spatialite_tool --version";
     version = "${libspatialite.version}";
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c60b89cd4649..68e65cd3d308 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1287,6 +1287,7 @@ mapAliases {
   SPAdes = spades; # Added 2024-06-12
   spark2014 = gnatprove; # Added 2024-02-25
   spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12
+  spatialite_tools = throw "spatialite_tools has been renamed to spatialite-tools"; # Added 2025-02-06
 
   # Added 2020-02-10
   sourceHanSansPackages = {

From dde19949debe8b0fa3592fd0070301500033195c Mon Sep 17 00:00:00 2001
From: Pedro Mendes <pedrohrmendes@proton.me>
Date: Wed, 5 Feb 2025 13:32:58 -0300
Subject: [PATCH 47/75] iwe: init at 0.0.17

---
 pkgs/by-name/iw/iwe/package.nix | 40 +++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 pkgs/by-name/iw/iwe/package.nix

diff --git a/pkgs/by-name/iw/iwe/package.nix b/pkgs/by-name/iw/iwe/package.nix
new file mode 100644
index 000000000000..57e377a17404
--- /dev/null
+++ b/pkgs/by-name/iw/iwe/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "iwe";
+  version = "0.0.17";
+
+  src = fetchFromGitHub {
+    owner = "iwe-org";
+    repo = "iwe";
+    tag = "iwe-v${version}";
+    hash = "sha256-eE84KzYJTJ39UDQt3VZpSIba/P+7VFR9K6+MSMlg0Wc=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-K8RxVYHh0pStQyHMiLLeUakAoK1IMoUtCNg70/NfDiI=";
+
+  cargoBuildFlags = [
+    "--package=iwe"
+    "--package=iwes"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Personal knowledge management system (editor plugin & command line utility)";
+    homepage = "https://iwe.md/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ phrmendes ];
+    mainProgram = "iwe";
+  };
+}

From 298a47d4af43e388dfc306753ef3d306802dc20e Mon Sep 17 00:00:00 2001
From: ash <ash@sorrel.sh>
Date: Mon, 10 Feb 2025 17:06:39 +0000
Subject: [PATCH 48/75] vorta: fix icons

---
 pkgs/applications/backup/vorta/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix
index 51991069e0c4..90fc8730176c 100644
--- a/pkgs/applications/backup/vorta/default.nix
+++ b/pkgs/applications/backup/vorta/default.nix
@@ -9,6 +9,7 @@
   versionCheckHook,
   makeFontsConf,
   qtbase,
+  qtsvg,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -27,9 +28,13 @@ python3Packages.buildPythonApplication rec {
     wrapQtAppsHook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
-  ];
+  buildInputs =
+    [
+      qtsvg
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      qtwayland
+    ];
 
   build-system = with python3Packages; [
     setuptools

From 6f95ea09266bf64898105d88577311e2fa8ea069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20James?= <gaeljames@gmail.com>
Date: Mon, 10 Feb 2025 20:43:28 +0100
Subject: [PATCH 49/75] textualeffects: init at 0.1.3

textualeffects: integrate code-review comments

textualeffects: integrate code-review comments
---
 .../python-modules/textualeffects/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/textualeffects/default.nix

diff --git a/pkgs/development/python-modules/textualeffects/default.nix b/pkgs/development/python-modules/textualeffects/default.nix
new file mode 100644
index 000000000000..889c7314859d
--- /dev/null
+++ b/pkgs/development/python-modules/textualeffects/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pythonOlder,
+  hatchling,
+  terminaltexteffects,
+}:
+
+buildPythonPackage rec {
+  pname = "textualeffects";
+  version = "0.1.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-s6LrsCJu/ubDIXQqxQlY2HVbzDc9+FtUE9oBSulUsm8=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [ terminaltexteffects ];
+
+  pythonImportsCheck = [ "textualeffects" ];
+
+  # no tests implemented
+  doCheck = false;
+
+  meta = {
+    description = "Visual effects for Textual, a TerminalTextEffects wrapper";
+    homepage = "https://github.com/ggozad/textualeffects";
+    changelog = "https://github.com/ggozad/textualeffects/blob/v${version}/CHANGES.txt";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ gaelj ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa133fa125bc..1ab3ea27b453 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16237,6 +16237,8 @@ self: super: with self; {
 
   textual-universal-directorytree = callPackage ../development/python-modules/textual-universal-directorytree { };
 
+  textualeffects = callPackage ../development/python-modules/textualeffects { };
+
   textual-textarea = callPackage ../development/python-modules/textual-textarea { };
 
   testbook = callPackage ../development/python-modules/testbook { };

From cc43fcb822a3616af4f5d3deb86cf40d0d3d16b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20James?= <gaeljames@gmail.com>
Date: Mon, 10 Feb 2025 20:43:28 +0100
Subject: [PATCH 50/75] oterm: fix runtime error: missing textualeffects
 (#366021)

---
 pkgs/by-name/ot/oterm/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index c9cae817ef92..fa2d2a68036c 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -40,6 +40,7 @@ python3Packages.buildPythonApplication rec {
     python-dotenv
     rich-pixels
     textual
+    textualeffects
     typer
   ];
 

From 2439cd293aaef13649e90aea869dd884e99bab75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20James?= <gaeljames@gmail.com>
Date: Mon, 10 Feb 2025 20:43:28 +0100
Subject: [PATCH 51/75] maintainers: add gaelj

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dda73802e1e0..49bbc5958207 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8204,6 +8204,12 @@
     name = "Florian Brandes";
     keys = [ { fingerprint = "0200 3EF8 8D2B CF2D 8F00  FFDC BBB3 E40E 5379 7FD9"; } ];
   };
+  gaelj = {
+    name = "Gaël James";
+    email = "gaeljames@gmail.com";
+    github = "gaelj";
+    githubId = 8884632;
+  };
   gaelreyrol = {
     email = "me@gaelreyrol.dev";
     matrix = "@Zevran:matrix.org";

From 49bdffa7151f4a69758a36286a7d6bbd224b48d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20James?= <gaeljames@gmail.com>
Date: Mon, 10 Feb 2025 20:43:28 +0100
Subject: [PATCH 52/75] oterm: assign gaelj as maintainer

---
 pkgs/by-name/ot/oterm/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index fa2d2a68036c..bb998fba57ce 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/ggozad/oterm";
     changelog = "https://github.com/ggozad/oterm/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ suhr ];
+    maintainers = with lib.maintainers; [ gaelj ];
     mainProgram = "oterm";
   };
 }

From 47a98549697263e82475b06fbaa240f1bbf99ddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20James?= <gaeljames@gmail.com>
Date: Mon, 10 Feb 2025 20:43:29 +0100
Subject: [PATCH 53/75] oterm: 0.7.3 -> 0.8.0

---
 pkgs/by-name/ot/oterm/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index bb998fba57ce..bfa58eeb2bbd 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "oterm";
-  version = "0.7.3";
+  version = "0.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ggozad";
     repo = "oterm";
     tag = version;
-    hash = "sha256-COIvnn6qDG9srv4ByWTBoRHfIva3a2dLS+yIZDguo+M=";
+    hash = "sha256-YKzC7GzRMFQ3zuVrbsiKCW9o8iCAR3PzSYP1ufRspDQ=";
   };
 
   pythonRelaxDeps = [
@@ -33,6 +33,7 @@ python3Packages.buildPythonApplication rec {
     aiosql
     aiosqlite
     httpx
+    mcp
     ollama
     packaging
     pillow

From f8a5af2c61adde372256194b4ef27f5dd71b41b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20James?= <gaeljames@gmail.com>
Date: Mon, 10 Feb 2025 20:43:29 +0100
Subject: [PATCH 54/75] oterm: 0.8.0 -> 0.8.1

---
 pkgs/by-name/ot/oterm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index bfa58eeb2bbd..f923bcba7d05 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "oterm";
-  version = "0.8.0";
+  version = "0.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ggozad";
     repo = "oterm";
     tag = version;
-    hash = "sha256-YKzC7GzRMFQ3zuVrbsiKCW9o8iCAR3PzSYP1ufRspDQ=";
+    hash = "sha256-JE9WgAtCDksfVq17LIDdfvjR9IW02vkH2JhY7eLOgF0=";
   };
 
   pythonRelaxDeps = [

From 264fbf0c768df8b24d42b7e9ffbfceb8285c9c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20James?= <gaeljames@gmail.com>
Date: Mon, 10 Feb 2025 20:43:29 +0100
Subject: [PATCH 55/75] oterm: 0.8.1 -> 0.8.3

---
 pkgs/by-name/ot/oterm/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index f923bcba7d05..726aa68b2b64 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -6,17 +6,18 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "oterm";
-  version = "0.8.1";
+  version = "0.8.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ggozad";
     repo = "oterm";
     tag = version;
-    hash = "sha256-JE9WgAtCDksfVq17LIDdfvjR9IW02vkH2JhY7eLOgF0=";
+    hash = "sha256-QIvnGU1BHKsJ/UMcS9zS2v9rn51wKoXvx50rGBIAzm4=";
   };
 
   pythonRelaxDeps = [
+    "aiosql"
     "aiosqlite"
     "httpx"
     "ollama"

From e23bdb6d3e08c65a06815ca62989f6a0937781b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Feb 2025 21:32:21 +0000
Subject: [PATCH 56/75] python312Packages.verlib2: 0.2.0 -> 0.2.1

---
 pkgs/development/python-modules/verlib2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/verlib2/default.nix b/pkgs/development/python-modules/verlib2/default.nix
index 178568e87b00..47c9d5f21aa2 100644
--- a/pkgs/development/python-modules/verlib2/default.nix
+++ b/pkgs/development/python-modules/verlib2/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "verlib2";
-  version = "0.2.0";
+  version = "0.2.1";
   pyproject = true;
 
   # This tarball doesn't include tests unfortuneatly, and the GitHub tarball
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # should work for us as well.
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-CrlAh8CU4nFjlI36gXyY1itr3QEibM5RiPjMPNaDRbk=";
+    hash = "sha256-0+JmanzxCUK/E0dNdQkuuNdavUGqZ6p5UAQ/WUGdnT8=";
   };
 
   nativeBuildInputs = [

From f61ee035c46008e0ddbae7bcb08ed9bddc330108 Mon Sep 17 00:00:00 2001
From: arminius-smh <armin@sprejz.de>
Date: Mon, 10 Feb 2025 18:20:16 +0100
Subject: [PATCH 57/75] simple-scan: install missing icons

---
 pkgs/by-name/si/simple-scan/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix
index 6ee79585d4a8..03059cf0ab0f 100644
--- a/pkgs/by-name/si/simple-scan/package.nix
+++ b/pkgs/by-name/si/simple-scan/package.nix
@@ -64,6 +64,11 @@ stdenv.mkDerivation rec {
     patchShebangs data/meson_compile_gschema.py
   '';
 
+  postInstall = ''
+    mkdir -p $out/share/icons/hicolor/scalable/actions/
+    install -m 444 ../data/icons/scalable/actions/* $out/share/icons/hicolor/scalable/actions/
+  '';
+
   doCheck = true;
 
   passthru = {

From 66361afa793ac6d55f2500256898942f0c89a7ff Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Mon, 10 Feb 2025 18:14:05 -0500
Subject: [PATCH 58/75] zed-editor: 0.172.10 -> 0.172.11

---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index a9063b74d076..b735dd0146ee 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -96,7 +96,7 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "zed-editor";
-  version = "0.172.10";
+  version = "0.172.11";
 
   outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";
 
@@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${version}";
-    hash = "sha256-4R7s+575ofL9JK1Axvvk2Z9QgHPxvJrgl9zCv3m+sZY=";
+    hash = "sha256-ozPARaFIPJZHsxB9e9c12nVuV/jGBRBXQJ1M+/luExY=";
   };
 
   patches = [
@@ -124,7 +124,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-yzShyOn90U79Ts+sKLhAK6SYiqPX7MKT/9fgF2plgI4=";
+  cargoHash = "sha256-3xpsTAj4jrttMZIbZCZc2Qf7g3Q4B6FBSUYEHf0u2+w=";
 
   nativeBuildInputs =
     [

From 725629414c15b5cddc861decf7446c7bf3db6346 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2025 00:56:56 +0000
Subject: [PATCH 59/75] crocoddyl: 2.1.0 -> 2.2.0

---
 pkgs/by-name/cr/crocoddyl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix
index a1a283727743..9b91fd7cb5d7 100644
--- a/pkgs/by-name/cr/crocoddyl/package.nix
+++ b/pkgs/by-name/cr/crocoddyl/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "crocoddyl";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "loco-3d";
     repo = "crocoddyl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-SVV9sleDXLm2QJmNgL25XLHC3y5bfKab4GSlE8jbT8w=";
+    hash = "sha256-j3TL5TpIdTkTO32Fuu+LyiieiXoOMvShi/LbBL5YYzA=";
   };
 
   outputs = [

From b7a65e85e59a65d33dd0594b91564e3e54c977f5 Mon Sep 17 00:00:00 2001
From: Alex Martens <alex@thinglab.org>
Date: Mon, 10 Feb 2025 18:53:39 -0800
Subject: [PATCH 60/75] cargo-spellcheck: 0.14.0 -> 0.15.1

---
 pkgs/by-name/ca/cargo-spellcheck/package.nix | 21 +++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix
index 0a0e6ec2ffd6..90d0a0bcbe96 100644
--- a/pkgs/by-name/ca/cargo-spellcheck/package.nix
+++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix
@@ -2,28 +2,39 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  fetchpatch2,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-spellcheck";
-  version = "0.14.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "drahnr";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-NrtPV2bd9BuA1nnniIcth85gJQmFGy9LHdajqmW8j4Q=";
+    tag = "v${version}";
+    hash = "sha256-o4gvTF9Zb6bZ9443zos4bz37w3bXKumW2x425MM5/FY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-1bOEOZ1byVm9apCqR9zgESsgA9Z9TdFSondwzwOPfWI=";
+  cargoHash = "sha256-wEcHMzeSj/JO/ZBPmQAiHaixtOTCT2+rTd1LDCY9wqc=";
+
+  patches = [
+    # fixes compilation of tests
+    # https://github.com/drahnr/cargo-spellcheck/pull/342
+    (fetchpatch2 {
+      name = "fix-test-compilation.patch";
+      url = "https://github.com/drahnr/cargo-spellcheck/pull/342/commits/aed8f3ca7a50fae38a5c6e0b974ed9773cd6c659.patch";
+      hash = "sha256-840t8uPg0EiiVppmMT38C1P16vps7F+g0o313tzghjE=";
+    })
+  ];
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
   preCheck = "HOME=$(mktemp -d)";
 
   checkFlags = [
-    "--skip checker::hunspell::tests::hunspell_binding_is_sane"
+    "--skip=checker::hunspell::tests::hunspell_binding_is_sane"
   ];
 
   meta = with lib; {

From f5ff3cf76b1875f1f6104a4d0032e2c85c6f1b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francis=20Gagn=C3=A9?= <fragag1@gmail.com>
Date: Sun, 9 Feb 2025 20:08:36 -0500
Subject: [PATCH 61/75] lldb: Fix dependency cycle between `out` and `lib`
 outputs

Remove the `lib` output, so that `/lib` goes to the `out` output
instead. This fixes the following error:

ERROR: noBrokenSymlinks: the symlink .../lib/python3.12/site-packages/lldb/lldb-argdumper points to a missing target .../bin/lldb-argdumper

Fixes #380196
---
 pkgs/development/compilers/llvm/common/lldb.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix
index f4a131c47620..40e61d874621 100644
--- a/pkgs/development/compilers/llvm/common/lldb.nix
+++ b/pkgs/development/compilers/llvm/common/lldb.nix
@@ -54,9 +54,10 @@ stdenv.mkDerivation (rec {
   src = src';
   inherit patches;
 
-  # LLDB expects to find the path to `bin` relative to `lib` on Darwin. It can’t be patched with the location of
-  # the `lib` output because that would create a cycle between it and the `out` output.
-  outputs = [ "out" "dev" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "lib" ];
+  # There is no `lib` output because some of the files in `$out/lib` depend on files in `$out/bin`.
+  # For example, `$out/lib/python3.12/site-packages/lldb/lldb-argdumper` is a symlink to `$out/bin/lldb-argdumper`.
+  # Also, LLDB expects to find the path to `bin` relative to `lib` on Darwin.
+  outputs = [ "out" "dev" ];
 
   sourceRoot = lib.optional (lib.versionAtLeast release_version "13") "${src.name}/${pname}";
 
@@ -140,7 +141,7 @@ stdenv.mkDerivation (rec {
   '';
 
   postInstall = ''
-    wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/
+    wrapProgram $out/bin/lldb --prefix PYTHONPATH : ''${!outputLib}/${python3.sitePackages}/
 
     # Editor support
     # vscode:

From 892d1e52c20aac5dc1ae2745bc68a92111f8b563 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:39:38 +0700
Subject: [PATCH 62/75] zerotierone: 1.14.0 -> 1.14.2

---
 ...m-remove-unsupported-lints.workspace.patch |   24 +
 pkgs/by-name/ze/zerotierone/Cargo.lock        | 3579 -----------------
 pkgs/by-name/ze/zerotierone/package.nix       |   39 +-
 3 files changed, 41 insertions(+), 3601 deletions(-)
 create mode 100644 pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch
 delete mode 100644 pkgs/by-name/ze/zerotierone/Cargo.lock

diff --git a/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch b/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch
new file mode 100644
index 000000000000..0db2b4d26fa2
--- /dev/null
+++ b/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch
@@ -0,0 +1,24 @@
+From b83e6354de099860bcb1ca3876c222c57de89f0c Mon Sep 17 00:00:00 2001
+From: Michael Hoang <enzime@users.noreply.github.com>
+Date: Mon, 10 Feb 2025 18:03:12 +0700
+Subject: [PATCH] rustfsm: remove unsupported `lints.workspace`
+
+This patch will no longer be necessary when
+https://github.com/NixOS/nixpkgs/pull/300532 is merged
+---
+ fsm/Cargo.toml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/fsm/Cargo.toml b/fsm/Cargo.toml
+index 5e9e1c9..3fda704 100644
+--- a/fsm/Cargo.toml
++++ b/fsm/Cargo.toml
+@@ -17,5 +17,3 @@ rustfsm_trait = { version = "0.1", path = "rustfsm_trait" }
+ [package.metadata.workspaces]
+ independent = true
+ 
+-[lints]
+-workspace = true
+-- 
+2.46.0
+
diff --git a/pkgs/by-name/ze/zerotierone/Cargo.lock b/pkgs/by-name/ze/zerotierone/Cargo.lock
deleted file mode 100644
index 09d9ced0cfc9..000000000000
--- a/pkgs/by-name/ze/zerotierone/Cargo.lock
+++ /dev/null
@@ -1,3579 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
-
-[[package]]
-name = "anyhow"
-version = "1.0.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
-
-[[package]]
-name = "async-stream"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
-dependencies = [
- "async-stream-impl",
- "futures-core",
- "pin-project-lite",
-]
-
-[[package]]
-name = "async-stream-impl"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "axum"
-version = "0.6.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
-dependencies = [
- "async-trait",
- "axum-core",
- "bitflags 1.3.2",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "sync_wrapper",
- "tower",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "mime",
- "rustversion",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "backoff"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
-dependencies = [
- "getrandom",
- "instant",
- "rand",
-]
-
-[[package]]
-name = "backtrace"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base16ct"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "base64ct"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
-
-[[package]]
-name = "cbindgen"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51e3973b165dc0f435831a9e426de67e894de532754ff7a3f307c03ee5dec7dc"
-dependencies = [
- "clap",
- "heck 0.3.3",
- "indexmap 1.9.3",
- "log",
- "proc-macro2",
- "quote",
- "serde",
- "serde_json",
- "syn 1.0.109",
- "tempfile",
- "toml",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.90"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-targets 0.52.4",
-]
-
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.3.2",
- "strsim 0.8.0",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "const-oid"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
-
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
-
-[[package]]
-name = "crypto-bigint"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
-dependencies = [
- "generic-array",
- "rand_core",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "curve25519-dalek"
-version = "4.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "curve25519-dalek-derive",
- "digest",
- "fiat-crypto",
- "platforms",
- "rustc_version",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "curve25519-dalek-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "darling"
-version = "0.20.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.10.0",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
-dependencies = [
- "darling_core",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.3",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
-[[package]]
-name = "der"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
-dependencies = [
- "const-oid",
- "pem-rfc7468",
- "zeroize",
-]
-
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
- "serde",
-]
-
-[[package]]
-name = "derive_builder"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
-dependencies = [
- "derive_builder_core",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "const-oid",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "downcast"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
-
-[[package]]
-name = "ecdsa"
-version = "0.16.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
-dependencies = [
- "der",
- "digest",
- "elliptic-curve",
- "rfc6979",
- "signature",
- "spki",
-]
-
-[[package]]
-name = "ed25519"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
-dependencies = [
- "pkcs8",
- "signature",
-]
-
-[[package]]
-name = "ed25519-dalek"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
-dependencies = [
- "curve25519-dalek",
- "ed25519",
- "serde",
- "sha2",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "either"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
-
-[[package]]
-name = "elliptic-curve"
-version = "0.13.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
-dependencies = [
- "base16ct",
- "crypto-bigint",
- "digest",
- "ff",
- "generic-array",
- "group",
- "hkdf",
- "pem-rfc7468",
- "pkcs8",
- "rand_core",
- "sec1",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "enum-iterator"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "600536cfe9e2da0820aa498e570f6b2b9223eec3ce2f835c8ae4861304fa4794"
-dependencies = [
- "enum-iterator-derive",
-]
-
-[[package]]
-name = "enum-iterator-derive"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "enum_dispatch"
-version = "0.3.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e"
-dependencies = [
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "erased-serde"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "errno"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
-
-[[package]]
-name = "ff"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
-dependencies = [
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "fiat-crypto"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382"
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fragile"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
-
-[[package]]
-name = "futures"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "futures-retry"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fde5a672a61f96552aa5ed9fd9c81c3fbdae4be9b1e205d6eaf17c83705adc0f"
-dependencies = [
- "futures",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-
-[[package]]
-name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-timer"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
-
-[[package]]
-name = "futures-util"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
- "zeroize",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
-dependencies = [
- "cfg-if",
- "js-sys",
- "libc",
- "wasi",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "gimli"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-
-[[package]]
-name = "governor"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b"
-dependencies = [
- "cfg-if",
- "dashmap",
- "futures",
- "futures-timer",
- "no-std-compat",
- "nonzero_ext",
- "parking_lot",
- "portable-atomic",
- "quanta",
- "rand",
- "smallvec",
- "spinning_top",
-]
-
-[[package]]
-name = "group"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
-dependencies = [
- "ff",
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap 2.2.5",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "hkdf"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
-dependencies = [
- "hmac",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-dependencies = [
- "bytes",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "hyper"
-version = "0.14.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-timeout"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
-dependencies = [
- "hyper",
- "pin-project-lite",
- "tokio",
- "tokio-io-timeout",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
-dependencies = [
- "bytes",
- "hyper",
- "native-tls",
- "tokio",
- "tokio-native-tls",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.3",
- "serde",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "inventory"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767"
-
-[[package]]
-name = "ipnet"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
-
-[[package]]
-name = "js-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "jwt"
-version = "0.16.0"
-source = "git+https://github.com/glimberg/rust-jwt#61a9291fdeec747c6edf14f4fa0caf235136c168"
-dependencies = [
- "base64 0.13.1",
- "crypto-common",
- "digest",
- "hmac",
- "serde",
- "serde_json",
- "sha2",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-dependencies = [
- "spin 0.5.2",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.153"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
-
-[[package]]
-name = "libm"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
-
-[[package]]
-name = "lock_api"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
-
-[[package]]
-name = "lru"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
-dependencies = [
- "hashbrown 0.14.3",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "matchit"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
-
-[[package]]
-name = "memchr"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "mockall"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48"
-dependencies = [
- "cfg-if",
- "downcast",
- "fragile",
- "lazy_static",
- "mockall_derive",
- "predicates",
- "predicates-tree",
-]
-
-[[package]]
-name = "mockall_derive"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2"
-dependencies = [
- "cfg-if",
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "multimap"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
-
-[[package]]
-name = "native-tls"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-dependencies = [
- "lazy_static",
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "no-std-compat"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
-
-[[package]]
-name = "nonzero_ext"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num-bigint-dig"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
-dependencies = [
- "byteorder",
- "lazy_static",
- "libm",
- "num-integer",
- "num-iter",
- "num-traits",
- "rand",
- "smallvec",
- "zeroize",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
-dependencies = [
- "autocfg",
- "libm",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
-]
-
-[[package]]
-name = "oauth2"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f"
-dependencies = [
- "base64 0.13.1",
- "chrono",
- "getrandom",
- "http",
- "rand",
- "reqwest",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "sha2",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "openidconnect"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f47e80a9cfae4462dd29c41e987edd228971d6565553fbc14b8a11e666d91590"
-dependencies = [
- "base64 0.13.1",
- "chrono",
- "dyn-clone",
- "ed25519-dalek",
- "hmac",
- "http",
- "itertools 0.10.5",
- "log",
- "oauth2",
- "p256",
- "p384",
- "rand",
- "rsa",
- "serde",
- "serde-value",
- "serde_derive",
- "serde_json",
- "serde_path_to_error",
- "serde_plain",
- "serde_with",
- "sha2",
- "subtle",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "openssl"
-version = "0.10.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
-dependencies = [
- "bitflags 2.5.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.101"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "opentelemetry"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf"
-dependencies = [
- "futures-core",
- "futures-sink",
- "js-sys",
- "once_cell",
- "pin-project-lite",
- "thiserror",
- "urlencoding",
-]
-
-[[package]]
-name = "ordered-float"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "p256"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
-]
-
-[[package]]
-name = "p384"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "pem-rfc7468"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
-dependencies = [
- "base64ct",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "petgraph"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
-dependencies = [
- "fixedbitset",
- "indexmap 2.2.5",
-]
-
-[[package]]
-name = "pin-project"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkcs1"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
-dependencies = [
- "der",
- "pkcs8",
- "spki",
-]
-
-[[package]]
-name = "pkcs8"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
-dependencies = [
- "der",
- "spki",
-]
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "platforms"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
-
-[[package]]
-name = "portable-atomic"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "predicates"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8"
-dependencies = [
- "anstyle",
- "predicates-core",
-]
-
-[[package]]
-name = "predicates-core"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
-
-[[package]]
-name = "predicates-tree"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
-dependencies = [
- "predicates-core",
- "termtree",
-]
-
-[[package]]
-name = "prettyplease"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
-dependencies = [
- "proc-macro2",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "primeorder"
-version = "0.13.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
-dependencies = [
- "elliptic-curve",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "prometheus"
-version = "0.13.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
-dependencies = [
- "cfg-if",
- "fnv",
- "lazy_static",
- "memchr",
- "parking_lot",
- "protobuf",
- "thiserror",
-]
-
-[[package]]
-name = "prost"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
-dependencies = [
- "bytes",
- "prost-derive",
-]
-
-[[package]]
-name = "prost-build"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2"
-dependencies = [
- "bytes",
- "heck 0.4.1",
- "itertools 0.11.0",
- "log",
- "multimap",
- "once_cell",
- "petgraph",
- "prettyplease",
- "prost",
- "prost-types",
- "regex",
- "syn 2.0.53",
- "tempfile",
- "which",
-]
-
-[[package]]
-name = "prost-derive"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
-dependencies = [
- "anyhow",
- "itertools 0.11.0",
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "prost-types"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"
-dependencies = [
- "prost",
-]
-
-[[package]]
-name = "prost-wkt"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d8ef9c3f0f1dab910d2b7e2c24a8e4322e122eba6d7a1921eeebcebbc046c40"
-dependencies = [
- "chrono",
- "inventory",
- "prost",
- "serde",
- "serde_derive",
- "serde_json",
- "typetag",
-]
-
-[[package]]
-name = "prost-wkt-build"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b31cae9a54ca84fee1504740a82eebf2479532905e106f63ca0c3bc8d780321"
-dependencies = [
- "heck 0.4.1",
- "prost",
- "prost-build",
- "prost-types",
- "quote",
-]
-
-[[package]]
-name = "prost-wkt-types"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435be4a8704091b4c5fb1d79799de7f2dbff53af05edf29385237f8cf7ab37ee"
-dependencies = [
- "chrono",
- "prost",
- "prost-build",
- "prost-types",
- "prost-wkt",
- "prost-wkt-build",
- "regex",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "protobuf"
-version = "2.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
-
-[[package]]
-name = "quanta"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca0b7bac0b97248c40bb77288fc52029cf1459c0461ea1b05ee32ccf011de2c"
-dependencies = [
- "crossbeam-utils",
- "libc",
- "once_cell",
- "raw-cpuid",
- "wasi",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "raw-cpuid"
-version = "11.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1"
-dependencies = [
- "bitflags 2.5.0",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.2",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.8.2",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-
-[[package]]
-name = "reqwest"
-version = "0.11.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-tls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile 1.0.4",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
-[[package]]
-name = "rfc6979"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
-dependencies = [
- "hmac",
- "subtle",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom",
- "libc",
- "spin 0.9.8",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "ringbuf"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79abed428d1fd2a128201cec72c5f6938e2da607c6f3745f769fabea399d950a"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "rsa"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
-dependencies = [
- "const-oid",
- "digest",
- "num-bigint-dig",
- "num-integer",
- "num-traits",
- "pkcs1",
- "pkcs8",
- "rand_core",
- "signature",
- "spki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustfsm"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965"
-dependencies = [
- "rustfsm_procmacro",
- "rustfsm_trait",
-]
-
-[[package]]
-name = "rustfsm_procmacro"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965"
-dependencies = [
- "derive_more",
- "proc-macro2",
- "quote",
- "rustfsm_trait",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "rustfsm_trait"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965"
-
-[[package]]
-name = "rustix"
-version = "0.38.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
-dependencies = [
- "bitflags 2.5.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.22.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41"
-dependencies = [
- "log",
- "ring",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 2.1.1",
- "rustls-pki-types",
- "schannel",
- "security-framework",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-dependencies = [
- "base64 0.21.7",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab"
-dependencies = [
- "base64 0.21.7",
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
-
-[[package]]
-name = "ryu"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
-
-[[package]]
-name = "schannel"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "sec1"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
-dependencies = [
- "base16ct",
- "der",
- "generic-array",
- "pkcs8",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
-
-[[package]]
-name = "serde"
-version = "1.0.197"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde-value"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
-dependencies = [
- "ordered-float",
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.197"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.114"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_path_to_error"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
-dependencies = [
- "itoa",
- "serde",
-]
-
-[[package]]
-name = "serde_plain"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_with"
-version = "3.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a"
-dependencies = [
- "base64 0.21.7",
- "chrono",
- "hex",
- "indexmap 1.9.3",
- "indexmap 2.2.5",
- "serde",
- "serde_derive",
- "serde_json",
- "serde_with_macros",
- "time",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "3.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "signature"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
-dependencies = [
- "digest",
- "rand_core",
-]
-
-[[package]]
-name = "siphasher"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "slotmap"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
-
-[[package]]
-name = "smeeclient"
-version = "0.1.0"
-dependencies = [
- "cbindgen",
- "serde",
- "temporal-client",
- "temporal-sdk",
- "temporal-sdk-core-protos",
- "tokio",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "spinning_top"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
-dependencies = [
- "lock_api",
-]
-
-[[package]]
-name = "spki"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
-dependencies = [
- "base64ct",
- "der",
-]
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "subtle"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
-dependencies = [
- "cfg-if",
- "fastrand",
- "rustix",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "temporal-client"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965"
-dependencies = [
- "anyhow",
- "async-trait",
- "backoff",
- "derive_builder",
- "derive_more",
- "futures",
- "futures-retry",
- "http",
- "once_cell",
- "opentelemetry",
- "parking_lot",
- "prost-types",
- "slotmap",
- "temporal-sdk-core-api",
- "temporal-sdk-core-protos",
- "thiserror",
- "tokio",
- "tonic",
- "tower",
- "tracing",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "temporal-sdk"
-version = "0.1.0-alpha.1"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965"
-dependencies = [
- "anyhow",
- "async-trait",
- "base64 0.21.7",
- "crossbeam-channel",
- "derive_more",
- "futures",
- "once_cell",
- "parking_lot",
- "prost-wkt-types",
- "serde",
- "sha2",
- "temporal-client",
- "temporal-sdk-core",
- "temporal-sdk-core-api",
- "temporal-sdk-core-protos",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tonic",
- "tracing",
-]
-
-[[package]]
-name = "temporal-sdk-core"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965"
-dependencies = [
- "anyhow",
- "async-trait",
- "base64 0.21.7",
- "crossbeam-channel",
- "crossbeam-queue",
- "dashmap",
- "derive_builder",
- "derive_more",
- "enum-iterator",
- "enum_dispatch",
- "futures",
- "futures-util",
- "governor",
- "itertools 0.12.1",
- "log",
- "lru",
- "mockall",
- "once_cell",
- "parking_lot",
- "pin-project",
- "prometheus",
- "prost",
- "prost-wkt-types",
- "rand",
- "ringbuf",
- "rustfsm",
- "serde",
- "serde_json",
- "siphasher",
- "slotmap",
- "temporal-client",
- "temporal-sdk-core-api",
- "temporal-sdk-core-protos",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tonic",
- "tonic-build",
- "tracing",
- "tracing-subscriber",
- "url",
- "uuid",
-]
-
-[[package]]
-name = "temporal-sdk-core-api"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965"
-dependencies = [
- "async-trait",
- "derive_builder",
- "derive_more",
- "opentelemetry",
- "prost-types",
- "serde_json",
- "temporal-sdk-core-protos",
- "thiserror",
- "tonic",
- "tracing-core",
- "url",
-]
-
-[[package]]
-name = "temporal-sdk-core-protos"
-version = "0.1.0"
-source = "git+https://github.com/temporalio/sdk-core?branch=master#4840a9c570fa3388e190e20f01f61065d0b7e965"
-dependencies = [
- "anyhow",
- "base64 0.21.7",
- "derive_more",
- "prost",
- "prost-wkt",
- "prost-wkt-build",
- "prost-wkt-types",
- "rand",
- "serde",
- "serde_json",
- "thiserror",
- "tonic",
- "tonic-build",
- "uuid",
-]
-
-[[package]]
-name = "termtree"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "time"
-version = "0.3.36"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
-dependencies = [
- "deranged",
- "itoa",
- "num-conv",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "tokio"
-version = "1.36.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "num_cpus",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "tokio-io-timeout"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
-dependencies = [
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
-dependencies = [
- "rustls",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-stream"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "tonic"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13"
-dependencies = [
- "async-stream",
- "async-trait",
- "axum",
- "base64 0.21.7",
- "bytes",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-timeout",
- "percent-encoding",
- "pin-project",
- "prost",
- "rustls-native-certs",
- "rustls-pemfile 2.1.1",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tokio-stream",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tonic-build"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2"
-dependencies = [
- "prettyplease",
- "proc-macro2",
- "prost-build",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "tower"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
-dependencies = [
- "futures-core",
- "futures-util",
- "indexmap 1.9.3",
- "pin-project",
- "pin-project-lite",
- "rand",
- "slab",
- "tokio",
- "tokio-util",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "log",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "parking_lot",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "typetag"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "661d18414ec032a49ece2d56eee03636e43c4e8d577047ab334c0ba892e29aaf"
-dependencies = [
- "erased-serde",
- "inventory",
- "once_cell",
- "serde",
- "typetag-impl",
-]
-
-[[package]]
-name = "typetag-impl"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "url"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "urlencoding"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
-
-[[package]]
-name = "uuid"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.53",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
-
-[[package]]
-name = "web-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "which"
-version = "4.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
-dependencies = [
- "either",
- "home",
- "once_cell",
- "rustix",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.4",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.4",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.4",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.53",
-]
-
-[[package]]
-name = "zeroidc"
-version = "0.1.0"
-dependencies = [
- "base64 0.21.7",
- "bytes",
- "cbindgen",
- "jwt",
- "openidconnect",
- "reqwest",
- "serde",
- "thiserror",
- "time",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix
index 8f5f2dcb1422..b7157273c7ad 100644
--- a/pkgs/by-name/ze/zerotierone/package.nix
+++ b/pkgs/by-name/ze/zerotierone/package.nix
@@ -13,50 +13,45 @@
   zlib,
   libiconv,
   darwin,
-  fetchpatch,
 }:
 
 let
   pname = "zerotierone";
-  version = "1.14.0";
+  version = "1.14.2";
 
   src = fetchFromGitHub {
     owner = "zerotier";
     repo = "ZeroTierOne";
-    rev = version;
-    hash = "sha256-YWcqALUB3ZEukL4er2FKcyNdEbuaf//QU5hRbKAfxDA=";
+    tag = version;
+    hash = "sha256-D+7/ja5uYzH1iNd+Ti3k+dWOf5GvN4U+GuVBA9gxtTc=";
   };
 
 in
 stdenv.mkDerivation {
   inherit pname version src;
 
-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "jwt-0.16.0" = "sha256-P5aJnNlcLe9sBtXZzfqHdRvxNfm6DPBcfcKOVeLZxcM=";
-      "rustfsm-0.1.0" = "sha256-q7J9QgN67iuoNhQC8SDVzUkjCNRXGiNCkE8OsQc5+oI=";
-    };
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit src;
+    sourceRoot = "source/rustybits";
+    hash = "sha256-CSpm4zBWKhcrM/KXGU6/51NSQ6hzpT44D2J+QETBtpQ=";
+
+    # REMOVEME when https://github.com/NixOS/nixpkgs/pull/300532 is merged
+    postBuild = ''
+      pushd $out/git/730aadcc02767ae630e88f8f8c788a85d6bc81e6
+      patch --verbose -p1 <${./0001-rustfsm-remove-unsupported-lints.workspace.patch}
+      popd
+    '';
   };
+
   patches = [
-    # https://github.com/zerotier/ZeroTierOne/pull/2314
-    (fetchpatch {
-      url = "https://github.com/zerotier/ZeroTierOne/commit/f9c6ee0181acb1b77605d9a4e4106ac79aaacca3.patch";
-      hash = "sha256-zw7KmaxiCH99Y0wQtOQM4u0ruxiePhvv/birxMQioJU=";
-    })
     ./0001-darwin-disable-link-time-optimization.patch
   ];
+
   postPatch = ''
-    cp ${./Cargo.lock} Cargo.lock
-    cp ${./Cargo.lock} rustybits/Cargo.lock
+    cp rustybits/Cargo.lock Cargo.lock
   '';
 
   preConfigure = ''
-    cmp ./Cargo.lock ./rustybits/Cargo.lock || {
-      echo 1>&2 "Please make sure that the derivation's Cargo.lock is identical to ./rustybits/Cargo.lock!"
-      exit 1
-    }
-
     patchShebangs ./doc/build.sh
     substituteInPlace ./doc/build.sh \
       --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \

From 9801b983c7b8c2a41398a1b8cb31c44b321112e1 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:31:41 +0700
Subject: [PATCH 63/75] zerotierone: fix build on macOS

---
 pkgs/by-name/ze/zerotierone/package.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix
index b7157273c7ad..d3d4b80297bb 100644
--- a/pkgs/by-name/ze/zerotierone/package.nix
+++ b/pkgs/by-name/ze/zerotierone/package.nix
@@ -13,6 +13,7 @@
   zlib,
   libiconv,
   darwin,
+  fetchpatch,
 }:
 
 let
@@ -45,6 +46,11 @@ stdenv.mkDerivation {
 
   patches = [
     ./0001-darwin-disable-link-time-optimization.patch
+    # https://github.com/zerotier/ZeroTierOne/pull/2435
+    (fetchpatch {
+      url = "https://github.com/zerotier/ZeroTierOne/commit/8f56d484b681ea30cd28e19cab34499acfa6e64d.patch";
+      hash = "sha256-UplkX2O4o8XKKTlR3ZsSG9E0y5gVhAagyepqwyGEYmA=";
+    })
   ];
 
   postPatch = ''
@@ -89,20 +95,12 @@ stdenv.mkDerivation {
   preBuild =
     if stdenv.hostPlatform.isDarwin then
       ''
-        makeFlagsArray+=("ARCH_FLAGS=") # disable multi-arch build
+        # building multiple architectures at the same time from nixpkgs is not supported
+        makeFlagsArray+=("ARCH=${stdenv.hostPlatform.darwinArch}")
         if ! grep -q MACOS_VERSION_MIN=10.13 make-mac.mk; then
           echo "You may need to update MACOSX_DEPLOYMENT_TARGET to match the value in make-mac.mk"
           exit 1
         fi
-        (cd rustybits && MACOSX_DEPLOYMENT_TARGET=10.13 cargo build -p zeroidc --release)
-
-        cp \
-          ./rustybits/target/${stdenv.hostPlatform.rust.rustcTarget}/release/libzeroidc.a \
-          ./rustybits/target
-
-        # zerotier uses the "FORCE" target as a phony target to force rebuilds.
-        # We don't want to rebuild libzeroidc.a as we build want to build this library ourself for a single architecture
-        touch FORCE
       ''
     else
       ''

From 882fac471737df700a6fe01d7d9b223c03376be9 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Mon, 10 Feb 2025 12:44:59 +0800
Subject: [PATCH 64/75] emacsPackages.dap-mode: fix build

https://hydra.nix-community.org/build/2991612
(cherry picked from commit fe5312cd441714a518c3585297ba0f1915e899b8)

This was originally committed to the staging-next branch.  To make it
reach users sooner, we revert it on the staging-next branch and
reapply it to the master branch.

Closes: https://github.com/nix-community/emacs-overlay/issues/467
---
 .../emacs/elisp-packages/melpa-packages.nix   | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 122a02f18abd..dbbbe8df53b1 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -977,14 +977,19 @@ let
 
         cssh = ignoreCompilationError super.cssh; # elisp error
 
-        dap-mode = super.dap-mode.overrideAttrs (old: {
-          # empty file causing native-compiler-error-empty-byte
-          preBuild =
-            ''
-              rm --verbose dapui.el
-            ''
-            + old.preBuild or "";
-        });
+        dap-mode = super.dap-mode.overrideAttrs (
+          finalAttrs: previousAttrs: {
+            # empty file causing native-compiler-error-empty-byte
+            preBuild =
+              if lib.versionOlder finalAttrs.version "20250131.1624" then
+                ''
+                  rm --verbose dapui.el
+                ''
+                + previousAttrs.preBuild or ""
+              else
+                previousAttrs.preBuild or null;
+          }
+        );
 
         db-pg = ignoreCompilationError super.db-pg; # elisp error
 

From 1ba5e8fe862281c938a1a0ed82250de5fe621e6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2025 04:31:31 +0000
Subject: [PATCH 65/75] static-web-server: 2.35.0 -> 2.36.0

---
 pkgs/by-name/st/static-web-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix
index 68d88a29326d..fa62932604d8 100644
--- a/pkgs/by-name/st/static-web-server/package.nix
+++ b/pkgs/by-name/st/static-web-server/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "static-web-server";
-  version = "2.35.0";
+  version = "2.36.0";
 
   src = fetchFromGitHub {
     owner = "static-web-server";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-vrv/qCn57wO3no3ASgaJFAhTjFyW5M4kZkfpgkpYYhY=";
+    hash = "sha256-TE0V9Ai7lLb1TBtusDV+ACuPO8/1VUjeVZzA4XoL3VQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-i+x8Box4gz79qnrcI2XXkSZ3u3h5qHKwJhOBc+Lx+Nw=";
+  cargoHash = "sha256-uGEn+UvHse4tGOAQGzEoFpJxqbXM0u4IrXmMVgKz8z4=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 

From 3cb3f93aef923ee33f5e2593c7068c31dd8b47de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Feb 2025 17:47:33 +0000
Subject: [PATCH 66/75] refine: 0.4.2 -> 0.4.4

---
 pkgs/by-name/re/refine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix
index 87a462c23bcf..ddac6eb30001 100644
--- a/pkgs/by-name/re/refine/package.nix
+++ b/pkgs/by-name/re/refine/package.nix
@@ -34,7 +34,7 @@ in
 
 python3Packages.buildPythonApplication rec {
   pname = "refine";
-  version = "0.4.3";
+  version = "0.4.4";
   pyproject = false; # uses meson
 
   src = fetchFromGitLab {
@@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec {
     owner = "TheEvilSkeleton";
     repo = "Refine";
     tag = version;
-    hash = "sha256-WFajNhTXFqZUYLXumcnDM2pfmKye8p7h6L+BS1orEgs=";
+    hash = "sha256-39fbUJpNON0aALT/pb18/m9hStue4TxkrAsHymEpy5I=";
   };
 
   nativeBuildInputs = [

From 4f094f4a2ee6bcb449de091f1b3c7e658409d58f Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Fri, 7 Feb 2025 20:29:58 +0900
Subject: [PATCH 67/75] ocamlPackages.easy-format: 1.3.3 -> 1.3.4 Changelog:
 https://github.com/ocaml-community/easy-format/releases/tag/1.3.4 Diff:
 https://github.com/ocaml-community/easy-format/compare/1.3.3...1.3.4

---
 pkgs/development/ocaml-modules/easy-format/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix
index df1b30dd647a..d65b5863e86e 100644
--- a/pkgs/development/ocaml-modules/easy-format/default.nix
+++ b/pkgs/development/ocaml-modules/easy-format/default.nix
@@ -9,8 +9,8 @@ let
   params =
     if lib.versionAtLeast ocaml.version "4.08" then
       {
-        version = "1.3.3";
-        sha256 = "sha256:05n4mm1yz33h9gw811ivjw7x4m26lpmf7kns9lza4v6227lwmz7a";
+        version = "1.3.4";
+        sha256 = "sha256-Hb8FHp9oV03ebi4lSma5xSTKQl6As26Zr5btlkq2EMM=";
       }
     else
       {

From da85d37aa491d6df3087d5f1f4fe959b50c48051 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Fri, 7 Feb 2025 20:34:49 +0900
Subject: [PATCH 68/75] ocamlPackages.easy-format: modernized derivation -
 Removed with lib - Added changelog and longDescription to meta - Replaced
 sha256 with hash

---
 .../ocaml-modules/easy-format/default.nix     | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix
index d65b5863e86e..ddbe68fe779c 100644
--- a/pkgs/development/ocaml-modules/easy-format/default.nix
+++ b/pkgs/development/ocaml-modules/easy-format/default.nix
@@ -10,12 +10,12 @@ let
     if lib.versionAtLeast ocaml.version "4.08" then
       {
         version = "1.3.4";
-        sha256 = "sha256-Hb8FHp9oV03ebi4lSma5xSTKQl6As26Zr5btlkq2EMM=";
+        hash = "sha256-Hb8FHp9oV03ebi4lSma5xSTKQl6As26Zr5btlkq2EMM=";
       }
     else
       {
         version = "1.3.2";
-        sha256 = "sha256:09hrikx310pac2sb6jzaa7k6fmiznnmhdsqij1gawdymhawc4h1l";
+        hash = "sha256-NEDCuILVN65ekBHrBqu1P1Zn5lHqS7O0YOqCMPqMGSY=";
       };
 in
 
@@ -25,15 +25,34 @@ buildDunePackage rec {
 
   src = fetchurl {
     url = "https://github.com/ocaml-community/easy-format/releases/download/${version}/easy-format-${version}.tbz";
-    inherit (params) sha256;
+    inherit (params) hash;
   };
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "High-level and functional interface to the Format module of the OCaml standard library";
+    longDescription = ''
+      This module offers a high-level and functional interface to the Format module of
+      the OCaml standard library. It is a pretty-printing facility, i.e. it takes as
+      input some code represented as a tree and formats this code into the most
+      visually satisfying result, breaking and indenting lines of code where
+      appropriate.
+
+      Input data must be first modelled and converted into a tree using 3 kinds of
+      nodes:
+
+      * atoms
+      * lists
+      * labelled nodes
+
+      Atoms represent any text that is guaranteed to be printed as-is. Lists can model
+      any sequence of items such as arrays of data or lists of definitions that are
+      labelled with something like "int main", "let x =" or "x:".
+    '';
     homepage = "https://github.com/ocaml-community/easy-format";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.vbgl ];
+    changelog = "https://github.com/ocaml-community/easy-format/releases/tag/${params.version}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ vbgl ];
   };
 }

From 6d0ac786baa4681a84633faa598329bf842ff21e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?=
 <33058747+GaetanLepage@users.noreply.github.com>
Date: Tue, 11 Feb 2025 07:37:12 +0100
Subject: [PATCH 69/75] Revert "python312Packages.dask: 2024.12.1 -> 2025.1.0"

---
 .../python-modules/awkward-cpp/default.nix    |   4 +-
 .../python-modules/awkward/default.nix        |  51 ++--
 .../python-modules/catboost/default.nix       |   7 +-
 .../python-modules/coffea/default.nix         |   8 -
 .../python-modules/dask-awkward/default.nix   |  12 +-
 .../python-modules/dask-expr/default.nix      |  65 +++++
 .../python-modules/dask-glm/default.nix       |  58 ++--
 .../python-modules/dask-histogram/default.nix |   8 +-
 .../python-modules/dask-image/default.nix     |  27 +-
 .../python-modules/dask-ml/default.nix        |  46 +++-
 .../python-modules/dask/default.nix           | 252 ++++++++++--------
 .../python-modules/devito/default.nix         |  30 +--
 .../python-modules/mplhep/default.nix         |  31 +--
 .../python-modules/narwhals/default.nix       |  25 +-
 .../python-modules/sparse/default.nix         |  52 ++--
 .../python-modules/streamz/default.nix        |  60 +++--
 pkgs/top-level/python-aliases.nix             |   1 -
 pkgs/top-level/python-packages.nix            |   2 +
 18 files changed, 406 insertions(+), 333 deletions(-)
 create mode 100644 pkgs/development/python-modules/dask-expr/default.nix

diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix
index ce96b50ca49b..0063cd3f851f 100644
--- a/pkgs/development/python-modules/awkward-cpp/default.nix
+++ b/pkgs/development/python-modules/awkward-cpp/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "awkward-cpp";
-  version = "44";
+  version = "43";
   pyproject = true;
 
   src = fetchPypi {
     pname = "awkward_cpp";
     inherit version;
-    hash = "sha256-jcSZKI1tFrLqILUaJ9UEflGiR7aqz8vLOzAsrW08h9g=";
+    hash = "sha256-we11WW7IKvZm2ghLW/gF2bcsg1MtA10rZeB5WQXSXq0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index 6124a408e605..8722a72cf635 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
+  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -13,27 +13,29 @@
   fsspec,
   numpy,
   packaging,
+  typing-extensions,
+  importlib-metadata,
 
-  # tests
+  # checks
   numba,
+  setuptools,
   numexpr,
   pandas,
   pyarrow,
   pytest-xdist,
   pytestCheckHook,
-  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "2.7.4";
+  version = "2.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "awkward";
     tag = "v${version}";
-    hash = "sha256-OXSl+8sfrx+JlLu40wHf+98WVNNwm9uxvsnGXRDztDg=";
+    hash = "sha256-nOKMwAQ5t8tc64bEKz0j8JxxoVQQu39Iu8Zr9cqSx7A=";
   };
 
   build-system = [
@@ -41,12 +43,15 @@ buildPythonPackage rec {
     hatchling
   ];
 
-  dependencies = [
-    awkward-cpp
-    fsspec
-    numpy
-    packaging
-  ];
+  dependencies =
+    [
+      awkward-cpp
+      fsspec
+      numpy
+      packaging
+    ]
+    ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
+    ++ lib.optionals (pythonOlder "3.12") [ importlib-metadata ];
 
   dontUseCmakeConfigure = true;
 
@@ -55,35 +60,19 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     fsspec
     numba
+    setuptools
     numexpr
     pandas
     pyarrow
     pytest-xdist
     pytestCheckHook
-    setuptools
   ];
 
-  disabledTests = [
-    # pyarrow.lib.ArrowInvalid
-    "test_recordarray"
+  disabledTestPaths = [
+    # Need to be run on a GPU platform.
+    "tests-cuda"
   ];
 
-  disabledTestPaths =
-    [
-      # Need to be run on a GPU platform.
-      "tests-cuda"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # Fatal Python error: Segmentation fault at:
-      # numba/typed/typedlist.py", line 344 in append
-      "tests/test_0118_numba_cpointers.py"
-      "tests/test_0397_arrays_as_constants_in_numba.py"
-      "tests/test_1677_array_builder_in_numba.py"
-      "tests/test_2055_array_builder_check.py"
-      "tests/test_2349_growablebuffer_in_numba.py"
-      "tests/test_2408_layoutbuilder_in_numba.py"
-    ];
-
   meta = {
     description = "Manipulate JSON-like data with NumPy-like idioms";
     homepage = "https://github.com/scikit-hep/awkward";
diff --git a/pkgs/development/python-modules/catboost/default.nix b/pkgs/development/python-modules/catboost/default.nix
index 86c1211aead0..d0fc77b70038 100644
--- a/pkgs/development/python-modules/catboost/default.nix
+++ b/pkgs/development/python-modules/catboost/default.nix
@@ -22,8 +22,8 @@ buildPythonPackage rec {
     pname
     version
     src
+    meta
     ;
-
   pyproject = true;
 
   sourceRoot = "${src.name}/catboost/python-package";
@@ -55,9 +55,4 @@ buildPythonPackage rec {
   doCheck = false;
 
   pythonImportsCheck = [ "catboost" ];
-
-  meta = catboost.meta // {
-    # Incompatible with numpy >= 2.0
-    broken = true;
-  };
 }
diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix
index 0710ca0f5dba..5e61b17c5c2d 100644
--- a/pkgs/development/python-modules/coffea/default.nix
+++ b/pkgs/development/python-modules/coffea/default.nix
@@ -57,10 +57,6 @@ buildPythonPackage rec {
     hatch-vcs
   ];
 
-  pythonRelaxDeps = [
-    "dask"
-  ];
-
   dependencies = [
     aiohttp
     awkward
@@ -110,10 +106,6 @@ buildPythonPackage rec {
     # AssertionError: bug in Awkward Array: attempt to convert TypeTracerArray into a concrete array
     "test_apply_to_fileset"
     "test_lorentz_behavior"
-
-    # ValueError: The array to mask was deleted before it could be masked.
-    # If you want to construct this mask, you must either keep the array alive or use 'ak.mask' explicitly.
-    "test_read_nanomc"
   ];
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix
index 8031a140ffbf..a0d8b63fe06a 100644
--- a/pkgs/development/python-modules/dask-awkward/default.nix
+++ b/pkgs/development/python-modules/dask-awkward/default.nix
@@ -16,7 +16,7 @@
   # optional-dependencies
   pyarrow,
 
-  # tests
+  # checks
   dask-histogram,
   distributed,
   hist,
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "dask-awkward";
-  version = "2025.2.0";
+  version = "2024.12.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask-contrib";
     repo = "dask-awkward";
     tag = version;
-    hash = "sha256-hhAY2cPUOYnP86FGsLvxlMeoEwY+sTrjPMKyuZrO0/M=";
+    hash = "sha256-pL1LDW/q78V/c3Bha38k40018MFO+i8X6htYNdcsy7s=";
   };
 
   build-system = [
@@ -53,8 +53,8 @@ buildPythonPackage rec {
     io = [ pyarrow ];
   };
 
-  nativeCheckInputs = [
-    # dask-histogram (circular dependency)
+  checkInputs = [
+    dask-histogram
     distributed
     hist
     pandas
@@ -86,7 +86,7 @@ buildPythonPackage rec {
   meta = {
     description = "Native Dask collection for awkward arrays, and the library to use it";
     homepage = "https://github.com/dask-contrib/dask-awkward";
-    changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${version}";
+    changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
   };
diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix
new file mode 100644
index 000000000000..c7bb6c734ee9
--- /dev/null
+++ b/pkgs/development/python-modules/dask-expr/default.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+  versioneer,
+
+  # dependencies
+  dask,
+  pandas,
+  pyarrow,
+
+  # checks
+  jinja2,
+  pytestCheckHook,
+  xarray,
+}:
+
+buildPythonPackage rec {
+  pname = "dask-expr";
+  version = "1.1.21";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dask";
+    repo = "dask-expr";
+    tag = "v${version}";
+    hash = "sha256-t1vPlTxV5JYArg/a7CzPP13NHbstEoCgHRmd8Y9mDfA=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "versioneer[toml]==0.28" "versioneer[toml]"
+  '';
+
+  build-system = [
+    setuptools
+    versioneer
+  ];
+
+  dependencies = [
+    dask
+    pandas
+    pyarrow
+  ];
+
+  pythonImportsCheck = [ "dask_expr" ];
+
+  nativeCheckInputs = [
+    jinja2
+    pytestCheckHook
+    xarray
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
+    description = "Rewrite of Dask DataFrame that includes query optimization and generally improved organization";
+    homepage = "https://github.com/dask/dask-expr";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix
index 97cfa6100313..a4bead52b43b 100644
--- a/pkgs/development/python-modules/dask-glm/default.nix
+++ b/pkgs/development/python-modules/dask-glm/default.nix
@@ -1,46 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  setuptools-scm,
-
-  # dependencies
   cloudpickle,
+  dask,
   distributed,
+  fetchPypi,
   multipledispatch,
+  pytestCheckHook,
+  pythonOlder,
   scikit-learn,
   scipy,
+  setuptools-scm,
   sparse,
-  dask,
-
-  # tests
-  pytest-xdist,
-  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "dask-glm";
   version = "0.3.2";
-  pyproject = true;
+  format = "setuptools";
 
-  src = fetchFromGitHub {
-    owner = "dask";
-    repo = "dask-glm";
-    tag = version;
-    hash = "sha256-q98QMmw1toashimS16of54cgZgIPqkua3xGD1FZ1nTc=";
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-yUelZoZmmKAdeZeK5zIzy16DitXq1ghRQ1gsXpMLmko=";
   };
 
-  # ValueError: The truth value of an empty array is ambiguous. Use `array.size > 0` to check that an array is not empty.
-  postPatch = ''
-    substituteInPlace dask_glm/utils.py \
-      --replace-fail "if arr:" "if (arr is not None) and (arr.size > 0):"
-  '';
+  nativeBuildInputs = [ setuptools-scm ];
 
-  build-system = [ setuptools-scm ];
-
-  dependencies = [
+  propagatedBuildInputs = [
     cloudpickle
     distributed
     multipledispatch
@@ -50,24 +38,30 @@ buildPythonPackage rec {
   ] ++ dask.optional-dependencies.array;
 
   nativeCheckInputs = [
-    pytest-xdist
+    sparse
     pytestCheckHook
   ];
 
   pythonImportsCheck = [ "dask_glm" ];
 
+  disabledTestPaths = [
+    # Circular dependency with dask-ml
+    "dask_glm/tests/test_estimators.py"
+    # Test tries to imort an obsolete method
+    "dask_glm/tests/test_utils.py"
+  ];
+
   disabledTests = [
-    # ValueError: <class 'bool'> can be computed for one-element arrays only.
-    "test_dot_with_sparse"
+    # missing fixture with distributed>=2022.8.0
+    "test_determinism_distributed"
   ];
 
   __darwinAllowLocalNetworking = true;
 
-  meta = {
+  meta = with lib; {
     description = "Generalized Linear Models with Dask";
     homepage = "https://github.com/dask/dask-glm/";
-    changelog = "https://github.com/dask/dask-glm/releases/tag/${version}";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ GaetanLepage ];
+    license = licenses.bsd3;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix
index 98692269069d..fc6af4c39c6b 100644
--- a/pkgs/development/python-modules/dask-histogram/default.nix
+++ b/pkgs/development/python-modules/dask-histogram/default.nix
@@ -10,7 +10,6 @@
   # dependencies
   boost-histogram,
   dask,
-  dask-awkward,
 
   # tests
   pytestCheckHook,
@@ -18,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "dask-histogram";
-  version = "2025.2.0";
+  version = "2024.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask-contrib";
     repo = "dask-histogram";
     tag = version;
-    hash = "sha256-5Ec/qzVc/7LDG6SJym1e76BbxmbVjKKQHckwtTs1+6M=";
+    hash = "sha256-chznfEsMFuIioIlTz6uNpVAkjMMoMXjS62R4luKxVZQ=";
   };
 
   build-system = [
@@ -36,7 +35,6 @@ buildPythonPackage rec {
   dependencies = [
     boost-histogram
     dask
-    dask-awkward
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];
@@ -46,7 +44,7 @@ buildPythonPackage rec {
   meta = {
     description = "Histograms with task scheduling";
     homepage = "https://dask-histogram.readthedocs.io/";
-    changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${version}";
+    changelog = "https://github.com/dask-contrib/dask-histogram/releases/tag/${src.tag}";
     license = with lib.licenses; [ bsd3 ];
     maintainers = with lib.maintainers; [ veprbl ];
   };
diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix
index 599e99853ad8..a297902bc684 100644
--- a/pkgs/development/python-modules/dask-image/default.nix
+++ b/pkgs/development/python-modules/dask-image/default.nix
@@ -1,21 +1,15 @@
 {
   lib,
   buildPythonPackage,
+  pythonOlder,
   fetchFromGitHub,
-
-  # build-system
   setuptools,
   setuptools-scm,
-
-  # dependencies
   dask,
   numpy,
   scipy,
   pandas,
   pims,
-
-  # tests
-  pyarrow,
   pytestCheckHook,
   scikit-image,
 }:
@@ -25,6 +19,8 @@ buildPythonPackage rec {
   version = "2024.5.3";
   pyproject = true;
 
+  disabled = pythonOlder "3.9";
+
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-image";
@@ -32,11 +28,6 @@ buildPythonPackage rec {
     hash = "sha256-kXCAqJ2Zgo/2Khvo2YcK+n4oGM219GyQ2Hsq9re1Lac=";
   };
 
-  postPatch = ''
-    substituteInPlace dask_image/ndinterp/__init__.py \
-      --replace-fail "out_bounds.ptp(axis=1)" "np.ptp(out_bounds, axis=1)"
-  '';
-
   build-system = [
     setuptools
     setuptools-scm
@@ -51,27 +42,15 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pyarrow
     pytestCheckHook
     scikit-image
   ];
 
   pythonImportsCheck = [ "dask_image" ];
 
-  disabledTests = [
-    # The following tests are from 'tests/test_dask_image/test_ndmeasure/test_find_objects.py' and
-    # fail because of errrors on numpy slices
-    # AttributeError: 'str' object has no attribute 'start'
-    "test_find_objects"
-    "test_3d_find_objects"
-    # AssertionError (comparing slices)
-    "test_find_objects_with_empty_chunks"
-  ];
-
   meta = {
     description = "Distributed image processing";
     homepage = "https://github.com/dask/dask-image";
-    changelog = "https://github.com/dask/dask-image/releases/tag/v${version}";
     license = lib.licenses.bsdOriginal;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix
index f30adb7ff246..e3949fde678b 100644
--- a/pkgs/development/python-modules/dask-ml/default.nix
+++ b/pkgs/development/python-modules/dask-ml/default.nix
@@ -3,13 +3,14 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   hatch-vcs,
   hatchling,
+  setuptools-scm,
 
   # dependencies
+  dask-expr,
   dask-glm,
   distributed,
   multipledispatch,
@@ -28,23 +29,25 @@
 
 buildPythonPackage rec {
   pname = "dask-ml";
-  version = "2025.1.0";
+  version = "2024.4.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-ml";
     tag = "v${version}";
-    hash = "sha256-DHxx0LFuJmGWYuG/WGHj+a5XHAEekBmlHUUb90rl2IY=";
+    hash = "sha256-ZiBpCk3b4Tk0Hwb4uapJLEx+Nb/qHFROCnkBTNGDzoU=";
   };
 
   build-system = [
     hatch-vcs
     hatchling
+    setuptools-scm
   ];
 
   dependencies =
     [
+      dask-expr
       dask-glm
       distributed
       multipledispatch
@@ -70,14 +73,39 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTestPaths = [
-    # AttributeError: module 'numpy' has no attribute 'product'
-    "tests/test_svd.py"
-  ];
+  disabledTestPaths =
+    [
+      # AttributeError: 'csr_matrix' object has no attribute 'A'
+      # Fixed in https://github.com/dask/dask-ml/pull/996
+      "tests/test_svd.py"
+
+      # Tests fail with dask>=0.11.2
+      # RuntimeError: Not enough arguments provided
+      # Reported in https://github.com/dask/dask-ml/issues/1003
+      "tests/model_selection/test_incremental.py"
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      # RuntimeError: Not enough arguments provided: missing keys
+      "tests/model_selection/test_hyperband.py"
+      "tests/model_selection/test_incremental.py"
+      "tests/model_selection/test_incremental_warns.py"
+      "tests/model_selection/test_successive_halving.py"
+    ];
 
   disabledTests = [
-    # AssertionError: Regex pattern did not match.
-    "test_unknown_category_transform_array"
+    # Flaky: `Arrays are not almost equal to 3 decimals` (although values do actually match)
+    "test_whitening"
+
+    # Tests fail with dask>=0.11.2
+    # RuntimeError: Not enough arguments provided
+    # Reported in https://github.com/dask/dask-ml/issues/1003
+    "test_basic"
+    "test_hyperband_patience"
+    "test_same_random_state_same_params"
+    "test_search_patience_infeasible_tol"
+    "test_sha_max_iter_and_metadata"
+    "test_warns_decay_rate"
+    "test_warns_decay_rate_wanted"
   ];
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index b37ddce56526..93b38b11b1f7 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -26,127 +27,168 @@
   jinja2,
 
   # tests
+  arrow-cpp,
+  dask-expr,
   hypothesis,
   pytest-asyncio,
-  pytest-mock,
   pytest-rerunfailures,
   pytest-xdist,
   pytestCheckHook,
-  versionCheckHook,
 }:
 
-buildPythonPackage rec {
-  pname = "dask";
-  version = "2025.1.0";
-  pyproject = true;
+let
+  self = buildPythonPackage rec {
+    pname = "dask";
+    version = "2024.12.1";
+    pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "dask";
-    repo = "dask";
-    tag = version;
-    hash = "sha256-KBqOyf471mNg3L9dYmR7IRSltEtC+VgC+6ptsoKgVmM=";
-  };
+    src = fetchFromGitHub {
+      owner = "dask";
+      repo = "dask";
+      tag = version;
+      hash = "sha256-QqvdldAHW2UYt1NXfk3Aa+oe97e+OpRbF8d6eKV3OJ4=";
+    };
 
-  postPatch = ''
-    # versioneer hack to set version of GitHub package
-    echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
+    build-system = [ setuptools ];
 
-    substituteInPlace setup.py \
-      --replace-fail "import versioneer" "" \
-      --replace-fail "version=versioneer.get_version()," "version='${version}'," \
-      --replace-fail "cmdclass=versioneer.get_cmdclass()," ""
-
-    substituteInPlace pyproject.toml \
-      --replace-fail ', "versioneer[toml]==0.29"' "" \
-      --replace-fail " --durations=10" "" \
-      --replace-fail " --cov-config=pyproject.toml" "" \
-      --replace-fail "\"-v" "\" "
-  '';
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    click
-    cloudpickle
-    fsspec
-    packaging
-    partd
-    pyyaml
-    importlib-metadata
-    toolz
-  ];
-
-  optional-dependencies = lib.fix (self: {
-    array = [ numpy ];
-    complete =
-      [
-        pyarrow
-        lz4
-      ]
-      ++ self.array
-      ++ self.dataframe
-      ++ self.distributed
-      ++ self.diagnostics;
-    dataframe = [
-      pandas
-      pyarrow
-    ] ++ self.array;
-    distributed = [ distributed ];
-    diagnostics = [
-      bokeh
-      jinja2
+    dependencies = [
+      click
+      cloudpickle
+      fsspec
+      packaging
+      partd
+      pyyaml
+      importlib-metadata
+      toolz
     ];
-  });
 
-  nativeCheckInputs =
-    [
-      hypothesis
-      pytest-asyncio
-      pytest-mock
-      pytest-rerunfailures
-      pytest-xdist
-      pytestCheckHook
-      versionCheckHook
-      pyarrow
-    ]
-    ++ optional-dependencies.array
-    ++ optional-dependencies.dataframe;
-  versionCheckProgramArg = [ "--version" ];
+    optional-dependencies = lib.fix (self: {
+      array = [ numpy ];
+      complete =
+        [
+          pyarrow
+          lz4
+        ]
+        ++ self.array
+        ++ self.dataframe
+        ++ self.distributed
+        ++ self.diagnostics;
+      dataframe = [
+        # dask-expr -> circular dependency with dask-expr
+        numpy
+        pandas
+      ];
+      distributed = [ distributed ];
+      diagnostics = [
+        bokeh
+        jinja2
+      ];
+    });
 
-  pytestFlagsArray = [
-    # Rerun failed tests up to three times
-    "--reruns 3"
-    # Don't run tests that require network access
-    "-m 'not network'"
-  ];
+    nativeCheckInputs =
+      [
+        dask-expr
+        pytestCheckHook
+        pytest-rerunfailures
+        pytest-xdist
+        # from panda[test]
+        hypothesis
+        pytest-asyncio
+      ]
+      ++ self.optional-dependencies.array
+      ++ self.optional-dependencies.dataframe
+      ++ lib.optionals (!arrow-cpp.meta.broken) [
+        # support is sparse on aarch64
+        pyarrow
+      ];
 
-  disabledTests = [
-    # UserWarning: Insufficient elements for `head`. 10 elements requested, only 5 elements available. Try passing larger `npartitions` to `head`.
-    "test_set_index_head_nlargest_string"
-  ];
+    dontUseSetuptoolsCheck = true;
 
-  __darwinAllowLocalNetworking = true;
+    postPatch = ''
+      # versioneer hack to set version of GitHub package
+      echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
 
-  pythonImportsCheck = [
-    "dask"
-    "dask.bag"
-    "dask.bytes"
-    "dask.diagnostics"
+      substituteInPlace setup.py \
+        --replace-fail "import versioneer" "" \
+        --replace-fail "version=versioneer.get_version()," "version='${version}'," \
+        --replace-fail "cmdclass=versioneer.get_cmdclass()," ""
 
-    # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs`
-    "dask.array"
-    # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs`
-    "dask.dataframe"
-    "dask.dataframe.io"
-    "dask.dataframe.tseries"
-  ];
+      substituteInPlace pyproject.toml \
+        --replace-fail ', "versioneer[toml]==0.29"' "" \
+        --replace-fail " --durations=10" "" \
+        --replace-fail " --cov-config=pyproject.toml" "" \
+        --replace-fail "\"-v" "\" "
+    '';
 
-  meta = {
-    description = "Minimal task scheduling abstraction";
-    mainProgram = "dask";
-    homepage = "https://dask.org/";
-    changelog = "https://docs.dask.org/en/latest/changelog.html";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ GaetanLepage ];
+    pytestFlagsArray = [
+      # Rerun failed tests up to three times
+      "--reruns 3"
+      # Don't run tests that require network access
+      "-m 'not network'"
+    ];
+
+    disabledTests =
+      lib.optionals stdenv.hostPlatform.isDarwin [
+        # Test requires features of python3Packages.psutil that are
+        # blocked in sandboxed-builds
+        "test_auto_blocksize_csv"
+        # AttributeError: 'str' object has no attribute 'decode'
+        "test_read_dir_nometa"
+      ]
+      ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+        # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly...
+        "test_foldby_tree_reduction"
+        "test_to_bag"
+      ]
+      ++ [
+        # https://github.com/dask/dask/issues/10347#issuecomment-1589683941
+        "test_concat_categorical"
+        # AttributeError: 'ArrowStringArray' object has no attribute 'tobytes'. Did you mean: 'nbytes'?
+        "test_dot"
+        "test_dot_nan"
+        "test_merge_column_with_nulls"
+        # FileNotFoundError: [Errno 2] No such file or directory: '/build/tmp301jryv_/createme/0.part'
+        "test_to_csv_nodir"
+        "test_to_json_results"
+        # FutureWarning: Those tests should be working fine when pandas will have been upgraded to 2.1.1
+        "test_apply"
+        "test_apply_infer_columns"
+      ];
+
+    __darwinAllowLocalNetworking = true;
+
+    pythonImportsCheck = [
+      "dask"
+      "dask.bag"
+      "dask.bytes"
+      "dask.diagnostics"
+    ];
+
+    doCheck = false;
+
+    # Enable tests via passthru to avoid cyclic dependency with dask-expr.
+    passthru.tests = {
+      check = self.overridePythonAttrs (old: {
+        doCheck = true;
+        pythonImportsCheck = [
+          # Requires the `dask.optional-dependencies.array` that are only in `nativeCheckInputs`
+          "dask.array"
+          # Requires the `dask.optional-dependencies.dataframe` that are only in `nativeCheckInputs`
+          "dask.dataframe"
+          "dask.dataframe.io"
+          "dask.dataframe.tseries"
+        ] ++ old.pythonImportsCheck;
+      });
+    };
+
+    meta = {
+      description = "Minimal task scheduling abstraction";
+      mainProgram = "dask";
+      homepage = "https://dask.org/";
+      changelog = "https://docs.dask.org/en/latest/changelog.html";
+      license = lib.licenses.bsd3;
+      maintainers = with lib.maintainers; [ GaetanLepage ];
+    };
   };
-}
+in
+self
diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix
index a69ae736a22a..4c9ee562011f 100644
--- a/pkgs/development/python-modules/devito/default.nix
+++ b/pkgs/development/python-modules/devito/default.nix
@@ -1,32 +1,27 @@
 {
   lib,
   stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  setuptools,
-
-  # dependencies
   anytree,
+  buildPythonPackage,
+  setuptools,
   cached-property,
   cgen,
   click,
   codepy,
   distributed,
+  fetchFromGitHub,
+  gcc,
   llvmPackages,
+  matplotlib,
   multidict,
   nbval,
   psutil,
   py-cpuinfo,
-  scipy,
-  sympy,
-
-  # tests
-  gcc,
-  matplotlib,
   pytest-xdist,
   pytestCheckHook,
+  pythonOlder,
+  scipy,
+  sympy,
 }:
 
 buildPythonPackage rec {
@@ -34,6 +29,8 @@ buildPythonPackage rec {
   version = "4.8.11";
   pyproject = true;
 
+  disabled = pythonOlder "3.8";
+
   src = fetchFromGitHub {
     owner = "devitocodes";
     repo = "devito";
@@ -45,9 +42,6 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace requirements-testing.txt \
       --replace-fail 'pooch; python_version >= "3.8"' "pooch"
-
-    substituteInPlace tests/test_builtins.py \
-      --replace-fail "from scipy.misc import ascent" "from scipy.datasets import ascent"
   '';
 
   pythonRemoveDeps = [ "pip" ];
@@ -105,10 +99,6 @@ buildPythonPackage rec {
       "test_stability_mpi"
       "test_subdomainset_mpi"
       "test_subdomains_mpi"
-
-      # Download dataset from the internet
-      "test_gs_2d_float"
-      "test_gs_2d_int"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
       # FAILED tests/test_unexpansion.py::Test2Pass::test_v0 - assert False
diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix
index a5c167aa603f..604eea8a8489 100644
--- a/pkgs/development/python-modules/mplhep/default.nix
+++ b/pkgs/development/python-modules/mplhep/default.nix
@@ -2,42 +2,36 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-
-  # build-system
-  hatch-vcs,
-  hatchling,
-
-  # dependencies
+  setuptools,
+  setuptools-scm,
   matplotlib,
   mplhep-data,
   numpy,
   packaging,
   uhi,
-
-  # tests
-  hist,
-  pytest-mock,
-  pytest-mpl,
   pytestCheckHook,
   scipy,
+  pytest-mpl,
+  pytest-mock,
   uproot,
+  hist,
 }:
 
 buildPythonPackage rec {
   pname = "mplhep";
-  version = "0.3.56";
+  version = "0.3.55";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "mplhep";
     tag = "v${version}";
-    hash = "sha256-sMJpJUEtIqmu7kCgZp43t9XLy/6nkDgKcxC4nFb+1po=";
+    hash = "sha256-7YkrrH9Bfn3ctjv+H6TXEDE8yS/wnjO7umuHIXeYTDU=";
   };
 
   build-system = [
-    hatch-vcs
-    hatchling
+    setuptools
+    setuptools-scm
   ];
 
   dependencies = [
@@ -49,12 +43,12 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    hist
-    pytest-mock
-    pytest-mpl
     pytestCheckHook
     scipy
+    pytest-mpl
+    pytest-mock
     uproot
+    hist
   ];
 
   disabledTests = [
@@ -68,7 +62,6 @@ buildPythonPackage rec {
   meta = {
     description = "Extended histogram plots on top of matplotlib and HEP compatible styling similar to current collaboration requirements (ROOT)";
     homepage = "https://github.com/scikit-hep/mplhep";
-    changelog = "https://github.com/scikit-hep/mplhep/releases/tag/v${version}";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ veprbl ];
   };
diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix
index f96998a32908..5aa36f62364c 100644
--- a/pkgs/development/python-modules/narwhals/default.nix
+++ b/pkgs/development/python-modules/narwhals/default.nix
@@ -1,36 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  hatchling,
-
-  # optional-dependencies
   # cudf,
   dask,
+  dask-expr,
+  duckdb,
+  fetchFromGitHub,
+  hatchling,
+  hypothesis,
   # modin,
   pandas,
   polars,
   pyarrow,
-
-  # tests
-  duckdb,
-  hypothesis,
   pytest-env,
   pytestCheckHook,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "narwhals";
-  version = "1.25.2";
+  version = "1.22.0";
   pyproject = true;
 
+  disabled = pythonOlder "3.8";
+
   src = fetchFromGitHub {
     owner = "narwhals-dev";
     repo = "narwhals";
     tag = "v${version}";
-    hash = "sha256-cp/Ang5RXLpgTdpOHRKz9fGN9D+SgFC5KhF3ukf8G+w=";
+    hash = "sha256-I6nJJiiW1v04YH70OPxXKeO80N52nnCPKRzJLILEWmw=";
   };
 
   build-system = [
@@ -41,6 +39,7 @@ buildPythonPackage rec {
     # cudf = [ cudf ];
     dask = [
       dask
+      dask-expr
     ];
     # modin = [ modin ];
     pandas = [ pandas ];
@@ -65,7 +64,7 @@ buildPythonPackage rec {
   meta = {
     description = "Lightweight and extensible compatibility layer between dataframe libraries";
     homepage = "https://github.com/narwhals-dev/narwhals";
-    changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/v${version}";
+    changelog = "https://github.com/narwhals-dev/narwhals/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix
index 81e567f46ec4..c09040d2beaa 100644
--- a/pkgs/development/python-modules/sparse/default.nix
+++ b/pkgs/development/python-modules/sparse/default.nix
@@ -1,21 +1,15 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  setuptools,
-  setuptools-scm,
-
-  # dependencies
+  dask,
+  fetchPypi,
   numba,
   numpy,
+  pytest7CheckHook,
+  pythonOlder,
+  setuptools,
+  setuptools-scm,
   scipy,
-
-  # tests
-  dask,
-  pytest-cov-stub,
-  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -23,13 +17,18 @@ buildPythonPackage rec {
   version = "0.15.5";
   pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "pydata";
-    repo = "sparse";
-    tag = version;
-    hash = "sha256-W4rcq7G/bQsT9oTLieOzWNst5LnIAelRMbm+uUPeQgs=";
+  disabled = pythonOlder "3.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-THbODJb1zVwxt+eeZQ8AIkJMKxbwXxAEnpxjge5L4mY=";
   };
 
+  postPatch = ''
+    substituteInPlace pytest.ini \
+      --replace-fail "--cov-report term-missing --cov-report html --cov-report=xml --cov-report=term --cov sparse --cov-config .coveragerc --junitxml=junit/test-results.xml" ""
+  '';
+
   build-system = [
     setuptools
     setuptools-scm
@@ -43,23 +42,22 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     dask
-    pytest-cov-stub
-    pytestCheckHook
+    pytest7CheckHook
   ];
 
   pythonImportsCheck = [ "sparse" ];
 
-  meta = {
+  pytestFlagsArray = [
+    "-W"
+    "ignore::pytest.PytestRemovedIn8Warning"
+  ];
+
+  meta = with lib; {
     description = "Sparse n-dimensional arrays computations";
     homepage = "https://sparse.pydata.org/";
     changelog = "https://sparse.pydata.org/en/stable/changelog.html";
     downloadPage = "https://github.com/pydata/sparse/releases/tag/${version}";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ GaetanLepage ];
-    badPlatforms = [
-      # Most tests fail with: Fatal Python error: Segmentation fault
-      # numba/typed/typedlist.py", line 344 in append
-      "aarch64-linux"
-    ];
+    license = licenses.bsd3;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix
index 5aab96e7c462..eea52b8fa8f2 100644
--- a/pkgs/development/python-modules/streamz/default.nix
+++ b/pkgs/development/python-modules/streamz/default.nix
@@ -1,24 +1,23 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
+  pythonOlder,
+  fetchPypi,
   setuptools,
-
-  # dependencies
+  confluent-kafka,
+  dask,
+  dask-expr,
+  distributed,
+  flaky,
+  graphviz,
+  networkx,
+  pytest-asyncio,
+  pytestCheckHook,
+  requests,
   six,
   toolz,
   tornado,
   zict,
-
-  # tests
-  dask,
-  distributed,
-  flaky,
-  pandas,
-  pyarrow,
-  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -26,16 +25,17 @@ buildPythonPackage rec {
   version = "0.6.4";
   pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "python-streamz";
-    repo = "streamz";
-    tag = version;
-    hash = "sha256-lSb3gl+TSIzz4BZzxH8zXu74HvzSntOAoVQUUJKIEvA=";
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-VXfWkEwuxInBQVQJV3IQXgGVRkiBmYfUZCBMbjyWNPM=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
+    networkx
     six
     toolz
     tornado
@@ -43,12 +43,15 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    confluent-kafka
     dask
+    dask-expr
     distributed
     flaky
-    pandas
-    pyarrow
+    graphviz
+    pytest-asyncio
     pytestCheckHook
+    requests
   ];
 
   pythonImportsCheck = [ "streamz" ];
@@ -60,17 +63,24 @@ buildPythonPackage rec {
     "test_partition_then_scatter_sync"
     "test_sync"
     "test_sync_2"
-
+    # Test fail in the sandbox
+    "test_tcp_async"
+    "test_tcp"
+    "test_partition_timeout"
     # Tests are flaky
+    "test_from_iterable"
     "test_buffer"
   ];
 
-  __darwinAllowLocalNetworking = true;
+  disabledTestPaths = [
+    # Disable kafka tests
+    "streamz/tests/test_kafka.py"
+  ];
 
-  meta = {
+  meta = with lib; {
     description = "Pipelines to manage continuous streams of data";
     homepage = "https://github.com/python-streamz/streamz";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ GaetanLepage ];
+    license = licenses.bsd3;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index c87843dcb618..434e1b6f3cd9 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -142,7 +142,6 @@ mapAliases ({
   cx_Freeze = cx-freeze; # added 2023-08-02
   cx_oracle = cx-oracle; # added 2024-01-03
   d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30
-  dask-expr = throw "dask-expr was removed because its features are available in dask"; # added 2025-02-07
   dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24
   dash-renderer = throw "dash-renderer has been removed since it is abandoned"; # added 2025-01-01
   dateutil = python-dateutil; # added 2021-07-03
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 687c342fd174..013e7f91fb05 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2961,6 +2961,8 @@ self: super: with self; {
 
   dask-awkward = callPackage ../development/python-modules/dask-awkward { };
 
+  dask-expr = callPackage ../development/python-modules/dask-expr { };
+
   dask-gateway = callPackage ../development/python-modules/dask-gateway { };
 
   dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { };

From 221ea50b3242eac20666ca0cdcf776f56b109cb9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 11 Feb 2025 08:00:58 +0000
Subject: [PATCH 70/75] sqlitestudio: 3.4.15 -> 3.4.16

---
 pkgs/by-name/sq/sqlitestudio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix
index 15f1a546e1e4..6837ddbba635 100644
--- a/pkgs/by-name/sq/sqlitestudio/package.nix
+++ b/pkgs/by-name/sq/sqlitestudio/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "sqlitestudio";
-  version = "3.4.15";
+  version = "3.4.16";
 
   src = fetchFromGitHub {
     owner = "pawelsalawa";
     repo = "sqlitestudio";
     rev = version;
-    hash = "sha256-wMkTvw0zGl01511udpk3zZQygVWkmYp1QB+HsghWzNg=";
+    hash = "sha256-N+WizF7R23GUtCBvGggoONag5F53ugKHaxWP67i7hO8=";
   };
 
   nativeBuildInputs =

From baf9539e172212f580a167c3352545bfee6b4a96 Mon Sep 17 00:00:00 2001
From: Martin Thuemmler <martin.thuemmler@uni-jena.de>
Date: Fri, 20 Dec 2024 14:21:12 +0100
Subject: [PATCH 71/75] quantum-espresso: 7.2 -> 7.4.1

---
 .../chemistry/quantum-espresso/default.nix    |  9 ++-
 .../quantum-espresso/findLibxc.patch          | 70 +++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/science/chemistry/quantum-espresso/findLibxc.patch

diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
index 2156c1d26969..3c2604e59df6 100644
--- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix
+++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix
@@ -42,14 +42,14 @@ let
 
 in
 stdenv.mkDerivation rec {
-  version = "7.2";
+  version = "7.4.1";
   pname = "quantum-espresso";
 
   src = fetchFromGitLab {
     owner = "QEF";
     repo = "q-e";
     rev = "qe-${version}";
-    hash = "sha256-0q0QWX4BVjVHjcbKOBpjbBADuL+2S5LAALyrxmjVs4c=";
+    hash = "sha256-o1CjIuJCTtIud4zeHROksK1Ub9RL/OB8GecAQOIGf1s=";
   };
 
   # add git submodules manually and fix pkg-config file
@@ -77,6 +77,11 @@ stdenv.mkDerivation rec {
       --replace 'libdir="''${prefix}/@CMAKE_INSTALL_LIBDIR@"' 'libdir="@CMAKE_INSTALL_FULL_LIBDIR@"'
   '';
 
+  patches = [
+    # this patch reverts commit 5fb5a679, which enforced static library builds.
+    ./findLibxc.patch
+  ];
+
   passthru = { inherit mpi; };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/science/chemistry/quantum-espresso/findLibxc.patch b/pkgs/applications/science/chemistry/quantum-espresso/findLibxc.patch
new file mode 100644
index 000000000000..76c592360c97
--- /dev/null
+++ b/pkgs/applications/science/chemistry/quantum-espresso/findLibxc.patch
@@ -0,0 +1,70 @@
+diff --git a/cmake/FindLibxc.cmake b/cmake/FindLibxc.cmake
+index 011a36b77..226f38051 100644
+--- a/cmake/FindLibxc.cmake
++++ b/cmake/FindLibxc.cmake
+@@ -1,45 +1,50 @@
+-include(FindPackageHandleStandardArgs)
+-find_package(PkgConfig REQUIRED)
+-
+ pkg_search_module(_LIBXC libxc>=${Libxc_FIND_VERSION})
+
+-find_library(LIBXC_LIBRARIES NAMES libxc.a
++find_library(LIBXC_LIBRARIES NAMES xc
+   PATH_SUFFIXES lib
+   HINTS
+-  ${LIBXC_ROOT}
+   ENV EBROOTLIBXC
+   ENV LIBXCROOT
+   ${_LIBXC_LIBRARY_DIRS}
+   DOC "libxc libraries list")
+
+-find_library(LIBXC_LIBRARIES_F03 NAMES libxcf03.a
++find_library(LIBXC_LIBRARIES_F90 NAMES xcf90
+   PATH_SUFFIXES lib
+   HINTS
+-  ${LIBXC_ROOT}
+   ENV EBROOTLIBXC
+   ENV LIBXCROOT
+   ${_LIBXC_LIBRARY_DIRS}
+   DOC "libxc libraries list")
+
++find_library(LIBXC_LIBRARIES_F03 NAMES xcf03
++  PATH_SUFFIXES lib
++  HINTS
++  ENV EBROOTLIBXC
++  ENV LIBXCROOT
++  ${_LIBXC_LIBRARY_DIRS})
+ find_path(LIBXC_INCLUDE_DIR NAMES xc.h
+   PATH_SUFFIXES inc include
+   HINTS
+-  ${LIBXC_ROOT}
+   ${_LIBXC_INCLUDE_DIRS}
+   ENV EBROOTLIBXC
+   ENV LIBXCROOT)
+
++find_path(LIBXC_INCLUDE_DIR_F90 NAMES xc_f90_lib_m.mod
++  PATH_SUFFIXES inc include
++  HINTS
++  ${_LIBXC_INCLUDE_DIRS}
++  ENV EBROOTLIBXC
++  ENV LIBXCROOT)
+ find_path(LIBXC_INCLUDE_DIR_F03 NAMES xc_f03_lib_m.mod
+   PATH_SUFFIXES inc include
+   HINTS
+-  ${LIBXC_ROOT}
+   ${_LIBXC_INCLUDE_DIRS}
+   ENV EBROOTLIBXC
+   ENV LIBXCROOT)
+
+ find_package_handle_standard_args(Libxc DEFAULT_MSG LIBXC_LIBRARIES LIBXC_INCLUDE_DIR)
+
+-if (${Libxc_FOUND} AND LIBXC_LIBRARIES_F03 AND LIBXC_INCLUDE_DIR_F03)
++if (${Libxc_FOUND} AND LIBXC_LIBRARIES_F90 AND LIBXC_LIBRARIES_F03 AND LIBXC_INCLUDE_DIR_F90 AND LIBXC_INCLUDE_DIR_F03)
+   if(_LIBXC_VERSION)
+     set(Libxc_VERSION ${_LIBXC_VERSION})
+   else()
+@@ -53,4 +58,3 @@ if (${Libxc_FOUND} AND LIBXC_LIBRARIES_F03 AND LIBXC_INCLUDE_DIR_F03)
+ else()
+   unset(Libxc_FOUND)
+ endif()
+-

From 57fae8ff01eadc3a46404ce6c323adb3bc6cb1e2 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 11 Feb 2025 10:56:57 +0000
Subject: [PATCH 72/75] google-chrome: 132.0.6834.110 -> 133.0.6943.53

---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 5ce066824f60..f35d832b9c30 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenv.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "132.0.6834.110";
+    version = "133.0.6943.53";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-4mtVCiKXKnjmHlyYgnDneX9hOmYgafwZ230iFfH48Tc=";
+      hash = "sha256-73X2cohboI+GbFDk5ikjxnT1PKjG4UoyzhA9T9Qe9Vk=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -274,11 +274,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "132.0.6834.111";
+    version = "133.0.6943.54";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/acuc7atz5smv6q4nvkuutofbz6uq_132.0.6834.111/GoogleChrome-132.0.6834.111.dmg";
-      hash = "sha256-kC4MA57eeapnzCgyBuLNq9NBTFdcECMtoNwMzWd0KEg=";
+      url = "http://dl.google.com/release2/chrome/acyg7rfg57oedifn3wrcxvaq5duq_133.0.6943.54/GoogleChrome-133.0.6943.54.dmg";
+      hash = "sha256-VkLjnKjAgj9Fg21jh9Xl56XDBmG0OUuDsnj93rQvJ40=";
     };
 
     dontPatch = true;

From e135e7f1ae9dd7e9dc4b2924e20bfea19e1a9d98 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Mon, 10 Feb 2025 20:41:19 -0800
Subject: [PATCH 73/75] llvmPackages_git: 21.0.0-unstable-2025-02-01 ->
 21.0.0-unstable-2025-02-10

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 439be465f5de..f2ac815b4b2c 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -32,9 +32,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.0-rc1".officialRelease.sha256 = "sha256-yOczbperlR20+iLoao9g0CR+Ml2mjTCx1cqP/9WOhME=";
     "21.0.0-git".gitRelease = {
-      rev = "312055d1da169f043e65b35fcd62d6d685700114";
-      rev-version = "21.0.0-unstable-2025-02-01";
-      sha256 = "sha256-V14ypUGn7GxzchmKjoSH2oiHDUQa07b4bQWjjRpQKCo=";
+      rev = "c9f1d2cbf18990311ea1287cc154e3784a10a3b0";
+      rev-version = "21.0.0-unstable-2025-02-10";
+      sha256 = "sha256-ggH32zM85geN0c0LPLBv7VAObi67AxPlTJ4YgbT4s7M=";
     };
   } // llvmVersions;
 

From 18440f37482abb37fde3b946815e94cba1f81b83 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 10 Feb 2025 23:29:07 +0100
Subject: [PATCH 74/75] haskell.compiler.ghcjs810: set up EM_CACHE for emcc

The compiler function test now causes emcc to try and lock its
cache (which is located in the nix store unless we set EM_CACHE).

Resolves #376582.
---
 pkgs/development/compilers/ghcjs/8.10/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/ghcjs/8.10/default.nix b/pkgs/development/compilers/ghcjs/8.10/default.nix
index d3f74f52e86e..c46a84e87791 100644
--- a/pkgs/development/compilers/ghcjs/8.10/default.nix
+++ b/pkgs/development/compilers/ghcjs/8.10/default.nix
@@ -105,6 +105,9 @@ stdenv.mkDerivation {
     touch $HOME/.cabal/config
     cd lib/boot
 
+    export EM_CACHE="$HOME/.emscriptencache"
+    mkdir -p "$EM_CACHE"
+
     mkdir -p $out/bin
     mkdir -p $out/lib/${bootGhcjs.name}
     lndir ${bootGhcjs}/bin $out/bin

From eedce86ef01ad39165d79802e5acd66d81078241 Mon Sep 17 00:00:00 2001
From: Naxdy <naxdy@naxdy.org>
Date: Sun, 5 Jan 2025 13:26:53 +0100
Subject: [PATCH 75/75] blackmagic-desktop-video: 14.2a1 -> 14.4.1a4

---
 pkgs/by-name/bl/blackmagic-desktop-video/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
index 55cbe5332089..56c7ef7a63ab 100644
--- a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
+++ b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
@@ -11,7 +11,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "blackmagic-desktop-video";
-  version = "14.2a1";
+  version = "14.4.1a4";
 
   buildInputs = [
     autoPatchelfHook
@@ -25,15 +25,15 @@ stdenv.mkDerivation (finalAttrs: {
   src =
     let
       # from the URL the download page where you click the "only download" button is at
-      REFERID = "b97e55f37a0042fbacd234971d8c93ed";
+      REFERID = "5baba0af3eda41ee9cd0ec7349660d74";
       # from the URL that the POST happens to, see browser console
-      DOWNLOADID = "552546307a7c4de29ea6d09a6ca08c90";
+      DOWNLOADID = "bc31044728f146859c6d9e0ccef868d8";
     in
     runCommandLocal "${finalAttrs.pname}-${lib.versions.majorMinor finalAttrs.version}-src.tar.gz"
       {
         outputHashMode = "recursive";
         outputHashAlgo = "sha256";
-        outputHash = "sha256-rfZDL1YvAuMD5u68MMyiT8cERsIHMc9K25lXt7cqrrk=";
+        outputHash = "sha256-qh305s7u1yurv58TZnlONgDmWT4RXG3fXTfun382HAs=";
 
         impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 
@@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
           "platform" = "Linux";
           "policy" = true;
         };
-
       }
       ''
         RESOLVEURL=$(curl \