From a9edd0998786316de77d6c64eb233f4d28e18995 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 14 Jul 2024 17:51:20 +0100
Subject: [PATCH 01/64] cc-wrapper hardeningFlags tests: add tests for pacret &
 shadowstack

---
 pkgs/test/cc-wrapper/hardening.nix | 75 ++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/pkgs/test/cc-wrapper/hardening.nix b/pkgs/test/cc-wrapper/hardening.nix
index 270e9a2e8761..9ab7e26ba0ca 100644
--- a/pkgs/test/cc-wrapper/hardening.nix
+++ b/pkgs/test/cc-wrapper/hardening.nix
@@ -3,6 +3,7 @@
 , runCommand
 , runCommandWith
 , runCommandCC
+, bintools
 , hello
 , debian-devscripts
 }:
@@ -130,6 +131,56 @@ let
   '';
 
   brokenIf = cond: drv: if cond then drv.overrideAttrs (old: { meta = old.meta or {} // { broken = true; }; }) else drv;
+  overridePlatforms = platforms: drv: drv.overrideAttrs (old: { meta = old.meta or {} // { inherit platforms; }; });
+
+  instructionPresenceTest = label: mnemonicPattern: testBin: expectFailure: runCommand "${label}-instr-test" {
+    nativeBuildInputs = [
+      bintools
+    ];
+    buildInputs = [
+      testBin
+    ];
+  } ''
+    touch $out
+    if $OBJDUMP -d \
+      --no-addresses \
+      --no-show-raw-insn \
+      "$(PATH=$HOST_PATH type -P test-bin)" \
+      | grep -E '${mnemonicPattern}' > /dev/null ; then
+      echo "Found ${label} instructions" >&2
+      ${lib.optionalString expectFailure "exit 1"}
+    else
+      echo "Did not find ${label} instructions" >&2
+      ${lib.optionalString (!expectFailure) "exit 1"}
+    fi
+  '';
+
+  pacRetTest = testBin: expectFailure: overridePlatforms [ "aarch64-linux" ] (
+    instructionPresenceTest "pacret" "\\bpaciasp\\b" testBin expectFailure
+  );
+
+  elfNoteTest = label: pattern: testBin: expectFailure: runCommand "${label}-elf-note-test" {
+    nativeBuildInputs = [
+      bintools
+    ];
+    buildInputs = [
+      testBin
+    ];
+  } ''
+    touch $out
+    if $READELF -n "$(PATH=$HOST_PATH type -P test-bin)" \
+      | grep -E '${pattern}' > /dev/null ; then
+      echo "Found ${label} note" >&2
+      ${lib.optionalString expectFailure "exit 1"}
+    else
+      echo "Did not find ${label} note" >&2
+      ${lib.optionalString (!expectFailure) "exit 1"}
+    fi
+  '';
+
+  shadowStackTest = testBin: expectFailure: brokenIf stdenv.hostPlatform.isMusl (overridePlatforms [ "x86_64-linux" ] (
+    elfNoteTest "shadowstack" "\\bSHSTK\\b" testBin expectFailure
+  ));
 
 in nameDrvAfterAttrName ({
   bindNowExplicitEnabled = brokenIf stdenv.hostPlatform.isStatic (checkTestBin (f2exampleWithStdEnv stdenv {
@@ -197,6 +248,14 @@ in nameDrvAfterAttrName ({
     ignoreStackClashProtection = false;
   });
 
+  pacRetExplicitEnabled = pacRetTest (helloWithStdEnv stdenv {
+    hardeningEnable = [ "pacret" ];
+  }) false;
+
+  shadowStackExplicitEnabled = shadowStackTest (f1exampleWithStdEnv stdenv {
+    hardeningEnable = [ "shadowstack" ];
+  }) false;
+
   bindNowExplicitDisabled = checkTestBin (f2exampleWithStdEnv stdenv {
     hardeningDisable = [ "bindnow" ];
   }) {
@@ -264,6 +323,14 @@ in nameDrvAfterAttrName ({
     expectFailure = true;
   };
 
+  pacRetExplicitDisabled = pacRetTest (helloWithStdEnv stdenv {
+    hardeningDisable = [ "pacret" ];
+  }) true;
+
+  shadowStackExplicitDisabled = shadowStackTest (f1exampleWithStdEnv stdenv {
+    hardeningDisable = [ "shadowstack" ];
+  }) true;
+
   # most flags can't be "unsupported" by compiler alone and
   # binutils doesn't have an accessible hardeningUnsupportedFlags
   # mechanism, so can only test a couple of flags through altered
@@ -465,4 +532,12 @@ in {
     ignoreStackClashProtection = false;
     expectFailure = true;
   };
+
+  allExplicitDisabledPacRet = pacRetTest (helloWithStdEnv stdenv {
+    hardeningDisable = [ "all" ];
+  }) true;
+
+  allExplicitDisabledShadowStack = shadowStackTest (f1exampleWithStdEnv stdenv {
+    hardeningDisable = [ "all" ];
+  }) true;
 }))

From 61f481492906b2d386d562a48b1318bdfdc34943 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 31 Dec 2024 18:29:14 +0000
Subject: [PATCH 02/64] cargo-valgrind: 2.1.1 -> 2.2.1

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 pkgs/by-name/ca/cargo-valgrind/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix
index b14b2cce68da..3ac7053fd4c6 100644
--- a/pkgs/by-name/ca/cargo-valgrind/package.nix
+++ b/pkgs/by-name/ca/cargo-valgrind/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-valgrind";
-  version = "2.1.1";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "jfrimmel";
     repo = "cargo-valgrind";
-    rev = "v${version}";
-    sha256 = "sha256-l/1paghG/ARD0JfzNh0xj2UD5kW6FddM8Xrd/FCygYc=";
+    tag = version;
+    sha256 = "sha256-yUCDKklkfK+2n+THH4QlHb+FpeWfObXpmp4VozsFiUM=";
   };
 
-  cargoHash = "sha256-9/kIIZDIsOhUvRT3TyXN5PGFUB+a8m2yXmzBbsPUK28=";
+  cargoHash = "sha256-6vcTsernIVkemGhMBT9LMTsBsJ4u1Sd12BgIp4Zn3vg=";
 
   passthru = {
     updateScript = nix-update-script { };
@@ -33,6 +33,7 @@ rustPlatform.buildRustPackage rec {
   checkFlags = [
     "--skip examples_are_runnable"
     "--skip tests_are_runnable"
+    "--skip issue74"
   ];
 
   meta = with lib; {

From 1bf4dd81ff5e356a2c1c1e819d14f9adf0b09e83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jan 2025 15:21:42 +0000
Subject: [PATCH 03/64] hhexen: 1.6.3 -> 1.6.4

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

diff --git a/pkgs/by-name/hh/hhexen/package.nix b/pkgs/by-name/hh/hhexen/package.nix
index dbb4278fa9bd..4d3601cf43f5 100644
--- a/pkgs/by-name/hh/hhexen/package.nix
+++ b/pkgs/by-name/hh/hhexen/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hhexen";
-  version = "1.6.3";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "sezero";
     repo = "hhexen";
     rev = "hhexen-${finalAttrs.version}";
-    hash = "sha256-y3jKfU4e8R2pJQN/FN7W6KQ7D/P+7pmQkdmZug15ApI=";
+    hash = "sha256-D1gIdIqb6RN7TA7ezbBhy2Z82TH1quN8kgAMNRHMfhw=";
   };
 
   nativeBuildInputs = [

From d9013ff1bb51e1b5bb11ad324ba9ae055fa44d6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Dec 2024 21:56:49 +0000
Subject: [PATCH 04/64] python312Packages.craft-application: 4.6.0 -> 4.7.0

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

diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix
index 14ddeebae157..7716ce3b978d 100644
--- a/pkgs/development/python-modules/craft-application/default.nix
+++ b/pkgs/development/python-modules/craft-application/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "craft-application";
-  version = "4.6.0";
+  version = "4.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "canonical";
     repo = "craft-application";
     tag = version;
-    hash = "sha256-kDujv7iVUvPfP9g3Ofm0Vso+I6qKBOq9NlFpigd6+Tc=";
+    hash = "sha256-ywGXzcnWYynmDXjDbSpzn8SroQ7z5fajhlE3JqI3PNk=";
   };
 
   postPatch = ''

From 9ce6259fd13ec7ce0e9eeec214e9d0f626a913a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jan 2025 03:04:05 +0000
Subject: [PATCH 05/64] postgresqlPackages.pg_partman: 5.2.2 -> 5.2.4

---
 pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
index 80305213dc20..c3ffbbe2ce7d 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
@@ -8,13 +8,13 @@
 
 buildPostgresqlExtension rec {
   pname = "pg_partman";
-  version = "5.2.2";
+  version = "5.2.4";
 
   src = fetchFromGitHub {
     owner = "pgpartman";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-+T+JOGVOyxJH+mb0IhCJbSh+5DDlhaXvagy8C4lQizo=";
+    sha256 = "sha256-i/o+JZEXnJRO17kfdTw87aca28+I8pvuFZsPMA/kf+w=";
   };
 
   meta = with lib; {

From 846644b25b75b0bd3c2cc8291ff5b168f6b783ba Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 13:37:14 +0100
Subject: [PATCH 06/64] python312Packages.spacy: 3.8.2 -> 3.8.3

Changelog: https://github.com/explosion/spaCy/releases/tag/release-v3.8.3
---
 .../python-modules/spacy/default.nix          | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix
index 9f6dd8f79a59..990d8996d1b6 100644
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@@ -7,11 +7,14 @@
   cymem,
   cython_0,
   fetchPypi,
+  git,
   hypothesis,
   jinja2,
   langcodes,
   mock,
   murmurhash,
+  nix-update,
+  nix,
   numpy,
   packaging,
   preshed,
@@ -22,6 +25,8 @@
   setuptools,
   spacy-legacy,
   spacy-loggers,
+  spacy-lookups-data,
+  spacy-transformers,
   srsly,
   thinc,
   tqdm,
@@ -29,34 +34,34 @@
   wasabi,
   weasel,
   writeScript,
-  nix,
-  git,
-  nix-update,
 }:
 
 buildPythonPackage rec {
   pname = "spacy";
-  version = "3.8.2";
+  version = "3.8.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Szfr0lraQFmw3J4Ik+cN3l34NIUymgaO8EWA5wiSpl0=";
+    hash = "sha256-galn3D1qWgqaslBVlIP+IJIwZYKpGS+Yvnpjvc4nl/c=";
   };
 
+  postPatch = ''
+    sed -i "/numpy/d" pyproject.toml
+  '';
+
   build-system = [
     cymem
     cython_0
     murmurhash
     numpy
+    preshed
     thinc
   ];
 
-  pythonRelaxDeps = [
-    "thinc"
-  ];
+  pythonRelaxDeps = [ "thinc" ];
 
   dependencies = [
     catalogue
@@ -86,6 +91,11 @@ buildPythonPackage rec {
     mock
   ];
 
+  optional-dependencies = {
+    transformers = [ spacy-transformers ];
+    lookups = [ spacy-lookups-data ];
+  };
+
   # Fixes ModuleNotFoundError when running tests on Cythonized code. See #255262
   preCheck = ''
     cd $out
@@ -124,10 +134,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Industrial-strength Natural Language Processing (NLP)";
-    mainProgram = "spacy";
     homepage = "https://github.com/explosion/spaCy";
     changelog = "https://github.com/explosion/spaCy/releases/tag/release-v${version}";
     license = licenses.mit;
     maintainers = [ ];
+    mainProgram = "spacy";
   };
 }

From 1eaa2ce74763b265bcf3d20287c6809f4b5550ba Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 14:26:10 +0100
Subject: [PATCH 07/64] python312Packages.pyemd: refactor

---
 .../python-modules/pyemd/default.nix          | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix
index 16d5cde88691..583f51d1d37b 100644
--- a/pkgs/development/python-modules/pyemd/default.nix
+++ b/pkgs/development/python-modules/pyemd/default.nix
@@ -1,48 +1,50 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
-  fetchPypi,
   cython,
+  fetchPypi,
+  numpy,
   oldest-supported-numpy,
   packaging,
-  setuptools,
-  setuptools-scm,
-  wheel,
-  numpy,
   pytestCheckHook,
+  pythonOlder,
+  setuptools-scm,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pyemd";
   version = "1.0.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
-  format = "pyproject";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-tCta57LRWx1N7mOBDqeYo5IX6Kdre0nA62OoTg/ZAP4=";
   };
 
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
   nativeBuildInputs = [
     cython
     numpy
     oldest-supported-numpy
     packaging
-    setuptools
-    setuptools-scm
-    wheel
   ];
 
-  propagatedBuildInputs = [ numpy ];
+  dependencies = [ numpy ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = with lib; {
     description = "Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance";
     homepage = "https://github.com/wmayner/pyemd";
+    changelog = "https://github.com/wmayner/pyemd/releases/tag/${version}";
     license = licenses.mit;
+    maintainers = [ ];
   };
 }

From d7bfa3326cae92e595879cf3c5f27bb0bf90938c Mon Sep 17 00:00:00 2001
From: bretek <josephmadden999@gmail.com>
Date: Sun, 5 Jan 2025 16:28:26 +0000
Subject: [PATCH 08/64] maintainers: add bretek

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 17467ad8f852..d55bc2826526 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3314,6 +3314,13 @@
     github = "brendanreis";
     githubId = 10686906;
   };
+  bretek = {
+    email = "josephmadden999@gmail.com";
+    github = "bretek";
+    githubId = 79257746;
+    name = "Joseph Madden";
+    keys = [ { fingerprint = "3CF8 E983 2219 AB4B 0E19  158E 6112 1921 C9F8 117C"; } ];
+  };
   brettlyons = {
     email = "blyons@fastmail.com";
     github = "brettlyons";

From 53d915d81fd74d2ae8bd3eebcaa03958d684afba Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Mon, 6 Jan 2025 00:01:53 +0200
Subject: [PATCH 09/64] atuin: make cargoHash the same on Linux and Darwin

See #308089
---
 pkgs/by-name/at/atuin/package.nix | 36 +++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index 266ae4b0d5b0..ba46f7d97944 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -5,6 +5,8 @@
   installShellFiles,
   rustPlatform,
   nixosTests,
+  jq,
+  moreutils,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -18,12 +20,34 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-P/q4XYhpXo9kwiltA0F+rQNSlqI+s8TSi5v5lFJWJ/4=";
   };
 
-  # TODO: unify this to one hash because updater do not support this
-  cargoHash =
-    if stdenv.hostPlatform.isLinux then
-      "sha256-JDm7HWMaLSodpOhrR7rm6ZS/ATX/q8fRK+OJ/EKqg3U="
-    else
-      "sha256-mrsqaqJHMyNi3yFDIyAXFBS+LY71VWXE8O7mjvgI6lo=";
+  # the interim crate contains both README.md and readme.md,
+  # which causes a hash mismatch on systems with a case-insensitive filesystem.
+  # This removes the readme files and updates cargo's checksum file accordingly
+  depsExtraArgs = {
+    nativeBuildInputs = [
+      jq
+      moreutils
+    ];
+
+    postBuild = ''
+      pushd $name/interim
+
+      if [ -e readme.md ]; then
+        rm --force --verbose README.md readme.md
+        jq 'del(.files."README.md") | del(.files."readme.md")' \
+          .cargo-checksum.json -c \
+          | sponge .cargo-checksum.json
+
+        popd
+      else
+        echo "ERROR: the interim crate has been updated"
+        echo "When you see this message, please remove the workaround for the interim crate from the atuin nix expression"
+        exit 1
+      fi
+    '';
+  };
+
+  cargoHash = "sha256-l8DsQwEJZL9kr9UIpZzebDSRYET2WM8VFwk+O1Qk9oQ=";
 
   # atuin's default features include 'check-updates', which do not make sense
   # for distribution builds. List all other default features.

From c745ca0083b2e4f2d1d3746a0df9d6d73e873ca0 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 5 Jan 2025 23:43:09 +0100
Subject: [PATCH 10/64] lomiri.lomiri-content-hub: Fix example moving after
 project rename

---
 pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
index a2bb44340024..753dc120f3cf 100644
--- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelChecking = false;
 
   preFixup = ''
-    for exampleExe in content-hub-test-{importer,exporter,sharer}; do
+    for exampleExe in lomiri-content-hub-test-{importer,exporter,sharer}; do
       moveToOutput bin/$exampleExe $examples
       moveToOutput share/applications/$exampleExe.desktop $examples
     done

From f7fa929055ba0668856af788d2704451c1798699 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 6 Jan 2025 09:20:44 +0000
Subject: [PATCH 11/64] icloudpd: 1.25.0 -> 1.25.1

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

diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix
index 2725853f39bd..f1eca052c99a 100644
--- a/pkgs/by-name/ic/icloudpd/package.nix
+++ b/pkgs/by-name/ic/icloudpd/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "icloudpd";
-  version = "1.25.0";
+  version = "1.25.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "icloud-photos-downloader";
     repo = "icloud_photos_downloader";
     rev = "v${version}";
-    hash = "sha256-7I/mthqlV5+EWaLRlCmBZPJaf7dWm8alpUtmlxvUNsY=";
+    hash = "sha256-Wjei2hJpeVYVgShbbzikZk4yr71HoeP/caqU1ktDQbI=";
   };
 
   pythonRelaxDeps = true;

From 3783a0f250d17fccac59b12d0b80457be96af930 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 6 Jan 2025 09:33:28 +0000
Subject: [PATCH 12/64] charmcraft: disable two failing tests; broken upstream

---
 pkgs/by-name/ch/charmcraft/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix
index 83efaa904005..526da18da7bf 100644
--- a/pkgs/by-name/ch/charmcraft/package.nix
+++ b/pkgs/by-name/ch/charmcraft/package.nix
@@ -77,6 +77,8 @@ python3Packages.buildPythonApplication rec {
   disabledTests = [
     # Relies upon the `charm` tool being installed
     "test_validate_missing_charm"
+    "test_read_charm_from_yaml_file_self_contained_success[full-bases.yaml]"
+    "test_read_charm_from_yaml_file_self_contained_success[full-platforms.yaml]"
   ];
 
   passthru.updateScript = nix-update-script { };

From ab4fe0490b0dec8fb473e863329f0e50a7b8cf09 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 6 Jan 2025 09:34:54 +0000
Subject: [PATCH 13/64] snapcraft: disable broken test due to dependency
 difference in nixpkgs

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

diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index 77c4aaf02432..c7927f854cdf 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -170,6 +170,7 @@ python3Packages.buildPythonApplication rec {
     "test_lifecycle_write_component_metadata"
     "test_parse_info_integrated"
     "test_patch_elf"
+    "test_project_platform_unknown_name"
     "test_remote_builder_init"
     "test_setup_assets_remote_icon"
     "test_snap_command_fallback"

From 78ef63e579e96da1bc293056d9b237983c18576f Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 6 Jan 2025 09:35:41 +0000
Subject: [PATCH 14/64] rockcraft: disable broken test due to dependency
 difference in nixpkgs

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

diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix
index 38bf29563dd2..15857bf97414 100644
--- a/pkgs/by-name/ro/rockcraft/package.nix
+++ b/pkgs/by-name/ro/rockcraft/package.nix
@@ -48,6 +48,7 @@ python3Packages.buildPythonApplication rec {
   '';
 
   disabledTests = [
+    "test_project_all_platforms_invalid"
     "test_run_init_flask"
     "test_run_init_django"
   ];

From b2697bec57278fec8e02a766c2b94dbd6412b4e7 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 6 Jan 2025 09:54:10 +0000
Subject: [PATCH 15/64] python3Packages.pygit2: import upstream patch to fix
 Python 3.13 tests

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

diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index a9f0ad9ae17a..9f0e68834fc1 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -33,6 +33,11 @@ buildPythonPackage rec {
       url = "https://github.com/libgit2/pygit2/commit/eba710e45bb40e18641c6531394bb46631e7f295.patch";
       hash = "sha256-GFFzGVd/9+AcwicwOtBghhonijMp08svXTUZ/4/LmtI=";
     })
+    # temp fix for Python 3.13 until next release after 1.16.0
+    (fetchpatch {
+      url = "https://github.com/libgit2/pygit2/commit/7f143e1c5beec01ec3429aa4db12435ac02977d3.patch";
+      hash = "sha256-2SiFFPWVVo9urKRu64AejjTZMoXo2r+v1OwEIF+AzNo=";
+    })
   ];
 
   preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''

From aac3861371b34948a07e3f6e7821b021cf4c36d6 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 6 Jan 2025 09:59:41 +0000
Subject: [PATCH 16/64] python3Packages.craft-grammar: temporarily disable
 broken tests in Python 3.13

---
 pkgs/development/python-modules/craft-grammar/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/craft-grammar/default.nix b/pkgs/development/python-modules/craft-grammar/default.nix
index a9a73aaf0995..035c4c249b4b 100644
--- a/pkgs/development/python-modules/craft-grammar/default.nix
+++ b/pkgs/development/python-modules/craft-grammar/default.nix
@@ -37,6 +37,11 @@ buildPythonPackage rec {
 
   pytestFlagsArray = [ "tests/unit" ];
 
+  # Temp fix for test incompatibility with Python 3.13
+  disabledTests = [
+    "test_grammar_strlist_error[value2]"
+  ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 05fdade30155608975003902b670d4f54b180571 Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 6 Jan 2025 09:59:59 +0000
Subject: [PATCH 17/64] python3Packages.craft-application: temporarily disable
 broken tests in Python 3.13

---
 pkgs/development/python-modules/craft-application/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/craft-application/default.nix b/pkgs/development/python-modules/craft-application/default.nix
index 7716ce3b978d..e74061ddd7bc 100644
--- a/pkgs/development/python-modules/craft-application/default.nix
+++ b/pkgs/development/python-modules/craft-application/default.nix
@@ -103,6 +103,10 @@ buildPythonPackage rec {
       "test_to_yaml_file"
       # Tests expecting pytest-time
       "test_monitor_builds_success"
+      # Temporary fix until new release to support Python 3.13
+      "test_grammar_aware_part_error"
+      "test_grammar_aware_part_error[part2]"
+      "test_grammar_aware_project_error[project0]"
     ]
     ++ lib.optionals stdenv.hostPlatform.isAarch64 [
       # These tests have hardcoded "amd64" strings which fail on aarch64

From ed62714176e5dbb52ba80977f4b8e6a81bd11dc5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 6 Jan 2025 13:29:12 +0100
Subject: [PATCH 18/64] python312Packages.jaxopt: disable failing tests

---
 .../python-modules/jaxopt/default.nix         | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/jaxopt/default.nix b/pkgs/development/python-modules/jaxopt/default.nix
index 6d4c4a427444..211afb5ee57a 100644
--- a/pkgs/development/python-modules/jaxopt/default.nix
+++ b/pkgs/development/python-modules/jaxopt/default.nix
@@ -2,20 +2,24 @@
   lib,
   stdenv,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   fetchpatch,
-  pytest-xdist,
-  pytestCheckHook,
+
+  # build-system
   setuptools,
+
+  # dependencies
   absl-py,
-  cvxpy,
   jax,
-  jaxlib,
   matplotlib,
   numpy,
-  optax,
   scipy,
+
+  # tests
+  cvxpy,
+  optax,
+  pytest-xdist,
+  pytestCheckHook,
   scikit-learn,
 }:
 
@@ -24,8 +28,6 @@ buildPythonPackage rec {
   version = "0.8.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "google";
     repo = "jaxopt";
@@ -48,17 +50,16 @@ buildPythonPackage rec {
   dependencies = [
     absl-py
     jax
-    jaxlib
     matplotlib
     numpy
     scipy
   ];
 
   nativeCheckInputs = [
-    pytest-xdist
-    pytestCheckHook
     cvxpy
     optax
+    pytest-xdist
+    pytestCheckHook
     scikit-learn
   ];
 
@@ -74,6 +75,10 @@ buildPythonPackage rec {
     [
       # https://github.com/google/jaxopt/issues/592
       "test_solve_sparse"
+
+      # AssertionError: Not equal to tolerance rtol=1e-06, atol=1e-06
+      # https://github.com/google/jaxopt/issues/618
+      "test_binary_logit_log_likelihood"
     ]
     ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
       # https://github.com/google/jaxopt/issues/577
@@ -81,6 +86,9 @@ buildPythonPackage rec {
       "test_solve_sparse"
       "test_logreg_with_intercept_manual_loop3"
 
+      # Flaky (AssertionError)
+      "test_inv_hessian_product_pytree3"
+
       # https://github.com/google/jaxopt/issues/593
       # Makes the test suite crash
       "test_dtype_consistency"

From 479fe8d5806fd9163d0b2d09d742dc7ed4d94075 Mon Sep 17 00:00:00 2001
From: rein <manavrj.07@gmail.com>
Date: Mon, 6 Jan 2025 19:57:50 +0530
Subject: [PATCH 19/64] vorta: 0.9.1 -> 0.10.3 & formatting fix

---
 pkgs/applications/backup/vorta/default.nix | 24 +++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix
index 0eb847724fea..18fd4e2126de 100644
--- a/pkgs/applications/backup/vorta/default.nix
+++ b/pkgs/applications/backup/vorta/default.nix
@@ -12,14 +12,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "vorta";
-  version = "0.9.1";
+  version = "0.10.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "borgbase";
     repo = "vorta";
-    rev = "v${version}";
-    hash = "sha256-wGlnldS2p92NAYAyRPqKjSneIlbdsOiJ0N42n/mMGFI=";
+    tag = "v${version}";
+    hash = "sha256-VhM782mFWITA0VlKw0sBIu/UxUqlFLgq5XVdCpQggCw=";
   };
 
   nativeBuildInputs = [
@@ -78,15 +78,19 @@ python3Packages.buildPythonApplication rec {
       export QT_QPA_PLATFORM=offscreen
     '';
 
-  disabledTestPaths = [
-    # QObject::connect: No such signal QPlatformNativeInterface::systemTrayWindowChanged(QScreen*)
-    "tests/test_excludes.py"
-    "tests/integration"
-    "tests/unit"
-  ];
+  disabledTestPaths =
+    [
+      # QObject::connect: No such signal QPlatformNativeInterface::systemTrayWindowChanged(QScreen*)    "tests/test_excludes.py"
+      "tests/integration"
+      "tests/unit"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      # Darwin-only test
+      "tests/network_manager/test_darwin.py"
+    ];
 
   meta = with lib; {
-    changelog = "https://github.com/borgbase/vorta/releases/tag/${src.rev}";
+    changelog = "https://github.com/borgbase/vorta/releases/tag/v${version}";
     description = "Desktop Backup Client for Borg";
     homepage = "https://vorta.borgbase.com/";
     license = licenses.gpl3Only;

From c2778bdad865d24b4abf996990bda7b60d7cda8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jan 2025 17:01:33 +0000
Subject: [PATCH 20/64] phpPackages.castor: 0.21.0 -> 0.22.0

---
 pkgs/development/php-packages/castor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix
index f754a0ccfb4d..6ac00cf8cb2b 100644
--- a/pkgs/development/php-packages/castor/default.nix
+++ b/pkgs/development/php-packages/castor/default.nix
@@ -9,16 +9,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "castor";
-  version = "0.21.0";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "jolicode";
     repo = "castor";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-GTsPcivETNP3x8kEI18CsUtV2ouAMkpC/uO+ltSkpnQ=";
+    hash = "sha256-PJtl1/Eete7zK81grQHdWtr9PBbLL0lC3nwz0vxtFx0=";
   };
 
-  vendorHash = "sha256-gJgItrEPHgSF2ReNLT4HAK9Dlx9uB6f0rXQ2A7WsNNE=";
+  vendorHash = "sha256-TjvbuvOwML9v1fMOA+ld9PM2wyysgL4Ws9Swf+N2nwk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From a296e2a219ccef94f7e6c9b3f5988739076d822e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jan 2025 17:08:04 +0000
Subject: [PATCH 21/64] phpExtensions.spx: 0.4.17 -> 0.4.18

---
 pkgs/development/php-packages/spx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix
index d861eab67a0b..7b9e73b538de 100644
--- a/pkgs/development/php-packages/spx/default.nix
+++ b/pkgs/development/php-packages/spx/default.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.4.17";
+  version = "0.4.18";
 in
 buildPecl {
   inherit version;
@@ -16,7 +16,7 @@ buildPecl {
     owner = "NoiseByNorthwest";
     repo = "php-spx";
     rev = "v${version}";
-    hash = "sha256-MH/0G9KKmwcVsJKpe6uE1xjvykBEWuYU0DIOGfXiLAw=";
+    hash = "sha256-Dcv8ncYPIug7e24mvL1gn0x0CeLNAck8djm/r/yiPe8=";
   };
 
   configureFlags = [ "--with-zlib-dir=${zlib.dev}" ];

From d1b1b1c167f82ba0d8529d4b20feabb7b103e010 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jan 2025 17:08:51 +0000
Subject: [PATCH 22/64] phpPackages.phpstan: 2.0.4 -> 2.1.1

---
 pkgs/development/php-packages/phpstan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index f47ba4528981..d24dfbee49a2 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -6,16 +6,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpstan";
-  version = "2.0.4";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan-src";
     tag = finalAttrs.version;
-    hash = "sha256-hKNwAZCK7dS/iBTrigEHSBXnCJQ2btSUDMUrfetiL0s=";
+    hash = "sha256-pc65TtMFsei338t73kjKO8agPhyvYfJrtKleQG7ZLlY=";
   };
 
-  vendorHash = "sha256-m5Ih/3a3p5BgifpK+vu2Z04glIc0vhz1/ikA4Hl0L7U=";
+  vendorHash = "sha256-93HlbsEn5BX/9Ch0hCexLJS/zqJHyG0ngyiz/wnAqog=";
   composerStrictValidation = false;
 
   meta = {

From 7b4b6d99834129b9d952c5878540c38a6ed75c59 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 18:19:38 +0100
Subject: [PATCH 23/64] python312Packages.aionut: migrate to pytest-cov-stub

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

diff --git a/pkgs/development/python-modules/aionut/default.nix b/pkgs/development/python-modules/aionut/default.nix
index 42eccd0b8181..d20e73abf85d 100644
--- a/pkgs/development/python-modules/aionut/default.nix
+++ b/pkgs/development/python-modules/aionut/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   poetry-core,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
 }:
@@ -22,15 +23,11 @@ buildPythonPackage rec {
     hash = "sha256-DCWfa5YfrB7MTf78AeSHDgiZzLNXoiNLnty9a+Sr9tQ=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail " --cov=aionut --cov-report=term-missing:skip-covered" ""
-  '';
-
   build-system = [ poetry-core ];
 
   nativeCheckInputs = [
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
   ];
 

From 19ca7960aa81b3dc6b65ec1e5d20950f0579b5f5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 18:29:11 +0100
Subject: [PATCH 24/64] python312Packages.gotailwind: migrate to
 pytest-cov-stub

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

diff --git a/pkgs/development/python-modules/gotailwind/default.nix b/pkgs/development/python-modules/gotailwind/default.nix
index 72fd107555ca..b3a70580266a 100644
--- a/pkgs/development/python-modules/gotailwind/default.nix
+++ b/pkgs/development/python-modules/gotailwind/default.nix
@@ -10,6 +10,7 @@
   orjson,
   poetry-core,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   syrupy,
@@ -35,8 +36,7 @@ buildPythonPackage rec {
   postPatch = ''
     # Upstream doesn't set a version for the pyproject.toml
     substituteInPlace pyproject.toml \
-      --replace-fail "0.0.0" "${version}" \
-      --replace-fail "--cov" ""
+      --replace-fail "0.0.0" "${version}"
   '';
 
   build-system = [ poetry-core ];
@@ -58,6 +58,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     aresponses
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
     syrupy
   ];

From dfa6797af80711150f236bb1a5ff810e7a20a3b6 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Mon, 6 Jan 2025 18:24:17 +0100
Subject: [PATCH 25/64] maintainers: add matrix account for asymmetric

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e2f4450045b6..5d3f1295cf05 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2129,6 +2129,7 @@
     github = "asymmetric";
     githubId = 101816;
     name = "Lorenzo Manacorda";
+    matrix = "@asymmetric:matrix.dapp.org.uk";
   };
   aszlig = {
     email = "aszlig@nix.build";

From 633e54d642501cf423def8208a327706681ab548 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Mon, 6 Jan 2025 18:35:01 +0100
Subject: [PATCH 26/64] maintainers: fix 2 invalid mxid's

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5d3f1295cf05..cbf568f69529 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7360,7 +7360,7 @@
     github = "FedX-sudo";
     githubId = 66258975;
     name = "Fedx sudo";
-    matrix = "fedx:matrix.org";
+    matrix = "@fedx:matrix.org";
   };
   fee1-dead = {
     email = "ent3rm4n@gmail.com";
@@ -12804,7 +12804,7 @@
   };
   lenny = {
     name = "Lenny.";
-    matrix = "lenny@flipdot.org";
+    matrix = "@lenny:flipdot.org";
     keys = [ { fingerprint = "6D63 2D4D 0CFE 8D53 F5FD  C7ED 738F C800 6E9E A634"; } ];
   };
   leo248 = {

From 70e6b217a8c814f41fef6e2c8e7e8deea403936a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jan 2025 17:38:22 +0000
Subject: [PATCH 27/64] phpExtensions.xdebug: 3.4.0 -> 3.4.1

---
 pkgs/development/php-packages/xdebug/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix
index 1fa38229d7a1..6b0b939a7d04 100644
--- a/pkgs/development/php-packages/xdebug/default.nix
+++ b/pkgs/development/php-packages/xdebug/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "3.4.0";
+  version = "3.4.1";
 in
 buildPecl {
   inherit version;
@@ -16,7 +16,7 @@ buildPecl {
     owner = "xdebug";
     repo = "xdebug";
     rev = version;
-    hash = "sha256-Gt6/ARrUzmsAhsdkKPNiX0CBmWTv7D3mHnxvvWjbLnE=";
+    hash = "sha256-yOqVS58bsFXGhdkQ20LK0E80bV7O2r/BE76CfBoeEqA=";
   };
 
   doCheck = true;

From 09a8e9d87f09b9dbf3e8443741c7c3f09e6c590d Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 6 Jan 2025 17:22:06 +0000
Subject: [PATCH 28/64] homepage-dashboard: 0.10.8 -> 0.10.9

---
 pkgs/servers/homepage-dashboard/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix
index c316faf358f0..7df3bb9f6f95 100644
--- a/pkgs/servers/homepage-dashboard/default.nix
+++ b/pkgs/servers/homepage-dashboard/default.nix
@@ -14,10 +14,10 @@
 }:
 let
   dashboardIcons = fetchFromGitHub {
-    owner = "walkxcode";
+    owner = "homarr-labs";
     repo = "dashboard-icons";
-    rev = "be82e22c418f5980ee2a13064d50f1483df39c8c"; # Until 2024-07-21
-    hash = "sha256-z69DKzKhCVNnNHjRM3dX/DD+WJOL9wm1Im1nImhBc9Y=";
+    rev = "51a2ae7b101c520bcfb5b44e5ddc99e658bc1e21"; # Until 2025-01-06
+    hash = "sha256-rKXeMAhHV0Ax7mVFyn6hIZXm5RFkbGakjugU0DG0jLM=";
   };
 
   installLocalIcons = ''
@@ -29,13 +29,13 @@ let
 in
 buildNpmPackage rec {
   pname = "homepage-dashboard";
-  version = "0.10.8";
+  version = "0.10.9";
 
   src = fetchFromGitHub {
     owner = "gethomepage";
     repo = "homepage";
     rev = "v${version}";
-    hash = "sha256-eFRWkwPSXQFhyKORpOTe9ifCX25ZeyVG7iezRmMxPvA=";
+    hash = "sha256-q8+uoikHMQVuTrVSH8tPsoI5655ZStMc/7tmoAfoZIY=";
   };
 
   npmDepsHash = "sha256-N39gwct2U4UxlIL5ceDzzU7HpA6xh2WksrZNxGz04PU=";

From 5dec6c3523f61a1299065e42c81dcf9552747bae Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Mon, 6 Jan 2025 17:22:32 +0000
Subject: [PATCH 29/64] homepage-dashboard: remove unused git argument from
 derivation

---
 pkgs/servers/homepage-dashboard/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix
index 7df3bb9f6f95..9efcf8e247da 100644
--- a/pkgs/servers/homepage-dashboard/default.nix
+++ b/pkgs/servers/homepage-dashboard/default.nix
@@ -10,7 +10,6 @@
   nixosTests,
   enableLocalIcons ? false,
   nix-update-script,
-  git,
 }:
 let
   dashboardIcons = fetchFromGitHub {

From 98379b00787bba486f8e5862557bda25aa5a7fa7 Mon Sep 17 00:00:00 2001
From: Disguised Pigeon <rubcessis.unofficial@gmail.com>
Date: Mon, 6 Jan 2025 20:10:08 +0100
Subject: [PATCH 30/64] gleam: 1.6.3 -> 1.7.0

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

diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix
index a02a0c8c587e..c8c3d998f7ed 100644
--- a/pkgs/development/compilers/gleam/default.nix
+++ b/pkgs/development/compilers/gleam/default.nix
@@ -14,13 +14,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gleam";
-  version = "1.6.3";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-bGXSlbyV+0RjNtG/6u11xqjcvL7/FhhqdXanv2JlVII=";
+    hash = "sha256-Nr8OpinQ1Dmo6e8XpBYrtaRRhcX2s1TW/5nM1LxApGg=";
   };
 
   nativeBuildInputs = [
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
       SystemConfiguration
     ];
 
-  cargoHash = "sha256-c5q/UFkxDtGJxQORAH7iLlzH3rJI6cCD6H2uSC5bItw=";
+  cargoHash = "sha256-E1iowktT7oK259WY6AopfvinQuRT1yMnORbJn9Ly+3E=";
 
   passthru.updateScript = nix-update-script { };
 

From 3c9794d06eb60a17dd63b932f6f4e9fced72a793 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 6 Jan 2025 20:17:23 +0100
Subject: [PATCH 31/64] workflows/eval: add eval summary before requesting
 reviewers

This is to ensure that the eval summary is still set as commit status,
even when the review requests fail due to too many reviewers.
---
 .github/workflows/eval.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 372cb78f7665..64969dc2b426 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -295,20 +295,6 @@ jobs:
           REPOSITORY: ${{ github.repository }}
           NUMBER: ${{ github.event.number }}
 
-      - name: Requesting maintainer reviews
-        run: |
-          # maintainers.json contains GitHub IDs. Look up handles to request reviews from.
-          # There appears to be no API to request reviews based on GitHub IDs
-          jq -r 'keys[]' comparison/maintainers.json \
-            | while read -r id; do gh api /user/"$id" --jq .login; done \
-            | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
-
-        env:
-          GH_TOKEN: ${{ github.token }}
-          REPOSITORY: ${{ github.repository }}
-          NUMBER: ${{ github.event.number }}
-          AUTHOR: ${{ github.event.pull_request.user.login }}
-
       - name: Add eval summary to commit statuses
         if: ${{ github.event_name == 'pull_request_target' }}
         run: |
@@ -328,3 +314,17 @@ jobs:
           GH_TOKEN: ${{ github.token }}
           PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
           NUMBER: ${{ github.event.number }}
+
+      - name: Requesting maintainer reviews
+        run: |
+          # maintainers.json contains GitHub IDs. Look up handles to request reviews from.
+          # There appears to be no API to request reviews based on GitHub IDs
+          jq -r 'keys[]' comparison/maintainers.json \
+            | while read -r id; do gh api /user/"$id" --jq .login; done \
+            | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
+
+        env:
+          GH_TOKEN: ${{ github.token }}
+          REPOSITORY: ${{ github.repository }}
+          NUMBER: ${{ github.event.number }}
+          AUTHOR: ${{ github.event.pull_request.user.login }}

From 53e8893949ca9918ee311d30091886982690f51b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 5 Jan 2025 19:42:32 +0000
Subject: [PATCH 32/64] storcli2: init at 8.11

This is a vendor package from BroadCom. Note that;
StorCLI2 is for SAS4 instrumentation, whereas StorCLI is for SAS3.5
controllers.
---
 pkgs/by-name/st/storcli2/package.nix | 73 ++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/st/storcli2/package.nix

diff --git a/pkgs/by-name/st/storcli2/package.nix b/pkgs/by-name/st/storcli2/package.nix
new file mode 100644
index 000000000000..c9d121743a28
--- /dev/null
+++ b/pkgs/by-name/st/storcli2/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+  rpmextract,
+  testers,
+}:
+stdenvNoCC.mkDerivation (
+  finalAttrs:
+  let
+    majVer = "8";
+    minVer = "11";
+    relPhs = "14";
+    verCode = "00" + majVer + ".00" + minVer + ".0000.00" + relPhs;
+  in
+  {
+    pname = "storcli";
+    version = majVer + "." + minVer;
+
+    src = fetchzip {
+      url = "https://docs.broadcom.com/docs-and-downloads/host-bus-adapters/host-bus-adapters-common-files/sas_sata_nvme_24g_p${finalAttrs.version}/StorCLI_Avenger_${finalAttrs.version}-${verCode}.zip";
+      hash = "sha256-vztV+Jp+p6nU4q7q8QQIkuL30QsoGj2tyIZp87luhH8=";
+    };
+
+    nativeBuildInputs = [ rpmextract ];
+
+    unpackPhase =
+      let
+        inherit (stdenvNoCC.hostPlatform) system;
+        platforms = {
+          x86_64-linux = "Linux";
+          aarch64-linux = "ARM/Linux";
+        };
+        platform = platforms.${system} or (throw "unsupported system: ${system}");
+      in
+      ''
+        rpmextract $src/Avenger_StorCLI/${platform}/storcli2-${verCode}-1.*.rpm
+      '';
+
+    dontPatch = true;
+    dontConfigure = true;
+    dontBuild = true;
+
+    installPhase = ''
+      install -D ./opt/MegaRAID/storcli2/storcli2 $out/bin/storcli2
+    '';
+
+    # Not needed because the binary is statically linked
+    dontFixup = false;
+
+    passthru.tests = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "${finalAttrs.meta.mainProgram} v";
+      version = verCode;
+    };
+
+    meta = with lib; {
+      # Unfortunately there is no better page for this.
+      # Filter for downloads, set 100 items per page. Sort by newest does not work.
+      # Then search manually for the latest version.
+      homepage = "https://www.broadcom.com/support/download-search?pg=&pf=Host+Bus+Adapters&pn=&pa=&po=&dk=storcli2&pl=&l=false";
+      description = "Storage Command Line Tool";
+      sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+      license = licenses.unfree;
+      maintainers = with maintainers; [ edwtjo ];
+      mainProgram = "storcli2";
+      platforms = [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];
+    };
+  }
+)

From 58f12ee8a64f3ec9c7982d1d8ed2ac322d845253 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 6 Jan 2025 20:21:59 +0100
Subject: [PATCH 33/64] nixos/homepage-dashboard: fix stale cache issue

When the cache is stale, homepage-dashboard serves bad data (UI lacks
styling etc.). This issue happens at least on homepage-dashboard version
upgrades.

Fixes https://github.com/NixOS/nixpkgs/issues/346016.
---
 nixos/modules/services/misc/homepage-dashboard.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix
index a4e5b8d2fc8c..35908488f487 100644
--- a/nixos/modules/services/misc/homepage-dashboard.nix
+++ b/nixos/modules/services/misc/homepage-dashboard.nix
@@ -254,6 +254,14 @@ in
           ExecStart = lib.getExe cfg.package;
           Restart = "on-failure";
         };
+
+        preStart = ''
+          # Related:
+          # * https://github.com/NixOS/nixpkgs/issues/346016 ("homepage-dashboard: cache dir is not cleared upon version upgrade")
+          # * https://github.com/gethomepage/homepage/discussions/4560 ("homepage NixOS package does not clear cache on upgrade leaving broken state")
+          # * https://github.com/vercel/next.js/discussions/58864 ("Feature Request: Allow configuration of cache dir")
+          rm -rf "$NIXPKGS_HOMEPAGE_CACHE_DIR"/*
+        '';
       };
 
       networking.firewall = lib.mkIf cfg.openFirewall {

From f02712ea1b4d70a1aa7e21639d163f64c28b77d1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 22:47:41 +0100
Subject: [PATCH 34/64] python312Packages.tencentcloud-sdk-python: 3.0.1296 ->
 3.0.1297

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1296...3.0.1297

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1297/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index f783d15e9623..88c1736b2796 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1296";
+  version = "3.0.1297";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-iTcI/pNCcQamVuDYIjv60KR4CBwBRVwZJ+VAJqR1keM=";
+    hash = "sha256-8EVqWhS814OwmG8nebKgGsAmn4aoKMCYBBU26tOyuj4=";
   };
 
   build-system = [ setuptools ];

From 83178a8da231a2ca40f258c80b988c7c78048cdd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 22:48:25 +0100
Subject: [PATCH 35/64] python312Packages.holidays: 0.63 -> 0.64

Diff: https://github.com/vacanza/python-holidays/compare/refs/tags/v0.63...v0.64

Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.64
---
 pkgs/development/python-modules/holidays/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 110efb4f5f4a..6bca170e3825 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.63";
+  version = "0.64";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "vacanza";
     repo = "python-holidays";
     tag = "v${version}";
-    hash = "sha256-XA6XvxWHttt+ic5027Q/3VGqrFYznYCiExSFBHU7qcY=";
+    hash = "sha256-rPQr7nyouBepTi4tW0+wrbROYyWo92KkZUI6ff5jl7I=";
   };
 
   build-system = [

From ff3b209756096a2befcaa83b3058cb4900a4a0e2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 22:53:56 +0100
Subject: [PATCH 36/64] python312Packages.pylutron-caseta: 0.22.0 -> 0.23.0

Diff: https://github.com/gurumitts/pylutron-caseta/compare/refs/tags/v0.22.0...v0.23.0

Changelog: https://github.com/gurumitts/pylutron-caseta/blob/v0.23.0/CHANGELOG.md
---
 .../python-modules/pylutron-caseta/default.nix   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix
index 3d2f1f2e8658..4a0a2105d172 100644
--- a/pkgs/development/python-modules/pylutron-caseta/default.nix
+++ b/pkgs/development/python-modules/pylutron-caseta/default.nix
@@ -6,6 +6,7 @@
   cryptography,
   fetchFromGitHub,
   hatchling,
+  orjson,
   pytest-asyncio,
   pytest-timeout,
   pytestCheckHook,
@@ -16,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pylutron-caseta";
-  version = "0.22.0";
+  version = "0.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,12 +26,15 @@ buildPythonPackage rec {
     owner = "gurumitts";
     repo = "pylutron-caseta";
     tag = "v${version}";
-    hash = "sha256-8NO1IAm16b5jxjVPSQqOSx5hJjAOAXyOknqwkgPT5Zo=";
+    hash = "sha256-p8c+WY+x5KcF7r6FXeF89JNtAwogRZELqXWgDc2iJek=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [ cryptography ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  dependencies = [
+    cryptography
+    orjson
+  ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
 
   optional-dependencies = {
     cli = [
@@ -51,10 +55,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "pylutron_caseta" ];
 
   meta = with lib; {
-    description = "Python module o control Lutron Caseta devices";
+    description = "Python module to control Lutron Caseta devices";
     homepage = "https://github.com/gurumitts/pylutron-caseta";
     changelog = "https://github.com/gurumitts/pylutron-caseta/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }

From 488a55e55098b455d1e4cef8fe9c019080fd529a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 22:55:34 +0100
Subject: [PATCH 37/64] python312Packages.aiolifx-themes: 0.5.8 -> 0.6.0

Diff: https://github.com/Djelibeybi/aiolifx-themes/compare/refs/tags/v0.5.8...v0.6.0

Changelog: https://github.com/Djelibeybi/aiolifx-themes/releases/tag/v0.6.0
---
 pkgs/development/python-modules/aiolifx-themes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix
index d448d3482463..a4584ba311c8 100644
--- a/pkgs/development/python-modules/aiolifx-themes/default.nix
+++ b/pkgs/development/python-modules/aiolifx-themes/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "aiolifx-themes";
-  version = "0.5.8";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "Djelibeybi";
     repo = "aiolifx-themes";
     tag = "v${version}";
-    hash = "sha256-MeGhtjdvtL0armoLrlqPsV4SUCTWbkBvRTj6ReuKQpQ=";
+    hash = "sha256-Y6LVSk0Ut5G0aGzV+hAfGmdM8h8a+4NYycQqBKoElXU=";
   };
 
   build-system = [ poetry-core ];

From 6ebdb6ac9ed3d421106ab6169768b95e444f0492 Mon Sep 17 00:00:00 2001
From: bretek <josephmadden999@protonmail.com>
Date: Fri, 3 Jan 2025 19:21:52 +0000
Subject: [PATCH 38/64] vimPlugins.rzls-nvim: init at 2024-12-24

fix
---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix  |  4 ++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 3 files changed, 17 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 5ffbeb90305a..6f128bca864d 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -11182,6 +11182,18 @@ final: prev:
     meta.homepage = "https://github.com/rust-lang/rust.vim/";
   };
 
+  rzls-nvim = buildVimPlugin {
+    pname = "rzls.nvim";
+    version = "2024-12-24";
+    src = fetchFromGitHub {
+      owner = "tris203";
+      repo = "rzls.nvim";
+      rev = "494a0a377d84f7424fc95d5f04f57027e24dedd7";
+      sha256 = "0fb8r1csdqiggbb68p22a0q3624ck9752z9ay9iarqkkap0z9z7c";
+    };
+    meta.homepage = "https://github.com/tris203/rzls.nvim/";
+  };
+
   sad-vim = buildVimPlugin {
     pname = "sad.vim";
     version = "2019-02-18";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 0fd5010f7d51..0cca1733fb11 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2621,6 +2621,10 @@ in
     dependencies = [ self.nvim-lspconfig ];
   };
 
+  rzls-nvim = super.rzls-nvim.overrideAttrs {
+    dependencies = [ self.roslyn-nvim ];
+  };
+
   samodostal-image-nvim = super.samodostal-image-nvim.overrideAttrs {
     dependencies = [ self.plenary-nvim ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 26579292c051..fc644bf8f247 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -928,6 +928,7 @@ https://github.com/keith/rspec.vim/,,
 https://github.com/ccarpita/rtorrent-syntax-file/,,
 https://github.com/simrat39/rust-tools.nvim/,,
 https://github.com/rust-lang/rust.vim/,,
+https://github.com/tris203/rzls.nvim/,HEAD,
 https://github.com/hauleth/sad.vim/,,
 https://github.com/vmware-archive/salt-vim/,,
 https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim

From ecad5687422f17d165869f3b08f04ee0d8323ced Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 23:03:35 +0100
Subject: [PATCH 39/64] python312Packages.solax: 3.2.1 -> 3.2.3

Changelog: https://github.com/squishykid/solax/releases/tag/v3.2.3
---
 pkgs/development/python-modules/solax/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/solax/default.nix b/pkgs/development/python-modules/solax/default.nix
index b72088233b40..e30f9cfc9d3f 100644
--- a/pkgs/development/python-modules/solax/default.nix
+++ b/pkgs/development/python-modules/solax/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "solax";
-  version = "3.2.1";
+  version = "3.2.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-eeALI7GvhRl8OQaSqv1I26rMaBTxF24w4QQzUcnV2ys=";
+    hash = "sha256-ht+UP/is9+galMiVz/pkwtre1BXfCTT39SpSz4Vctvs=";
   };
 
   build-system = [ setuptools-scm ];

From 3d2bb741431a28f7fd0640eedc1b1a233258cb0b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 23:06:12 +0100
Subject: [PATCH 40/64] python312Packages.pysuezv2: 1.3.5 -> 2.0.1

Diff: https://github.com/jb101010-2/pySuez/compare/refs/tags/1.3.5...2.0.1

Changelog: https://github.com/jb101010-2/pySuez/releases/tag/2.0.1
---
 pkgs/development/python-modules/pysuezv2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysuezv2/default.nix b/pkgs/development/python-modules/pysuezv2/default.nix
index 20e8ca6901e2..4f50b7519533 100644
--- a/pkgs/development/python-modules/pysuezv2/default.nix
+++ b/pkgs/development/python-modules/pysuezv2/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pysuezv2";
-  version = "1.3.5";
+  version = "2.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "jb101010-2";
     repo = "pySuez";
     tag = version;
-    hash = "sha256-BG5nX2S+WV0Bdwm/cvm+mGO1RUd+F312tZ4jws6A/d8=";
+    hash = "sha256-p9kTWaSMRgKZFonHTgT7nj4NdeTFCeEHawIFew/rii4=";
   };
 
   build-system = [ hatchling ];

From 3a09351d804cd5378d643d2fb338933cb185e4a9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 23:08:11 +0100
Subject: [PATCH 41/64] python312Packages.python-kasa: 0.9.0 -> 0.9.1

Diff: https://github.com/python-kasa/python-kasa/compare/refs/tags/0.9.0...0.9.1

Changelog: https://github.com/python-kasa/python-kasa/blob/0.9.1/CHANGELOG.md
---
 pkgs/development/python-modules/python-kasa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix
index 1f85ca405559..0e66efe2c02a 100644
--- a/pkgs/development/python-modules/python-kasa/default.nix
+++ b/pkgs/development/python-modules/python-kasa/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "python-kasa";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "python-kasa";
     repo = "python-kasa";
     tag = version;
-    hash = "sha256-xbyDiTnEeC/d2dpAxj/5tB27hFC3bKEO5JsUC1jmh18=";
+    hash = "sha256-9y0M2CYG7tFdT9nAcQLhgvTKeaxoFHAVihM2Rj+0N34=";
   };
 
   build-system = [ hatchling ];

From 491b6cb93ee7527549f6c7235fa410fc81579380 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 23:12:14 +0100
Subject: [PATCH 42/64] python312Packages.pymodbus: 3.8.1 -> 3.8.3

Diff: https://github.com/pymodbus-dev/pymodbus/compare/refs/tags/v3.8.1...v3.8.3

Changelog: https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.8.3
---
 pkgs/development/python-modules/pymodbus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix
index c0bd05357cc2..c9e974b574ca 100644
--- a/pkgs/development/python-modules/pymodbus/default.nix
+++ b/pkgs/development/python-modules/pymodbus/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "pymodbus";
-  version = "3.8.1";
+  version = "3.8.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "pymodbus-dev";
     repo = "pymodbus";
     tag = "v${version}";
-    hash = "sha256-WuQddane7NPqGo6EHBPlFAZDmkcksDdWmHKdVSsSf+o=";
+    hash = "sha256-0jS18oCVX+WvGvaIlug3Wbf4oJUmspGYlcmJQR0MXhI=";
   };
 
   build-system = [ setuptools ];

From 5795f1002b69272e2fd660bdbba0f1a578d90907 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 23:13:53 +0100
Subject: [PATCH 43/64] python312Packages.py-synologydsm-api: 2.5.3 -> 2.6.0

Diff: https://github.com/mib1185/py-synologydsm-api/compare/refs/tags/v2.5.3...v2.6.0

Changelog: https://github.com/mib1185/py-synologydsm-api/releases/tag/v2.6.0
---
 .../development/python-modules/py-synologydsm-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/py-synologydsm-api/default.nix b/pkgs/development/python-modules/py-synologydsm-api/default.nix
index e158bd909dad..741942f12a4b 100644
--- a/pkgs/development/python-modules/py-synologydsm-api/default.nix
+++ b/pkgs/development/python-modules/py-synologydsm-api/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "py-synologydsm-api";
-  version = "2.5.3";
+  version = "2.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "mib1185";
     repo = "py-synologydsm-api";
     tag = "v${version}";
-    hash = "sha256-3DpgJqL8pSiAK/t/Qe2CxntQStTqDumkivhnPKHVlnE=";
+    hash = "sha256-CjsSn9kbSOSiia47gDHUbMCgJs3pDJaJfQOwMPP+5WI=";
   };
 
   build-system = [ setuptools ];

From 72b587903a655128e96460ae898b2cdbfb2ec229 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 23:15:23 +0100
Subject: [PATCH 44/64] python312Packages.renault-api: 0.2.8 -> 0.2.9

Diff: https://github.com/hacf-fr/renault-api/compare/refs/tags/v0.2.8...v0.2.9

Changelog: https://github.com/hacf-fr/renault-api/releases/tag/v0.2.9
---
 pkgs/development/python-modules/renault-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix
index f2efb92394c2..d07acb4b3df7 100644
--- a/pkgs/development/python-modules/renault-api/default.nix
+++ b/pkgs/development/python-modules/renault-api/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "renault-api";
-  version = "0.2.8";
+  version = "0.2.9";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "hacf-fr";
     repo = "renault-api";
     tag = "v${version}";
-    hash = "sha256-j9KF2vqDZqQ35mDW/Qx6uy8H9hwuwBYfdcDXD1Cs7rQ=";
+    hash = "sha256-Y+KFC/g0zJ1Ng3LnMsStN2jOsnjKLzYLyvM+fDmzdGQ=";
   };
 
   build-system = [ poetry-core ];

From e962210f562d50bc41e76dac191a16e9ba7adec9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 23:29:25 +0100
Subject: [PATCH 45/64] python312Packages.aiohomeconnect: 0.7.2 -> 0.7.5

Diff: https://github.com/MartinHjelmare/aiohomeconnect/compare/refs/tags/v0.7.2...v0.7.5

Changelog: https://github.com/MartinHjelmare/aiohomeconnect/blob/refs/tags/v0.7.5/CHANGELOG.md
---
 pkgs/development/python-modules/aiohomeconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix
index 09c40c51ed93..289d0ee84d4c 100644
--- a/pkgs/development/python-modules/aiohomeconnect/default.nix
+++ b/pkgs/development/python-modules/aiohomeconnect/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomeconnect";
-  version = "0.7.2";
+  version = "0.7.5";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiohomeconnect";
     tag = "v${version}";
-    hash = "sha256-E+2IQy3O+ccvZfjlORo+eTd+l41FSXk1dIE2Adrn3Ok=";
+    hash = "sha256-1+2ezwmlzLYbrODGNoOzd9Gbjl/5BzarmXr8eiaKZ9c=";
   };
 
   pythonRelaxDeps = [ "httpx" ];

From c2299a75dd6328237bf02191fc5daa6df4068a3f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 23:30:02 +0100
Subject: [PATCH 46/64] python312Packages.bizkaibus: 0.1.4 -> 0.2.0

Diff: https://github.com/UgaitzEtxebarria/BizkaibusRTPI/compare/0.1.4...0.2.0
---
 pkgs/development/python-modules/bizkaibus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bizkaibus/default.nix b/pkgs/development/python-modules/bizkaibus/default.nix
index ba078194af8f..b067a7f2bd9a 100644
--- a/pkgs/development/python-modules/bizkaibus/default.nix
+++ b/pkgs/development/python-modules/bizkaibus/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "bizkaibus";
-  version = "0.1.4";
+  version = "0.2.0";
   format = "setuptools";
   disabled = pythonOlder "3.6";
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "UgaitzEtxebarria";
     repo = "BizkaibusRTPI";
     rev = version;
-    sha256 = "1v7k9fclndb4x9npzhzj68kbrc3lb3wr6cwal2x46ib207593ckr";
+    sha256 = "sha256-TM02pSSOELRGSwsKc5C+34W94K6mnS0C69aijsPqSWs=";
   };
 
   propagatedBuildInputs = [ requests ];

From 9d49728c39affc48df606de4272522f8d06fb9fe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 23:33:24 +0100
Subject: [PATCH 47/64] python312Packages.bizkaibus: refactor

---
 .../python-modules/bizkaibus/default.nix        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/bizkaibus/default.nix b/pkgs/development/python-modules/bizkaibus/default.nix
index b067a7f2bd9a..c79a3c35b966 100644
--- a/pkgs/development/python-modules/bizkaibus/default.nix
+++ b/pkgs/development/python-modules/bizkaibus/default.nix
@@ -1,25 +1,29 @@
 {
   lib,
-  requests,
+  aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "bizkaibus";
   version = "0.2.0";
-  format = "setuptools";
-  disabled = pythonOlder "3.6";
+  pyproject = true;
+
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "UgaitzEtxebarria";
     repo = "BizkaibusRTPI";
     rev = version;
-    sha256 = "sha256-TM02pSSOELRGSwsKc5C+34W94K6mnS0C69aijsPqSWs=";
+    hash = "sha256-TM02pSSOELRGSwsKc5C+34W94K6mnS0C69aijsPqSWs=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
 
   # Project has no tests
   doCheck = false;
@@ -29,7 +33,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module to get information about Bizkaibus buses";
     homepage = "https://github.com/UgaitzEtxebarria/BizkaibusRTPI";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/UgaitzEtxebarria/BizkaibusRTPI/releases/tag/${version}";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }

From 79af23e1ae7fb44dc77a2b545b1f0f3395446349 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 23:34:19 +0100
Subject: [PATCH 48/64] python312Packages.boto3-stubs: 1.35.92 -> 1.35.93

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 1954fe6dd0d5..b0e691404108 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.35.92";
+  version = "1.35.93";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-8q9GOInTf7qyPHzQj7GwNfEjrWfks+/Eb3cU+avuXlc=";
+    hash = "sha256-mCAsipukijtuQ0qc+d5JktfMk+5QXx/EgcV82cgBYj0=";
   };
 
   build-system = [ setuptools ];

From 41aaaccf532b1b2cf735879a430afacbabbb90d7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 23:34:23 +0100
Subject: [PATCH 49/64] python312Packages.botocore-stubs: 1.35.92 -> 1.35.93

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 0183050890ec..fdb12bd74e9c 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.35.92";
+  version = "1.35.93";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-wCrnBYjiDRWoEAs0waHr+l8I6Fb2BXDbDRaxKNxMXCQ=";
+    hash = "sha256-aHLv6iTWsd0fAbdmL/HgvX+bcRDabWRHt4wbhdlDFR8=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 0713589dfe61a8e17439cb7dc0ca621e1b16464c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jan 2025 23:35:26 +0100
Subject: [PATCH 50/64] python312Packages.mypy-boto3-iotsecuretunneling: 1.35.0
 -> 1.35.93

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 71f98591725a..bc5dd42043b7 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -678,8 +678,8 @@ rec {
       "sha256-LFhzVLxycvIbGPCIMvD18XAL8KkA1rnE+3LkFty4Q8s=";
 
   mypy-boto3-iotsecuretunneling =
-    buildMypyBoto3Package "iotsecuretunneling" "1.35.0"
-      "sha256-A1sYvlnpbfKZyxZvFCzBfD/Jbzd1PwlQwgj+fvcybGU=";
+    buildMypyBoto3Package "iotsecuretunneling" "1.35.93"
+      "sha256-HBXnSdkTqLdcwSQl42FfFZhQVDiErGfJShaGgt0I7bU=";
 
   mypy-boto3-iotsitewise =
     buildMypyBoto3Package "iotsitewise" "1.35.64"

From b37bab40e59ee2baa41f5d37689d4f13c2b1237d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 14:27:04 +0100
Subject: [PATCH 51/64] python312Packages.pyemd: disable failing tests

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

diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix
index 583f51d1d37b..4cff9a018ffc 100644
--- a/pkgs/development/python-modules/pyemd/default.nix
+++ b/pkgs/development/python-modules/pyemd/default.nix
@@ -40,6 +40,12 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTests = [
+    # Broken with Numpy 2.x, https://github.com/wmayner/pyemd/issues/68
+    "test_emd_samples_2"
+    "test_emd_samples_3"
+  ];
+
   meta = with lib; {
     description = "Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance";
     homepage = "https://github.com/wmayner/pyemd";

From e29f7ee718329a1d14e11d852daced39794b7394 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 14:29:06 +0100
Subject: [PATCH 52/64] python313Packages.dctorch: refactor

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

diff --git a/pkgs/development/python-modules/dctorch/default.nix b/pkgs/development/python-modules/dctorch/default.nix
index 90bfbceae4c2..ac443764d29b 100644
--- a/pkgs/development/python-modules/dctorch/default.nix
+++ b/pkgs/development/python-modules/dctorch/default.nix
@@ -18,9 +18,9 @@ buildPythonPackage rec {
     hash = "sha256-TmfLAkiofrQNWYBhIlY4zafbZPgFftISCGloO/rlEG4=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
     scipy
     torch

From 84c2a84597eb31df45e136ad7acbbf23865c7597 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 14:59:56 +0100
Subject: [PATCH 53/64] python312Packages.dctorch: relax numpy

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

diff --git a/pkgs/development/python-modules/dctorch/default.nix b/pkgs/development/python-modules/dctorch/default.nix
index ac443764d29b..05315bec521d 100644
--- a/pkgs/development/python-modules/dctorch/default.nix
+++ b/pkgs/development/python-modules/dctorch/default.nix
@@ -18,6 +18,8 @@ buildPythonPackage rec {
     hash = "sha256-TmfLAkiofrQNWYBhIlY4zafbZPgFftISCGloO/rlEG4=";
   };
 
+  pythonRelaxDeps = [ "numpy" ];
+
   build-system = [ poetry-core ];
 
   dependencies = [

From f4772fdac6d67ed1a13752df02f8206407b0c6ad Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 15:34:10 +0100
Subject: [PATCH 54/64] python312Packages.textnets: 0.9.4 -> 0.9.5

Diff: https://github.com/jboynyc/textnets/compare/refs/tags/v0.9.4...v0.9.5

Changelog: https://github.com/jboynyc/textnets/blob/v0.9.5/HISTORY.rst
---
 .../python-modules/textnets/default.nix       | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix
index 09b47a1b1207..00b1ea7b6244 100644
--- a/pkgs/development/python-modules/textnets/default.nix
+++ b/pkgs/development/python-modules/textnets/default.nix
@@ -3,18 +3,19 @@
   buildPythonPackage,
   cairocffi,
   cython,
-  fetchPypi,
+  en_core_web_sm,
+  fetchFromGitHub,
   igraph,
   leidenalg,
   pandas,
   poetry-core,
+  pyarrow,
   pytestCheckHook,
   pythonOlder,
   scipy,
   setuptools,
-  spacy,
   spacy-lookups-data,
-  en_core_web_sm,
+  spacy,
   toolz,
   tqdm,
   wasabi,
@@ -22,17 +23,19 @@
 
 buildPythonPackage rec {
   pname = "textnets";
-  version = "0.9.4";
-  format = "pyproject";
+  version = "0.9.5";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-4154ytzo1QpwhKA1BkVMss9fNIkysnClW/yfSVlX33M=";
+  src = fetchFromGitHub {
+    owner = "jboynyc";
+    repo = "textnets";
+    tag = "v${version}";
+    hash = "sha256-MdKPxIshSx6U2EFGDTUS4EhoByyuVf0HKqvm9cS2KNY=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     cython
     poetry-core
     setuptools
@@ -41,13 +44,16 @@ buildPythonPackage rec {
   pythonRelaxDeps = [
     "igraph"
     "leidenalg"
+    "pyarrow"
+    "toolz"
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     cairocffi
     igraph
     leidenalg
     pandas
+    pyarrow
     scipy
     spacy
     spacy-lookups-data

From 138ad536146fb99d7c4fdee71e4448f92c13db94 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 21:35:05 +0100
Subject: [PATCH 55/64] python312Packages.llama-index-core: 0.12.6 -> 0.12.9

Diff: https://github.com/run-llama/llama_index/compare/refs/tags/v0.12.6...v0.12.9

Changelog: https://github.com/run-llama/llama_index/blob/0.12.9/CHANGELOG.md
---
 pkgs/development/python-modules/llama-index-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix
index a88c33424bb7..69048506cbfd 100644
--- a/pkgs/development/python-modules/llama-index-core/default.nix
+++ b/pkgs/development/python-modules/llama-index-core/default.nix
@@ -36,7 +36,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-core";
-  version = "0.12.6";
+  version = "0.12.9";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     owner = "run-llama";
     repo = "llama_index";
     tag = "v${version}";
-    hash = "sha256-bd7M2Fd5BsNYmczp32Je7QtzCP0LBTg8zsDt5SYXBPU=";
+    hash = "sha256-SptIZ5LNsJOzMtrJ3hW1NPWX7+hmg74HKcfKdImCc+8=";
   };
 
   sourceRoot = "${src.name}/${pname}";

From b6d29ae899b1aa87eaf62d144f21035a3c29da08 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 21:38:21 +0100
Subject: [PATCH 56/64] python312Packages.llama-index-agent-openai: 0.4.0 ->
 0.4.1

---
 .../python-modules/llama-index-agent-openai/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix
index 65dc94f89abe..8c891aea7fcc 100644
--- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-agent-openai";
-  version = "0.4.0";
+  version = "0.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_agent_openai";
     inherit version;
-    hash = "sha256-MdJnXb2ESJdW3QYqf/7TMLKr3KO3cV1RFnT1tQdeTdY=";
+    hash = "sha256-OokTeyKKbpwrP0bjZ6J7dfsxtFjiF3e7qBneZUcH1Z4=";
   };
 
   pythonRelaxDeps = [ "llama-index-llms-openai" ];

From 0d2cc24b37e5dc0ae9c38c6bc8c21614d7d7be3c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 21:38:35 +0100
Subject: [PATCH 57/64] python312Packages.llama-index-graph-stores-neo4j: 0.4.2
 -> 0.4.4

---
 .../python-modules/llama-index-graph-stores-neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
index 17aa925e7323..003a592de9d9 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-graph-stores-neo4j";
-  version = "0.4.2";
+  version = "0.4.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_graph_stores_neo4j";
     inherit version;
-    hash = "sha256-+mh1iIE5BFBs4kREG7SjstOMWmWAc1JSUMkHbg89ues=";
+    hash = "sha256-P//9FvSUD0ZQybRgBjZjQREEdwqw9wiNygE8M0I2FhY=";
   };
 
   build-system = [ poetry-core ];

From 2cc003685a212efb9814691df5cb76e463500818 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 21:38:48 +0100
Subject: [PATCH 58/64] python312Packages.llama-index-llms-ollama: 0.4.1 ->
 0.5.0

---
 .../python-modules/llama-index-llms-ollama/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
index 029a2d5d9275..4cd284af9199 100644
--- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-ollama";
-  version = "0.4.1";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_ollama";
     inherit version;
-    hash = "sha256-MkLlJtsh3/TnuwQzAhN2BklrSQ8GOcJoDcwok9QWJw8=";
+    hash = "sha256-88DaBPhUB5Az7jwbER4JdFYAW5o4Z+1LtJuNKOSg8zY=";
   };
 
   build-system = [ poetry-core ];

From aa648d2acbdb868de3d06cd47ed6d82fd8439bd0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 21:39:01 +0100
Subject: [PATCH 59/64] python312Packages.llama-index-llms-openai: 0.3.10 ->
 0.3.12

---
 .../python-modules/llama-index-llms-openai/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
index 6d70cb685245..a8b5aee00e69 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-openai";
-  version = "0.3.10";
+  version = "0.3.12";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_openai";
     inherit version;
-    hash = "sha256-/aM0WqS6QbJdkoF+6KVpmTHnnHyHkkPxctbg5svFxbM=";
+    hash = "sha256-GIAnOn5AnAXx28zbrFzjwhR3GQHNNpautVainf7YR3o=";
   };
 
   pythonRemoveDeps = [

From f79bc6f46a367a7a53153decc29b8a1e5123b285 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 21:39:14 +0100
Subject: [PATCH 60/64] python312Packages.llama-index-multi-modal-llms-openai:
 0.4.0 -> 0.4.2

---
 .../llama-index-multi-modal-llms-openai/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
index 87411043c63a..535d2ef7a358 100644
--- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-multi-modal-llms-openai";
-  version = "0.4.0";
+  version = "0.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_multi_modal_llms_openai";
     inherit version;
-    hash = "sha256-EcOsfi16zp283ZpmLye8pf786YxWgquv+33QHVl3Zlg=";
+    hash = "sha256-NDegjOyFzrvCEqpz2lybiwVLTcYoM4VoQ1p9+ISJR28=";
   };
 
   build-system = [ poetry-core ];

From 4d86f5c39a038cb3dbbf03637ec245de2367ed7f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 21:39:28 +0100
Subject: [PATCH 61/64] python312Packages.llama-index-readers-file: 0.4.1 ->
 0.4.2

---
 .../python-modules/llama-index-readers-file/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix
index ff4b2a5fe60f..1bc0992a0baa 100644
--- a/pkgs/development/python-modules/llama-index-readers-file/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-file";
-  version = "0.4.1";
+  version = "0.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_file";
     inherit version;
-    hash = "sha256-EVAwC866t83dnim3Jx4JeyePvjUY3ibkNVlYVbEsO5o=";
+    hash = "sha256-1nei7vBpXQC0h6xOoUyC5qTqreOgnFQPj4FibYUuNJE=";
   };
 
   pythonRelaxDeps = [

From b8a693e390fb56ed1b93ec74c7f7777068f3251c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 21:39:43 +0100
Subject: [PATCH 62/64] python312Packages.llama-index-vector-stores-postgres:
 0.4.0 -> 0.4.1

---
 .../llama-index-vector-stores-postgres/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
index b6216d8bbb89..32e3900c97d1 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-postgres";
-  version = "0.4.0";
+  version = "0.4.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_vector_stores_postgres";
     inherit version;
-    hash = "sha256-yk1uHPH1Bipgy+WNx5KQ5Iuvp6b58uvcYkLP5Ma4STI=";
+    hash = "sha256-4bbjXMH4T/BRJ/l+vDOYqbv2nn0HE9953h4qFRXFlXQ=";
   };
 
   pythonRemoveDeps = [ "psycopg2-binary" ];

From fc604cff1ff4d90df4f08798060ce85bdbb39670 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 21:39:58 +0100
Subject: [PATCH 63/64] python312Packages.llama-index-vector-stores-qdrant:
 0.4.0 -> 0.4.2

---
 .../llama-index-vector-stores-qdrant/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
index 6f7b1003892b..534ee2b4226a 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-qdrant";
-  version = "0.4.0";
+  version = "0.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_qdrant";
     inherit version;
-    hash = "sha256-hv6cxCSKNtjUfZYNk2oxrJi10wAL4kxZeTx3v1ejlKc=";
+    hash = "sha256-Agy6T02j5sSZZgiI6eSgxLThwEk2oZNYyMygBo6HWug=";
   };
 
   build-system = [ poetry-core ];

From 1db607d9fa005ea691bfbdf5b50d5eedf4ad72bb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jan 2025 21:40:11 +0100
Subject: [PATCH 64/64] python312Packages.llama-parse: 0.5.17 -> 0.5.19

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

diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix
index abf1a82708c8..c4028223a15b 100644
--- a/pkgs/development/python-modules/llama-parse/default.nix
+++ b/pkgs/development/python-modules/llama-parse/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-parse";
-  version = "0.5.17";
+  version = "0.5.19";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_parse";
     inherit version;
-    hash = "sha256-K6JwDKOxXoTvBy/ty7/q4vwTzntj/uIPzVJJ5vzb04E=";
+    hash = "sha256-22nacOGZomZHBeuYOnD6krfO4Z3Wz/F1r3aSoLik3VM=";
   };
 
   build-system = [ poetry-core ];