From 1599c37a6b717e9dc2cd421a31e4968aa7b3744f Mon Sep 17 00:00:00 2001
From: Hugo Lageneste <hugo.lageneste@pm.me>
Date: Fri, 4 Apr 2025 23:39:05 +0200
Subject: [PATCH 01/45] nixos/luksroot: remove useless $new_k_luks

Remove the variable new_k_luks used only once in the code.
---
 nixos/modules/system/boot/luksroot.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 59c5cdb71b00..af7362231ea5 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -408,13 +408,12 @@ let
                 return
             fi
 
-            if [ ! -z "$k_user" ]; then
-                new_k_luks="$(echo -n $k_user | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response | rbtohex)"
+            if [ -n "$k_user" ]; then
+                echo -n $k_user
             else
-                new_k_luks="$(echo | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response | rbtohex)"
-            fi
+                echo
+            fi | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response > /crypt-ramfs/new_key
 
-            echo -n "$new_k_luks" | hextorb > /crypt-ramfs/new_key
             echo -n "$k_luks" | hextorb | ${cschange} --key-file=- /crypt-ramfs/new_key
 
             if [ $? == 0 ]; then

From c49a8611aecbbd307708e0481e15be42ad61529c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Apr 2025 08:01:08 +0000
Subject: [PATCH 02/45] awscli2: 2.26.4 -> 2.27.2

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

diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix
index 1375fd281a4d..069be0822da0 100644
--- a/pkgs/by-name/aw/awscli2/package.nix
+++ b/pkgs/by-name/aw/awscli2/package.nix
@@ -64,14 +64,14 @@ let
 in
 py.pkgs.buildPythonApplication rec {
   pname = "awscli2";
-  version = "2.26.4"; # N.B: if you change this, check if overrides are still up-to-date
+  version = "2.27.2"; # N.B: if you change this, check if overrides are still up-to-date
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-cli";
     tag = version;
-    hash = "sha256-QpN4VdRUzWlb0bN8pTbvfZMbCvYwqKJgpPh5UdykzFg=";
+    hash = "sha256-rdgjA6t5L4mNKnyRyNdIyzX6fjMUgbD0YCjresK94Dg=";
   };
 
   postPatch = ''

From ad88bea289fd74a45ef33bcc32ecda7bdb67374b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Apr 2025 14:25:12 +0000
Subject: [PATCH 03/45] necesse-server: 0.32.1-18110069 -> 0.32.1-18204230

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

diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix
index e338cc02af71..01b5c7a25fcb 100644
--- a/pkgs/by-name/ne/necesse-server/package.nix
+++ b/pkgs/by-name/ne/necesse-server/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.32.1-18110069";
+  version = "0.32.1-18204230";
   urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
 
 in
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
-    hash = "sha256-qeFr4dl4MD2rMVD+PIu/3zcRvCWOT1Bj8JB0FWXP1Yw=";
+    hash = "sha256-6xX5Fr3fGt7c/4jg8DBBG41QJH5PrxCVrC6w2ESNcLI=";
   };
 
   # removing packaged jre since we use our own

From ec044103c8b040029092b726ea46abf4e9d0ede8 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 28 Apr 2025 16:24:34 +0200
Subject: [PATCH 04/45] linux_testing: 6.15-rc3 -> 6.15-rc4

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index fab6f674d0cd..ce54d477f6ab 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,7 +1,7 @@
 {
     "testing": {
-        "version": "6.15-rc3",
-        "hash": "sha256:0pf83a8q4yxyz0wfnrwa14rdfcczll633qyn02n2pbqg7r5mxi61"
+        "version": "6.15-rc4",
+        "hash": "sha256:0zg817b9bbpl80cjmxgmxivi6xr80hng704mdl6m5knrl0v4ay5j"
     },
     "6.1": {
         "version": "6.1.135",

From c2134402456fdf99eb5eb2b613566e032f129e26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Apr 2025 23:09:58 +0000
Subject: [PATCH 05/45] lakectl: 1.54.0 -> 1.55.0

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

diff --git a/pkgs/by-name/la/lakectl/package.nix b/pkgs/by-name/la/lakectl/package.nix
index e69f8a8f1041..124f9dc795ca 100644
--- a/pkgs/by-name/la/lakectl/package.nix
+++ b/pkgs/by-name/la/lakectl/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "lakectl";
-  version = "1.54.0";
+  version = "1.55.0";
 
   src = fetchFromGitHub {
     owner = "treeverse";
     repo = "lakeFS";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fqjVufkmO2JOPyS1/dLx0RIY5BLvvwvKrJFkV1LN53I=";
+    hash = "sha256-T/baBUkcRXQkNqgTwqsaHmv91ZfW00ti+86b0vGWNmo=";
   };
 
   subPackages = [ "cmd/lakectl" ];
   proxyVendor = true;
-  vendorHash = "sha256-vg2x3QRU0RGq6GtqZU/YBtHAvj5shJtmPFrxx1/HppQ=";
+  vendorHash = "sha256-HdJeWHQmLOHZaq60xavt7MlkY1siF8JfX5tb+8FexJ4=";
 
   ldflags = [
     "-s"

From 390bf97c99cc0cefb0a5528f30e37b7ab6a71baf Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 26 Apr 2025 10:32:57 -0700
Subject: [PATCH 06/45] python3Packages.langchain-core: 0.3.49 -> 0.3.56

Diff: https://github.com/langchain-ai/langchain/compare/langchain-core%3D%3D0.3.49...langchain-core%3D%3D0.3.56
---
 .../python-modules/langchain-core/default.nix |  15 +-
 .../langchain-core/rm-blockbuster.patch       | 155 ------------------
 2 files changed, 4 insertions(+), 166 deletions(-)
 delete mode 100644 pkgs/development/python-modules/langchain-core/rm-blockbuster.patch

diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index 0903e6d2d509..9226ed18530e 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -17,6 +17,7 @@
   typing-extensions,
 
   # tests
+  blockbuster,
   freezegun,
   grandalf,
   httpx,
@@ -32,31 +33,22 @@
 
 buildPythonPackage rec {
   pname = "langchain-core";
-  version = "0.3.49";
+  version = "0.3.56";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-core==${version}";
-    hash = "sha256-s1vZ7G6Wzywf3euwX/RdCPkgzxvZTYVG0udGpHTIiQc=";
+    hash = "sha256-gsjYr22Phb71oKN4iVGsi6r1iETDhFHCKKOiwp0SuLU=";
   };
 
   sourceRoot = "${src.name}/libs/core";
 
-  patches = [
-    # Remove dependency on blockbuster (not available in nixpkgs due to dependency on forbiddenfruit)
-    ./rm-blockbuster.patch
-  ];
-
   build-system = [ pdm-backend ];
 
   pythonRelaxDeps = [ "tenacity" ];
 
-  pythonRemoveDependencies = [
-    "blockbuster"
-  ];
-
   dependencies = [
     jsonpatch
     langsmith
@@ -73,6 +65,7 @@ buildPythonPackage rec {
   doCheck = false;
 
   nativeCheckInputs = [
+    blockbuster
     freezegun
     grandalf
     httpx
diff --git a/pkgs/development/python-modules/langchain-core/rm-blockbuster.patch b/pkgs/development/python-modules/langchain-core/rm-blockbuster.patch
deleted file mode 100644
index a7dc2af18af4..000000000000
--- a/pkgs/development/python-modules/langchain-core/rm-blockbuster.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index a2cfc7adf..db37bd74a 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -53,7 +53,7 @@ test = [
-     "responses<1.0.0,>=0.25.0",
-     "pytest-socket<1.0.0,>=0.7.0",
-     "pytest-xdist<4.0.0,>=3.6.1",
--    "blockbuster~=1.5.18",
-+    # "blockbuster~=1.5.18",
-     "numpy<2.0.0,>=1.24.0; python_version < \"3.12\"",
-     "numpy<3,>=1.26.0; python_version >= \"3.12\"",
-     "langchain-tests",
-diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
-index 6438c3037..aa301c337 100644
---- a/tests/unit_tests/conftest.py
-+++ b/tests/unit_tests/conftest.py
-@@ -5,35 +5,35 @@ from importlib import util
- from uuid import UUID
- 
- import pytest
--from blockbuster import BlockBuster, blockbuster_ctx
-+# from blockbuster import BlockBuster, blockbuster_ctx
- from pytest import Config, Function, Parser
- from pytest_mock import MockerFixture
- 
- 
--@pytest.fixture(autouse=True)
--def blockbuster() -> Iterator[BlockBuster]:
--    with blockbuster_ctx("langchain_core") as bb:
--        for func in ["os.stat", "os.path.abspath"]:
--            (
--                bb.functions[func]
--                .can_block_in("langchain_core/_api/internal.py", "is_caller_internal")
--                .can_block_in("langchain_core/runnables/base.py", "__repr__")
--                .can_block_in(
--                    "langchain_core/beta/runnables/context.py", "aconfig_with_context"
--                )
--            )
--
--        for func in ["os.stat", "io.TextIOWrapper.read"]:
--            bb.functions[func].can_block_in(
--                "langsmith/client.py", "_default_retry_config"
--            )
--
--        for bb_function in bb.functions.values():
--            bb_function.can_block_in(
--                "freezegun/api.py", "_get_cached_module_attributes"
--            )
--
--        yield bb
-+# @pytest.fixture(autouse=True)
-+# def blockbuster() -> Iterator[BlockBuster]:
-+#     with blockbuster_ctx("langchain_core") as bb:
-+#         for func in ["os.stat", "os.path.abspath"]:
-+#             (
-+#                 bb.functions[func]
-+#                 .can_block_in("langchain_core/_api/internal.py", "is_caller_internal")
-+#                 .can_block_in("langchain_core/runnables/base.py", "__repr__")
-+#                 .can_block_in(
-+#                     "langchain_core/beta/runnables/context.py", "aconfig_with_context"
-+#                 )
-+#             )
-+
-+#         for func in ["os.stat", "io.TextIOWrapper.read"]:
-+#             bb.functions[func].can_block_in(
-+#                 "langsmith/client.py", "_default_retry_config"
-+#             )
-+
-+#         for bb_function in bb.functions.values():
-+#             bb_function.can_block_in(
-+#                 "freezegun/api.py", "_get_cached_module_attributes"
-+#             )
-+
-+#         yield bb
- 
- 
- def pytest_addoption(parser: Parser) -> None:
-diff --git a/tests/unit_tests/language_models/chat_models/test_rate_limiting.py b/tests/unit_tests/language_models/chat_models/test_rate_limiting.py
-index ee6eefba9..4d39da58d 100644
---- a/tests/unit_tests/language_models/chat_models/test_rate_limiting.py
-+++ b/tests/unit_tests/language_models/chat_models/test_rate_limiting.py
-@@ -2,17 +2,17 @@ import time
- from typing import Optional as Optional
- 
- import pytest
--from blockbuster import BlockBuster
-+# from blockbuster import BlockBuster
- 
- from langchain_core.caches import InMemoryCache
- from langchain_core.language_models import GenericFakeChatModel
- from langchain_core.rate_limiters import InMemoryRateLimiter
- 
- 
--@pytest.fixture(autouse=True)
--def deactivate_blockbuster(blockbuster: BlockBuster) -> None:
--    # Deactivate BlockBuster to not disturb the rate limiter timings
--    blockbuster.deactivate()
-+# @pytest.fixture(autouse=True)
-+# def deactivate_blockbuster(blockbuster: BlockBuster) -> None:
-+#     # Deactivate BlockBuster to not disturb the rate limiter timings
-+#     blockbuster.deactivate()
- 
- 
- def test_rate_limit_invoke() -> None:
-diff --git a/tests/unit_tests/runnables/test_runnable_events_v2.py b/tests/unit_tests/runnables/test_runnable_events_v2.py
-index e1e1f37b9..21d2f1600 100644
---- a/tests/unit_tests/runnables/test_runnable_events_v2.py
-+++ b/tests/unit_tests/runnables/test_runnable_events_v2.py
-@@ -15,7 +15,7 @@ from typing import (
- )
- 
- import pytest
--from blockbuster import BlockBuster
-+# from blockbuster import BlockBuster
- from pydantic import BaseModel
- 
- from langchain_core.callbacks import CallbackManagerForRetrieverRun, Callbacks
-@@ -2005,7 +2005,7 @@ EXPECTED_EVENTS = [
- 
- async def test_sync_in_async_stream_lambdas(blockbuster: BlockBuster) -> None:
-     """Test invoking nested runnable lambda."""
--    blockbuster.deactivate()
-+    # blockbuster.deactivate()
- 
-     def add_one(x: int) -> int:
-         return x + 1
-diff --git a/tests/unit_tests/test_setup.py b/tests/unit_tests/test_setup.py
-index 1df3c73a2..58e94de9a 100644
---- a/tests/unit_tests/test_setup.py
-+++ b/tests/unit_tests/test_setup.py
-@@ -1,15 +1,15 @@
- import time
- 
- import pytest
--from blockbuster import BlockingError
-+# from blockbuster import BlockingError
- 
- from langchain_core import sys_info
- 
- 
--async def test_blockbuster_setup() -> None:
--    """Check if blockbuster is correctly setup."""
--    # Blocking call outside of langchain_core is allowed.
--    time.sleep(0.01)  # noqa: ASYNC251
--    with pytest.raises(BlockingError):
--        # Blocking call from langchain_core raises BlockingError.
--        sys_info.print_sys_info()
-+# async def test_blockbuster_setup() -> None:
-+#     """Check if blockbuster is correctly setup."""
-+#     # Blocking call outside of langchain_core is allowed.
-+#     time.sleep(0.01)  # noqa: ASYNC251
-+#     with pytest.raises(BlockingError):
-+#         # Blocking call from langchain_core raises BlockingError.
-+#         sys_info.print_sys_info()

From 813ee96b7e3bc0e71f2660b5413660299a9bf76d Mon Sep 17 00:00:00 2001
From: Petr Zahradnik <junior@zahradnik.cz>
Date: Sun, 27 Apr 2025 23:48:00 +0200
Subject: [PATCH 07/45] pod2mdoc: 0.0.10 -> 0.2, fix non-BSD build

---
 pkgs/by-name/po/pod2mdoc/package.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/po/pod2mdoc/package.nix b/pkgs/by-name/po/pod2mdoc/package.nix
index 97dcc5590854..ffb849484a0e 100644
--- a/pkgs/by-name/po/pod2mdoc/package.nix
+++ b/pkgs/by-name/po/pod2mdoc/package.nix
@@ -4,15 +4,20 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pod2mdoc";
-  version = "0.0.10";
+  version = "0.2";
 
   src = fetchurl {
-    url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/pod2mdoc-${version}.tgz";
-    sha256 = "0nwa9zv9gmfi5ysz1wfm60kahc7nv0133n3dfc2vh2y3gj8mxr4f";
+    url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/pod2mdoc-${finalAttrs.version}.tgz";
+    hash = "sha256-dPH+MfYdyHauClcD7N1zwjw4EPdtt9uQGCUh9OomsPw=";
   };
 
+  # use compat_ohash instead of system ohash, which is BSD-specific
+  postPatch = ''
+    substituteInPlace Makefile --replace-fail "-DHAVE_OHASH=1" "-DHAVE_OHASH=0"
+  '';
+
   installPhase = ''
     mkdir -p $out/bin
     mkdir -p $out/share/man/man1
@@ -20,12 +25,14 @@ stdenv.mkDerivation rec {
     install -m 0444 pod2mdoc.1 $out/share/man/man1
   '';
 
-  meta = with lib; {
-    homepage = "http://mdocml.bsd.lv/";
+  enableParallelBuild = true;
+
+  meta = {
+    homepage = "https://mandoc.bsd.lv/pod2mdoc/";
     description = "converter from POD into mdoc";
-    license = licenses.isc;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ ramkromberg ];
+    license = lib.licenses.isc;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ramkromberg ];
     mainProgram = "pod2mdoc";
   };
-}
+})

From 43ad669079e027588b993333851e5e1c631479de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 06:23:34 +0000
Subject: [PATCH 08/45] krillinai: 1.1.3 -> 1.1.4

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

diff --git a/pkgs/by-name/kr/krillinai/package.nix b/pkgs/by-name/kr/krillinai/package.nix
index 36da42a9b2a7..0013d23e0c33 100644
--- a/pkgs/by-name/kr/krillinai/package.nix
+++ b/pkgs/by-name/kr/krillinai/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "krillinai";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "krillinai";
     repo = "KrillinAI";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hEKjqQcHnrxY266EP5uoLMzw6csi2bS5Q+ghGb6TJ4c=";
+    hash = "sha256-espj6BFc0GA5pURyly1HV3rIqyEgd1S/bmqkUPczTqM=";
   };
 
   vendorHash = "sha256-mpvypCZmvVVljftGpcV1aea3s7Xmhr0jLfKZIZ0nkX8=";

From 50a572e12ba0dd4147d9b096cc44e7e62e8ec3a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Apr 2025 21:56:33 +0200
Subject: [PATCH 09/45] nixVersions.nix_2_28: 2.28.2 -> 2.28.3

Diff: https://github.com/NixOS/nix/compare/2.28.2...2.28.3
---
 pkgs/tools/package-management/nix/default.nix |  8 +--
 ...ignore-system-user-registries-during.patch | 51 -------------------
 2 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix/patches/0001-Revert-Actually-ignore-system-user-registries-during.patch

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 846f062cfc98..3d118f98be53 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -184,13 +184,9 @@ lib.makeExtensible (
       };
 
       nix_2_28 = commonMeson {
-        version = "2.28.2";
-        hash = "sha256-yl+hlZ/VFHIZwPIDEs4ysOYgprW4VEORfSyvScF7Cwg=";
+        version = "2.28.3";
+        hash = "sha256-TjZp5ITSUvNRAzNznmkZRQxNRzMLiSAplz4bV2T8cbs=";
         self_attribute_name = "nix_2_28";
-        patches = [
-          # fixes user/system registries regression: https://github.com/NixOS/nix/issues/13050
-          ./patches/0001-Revert-Actually-ignore-system-user-registries-during.patch
-        ];
       };
 
       nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
diff --git a/pkgs/tools/package-management/nix/patches/0001-Revert-Actually-ignore-system-user-registries-during.patch b/pkgs/tools/package-management/nix/patches/0001-Revert-Actually-ignore-system-user-registries-during.patch
deleted file mode 100644
index c38cbb3a8011..000000000000
--- a/pkgs/tools/package-management/nix/patches/0001-Revert-Actually-ignore-system-user-registries-during.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8df4f5db3c71046f5deaeb913e5ec0d16f70b5a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
-Date: Thu, 24 Apr 2025 14:17:18 +0200
-Subject: [PATCH] Revert "Actually ignore system/user registries during
- locking"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit a08477975d90dc0d2c9f89d2a417bedb5b266931.
-
-Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
----
- src/libflake/flake/flakeref.cc    | 2 +-
- tests/functional/flakes/flakes.sh | 7 -------
- 2 files changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/src/libflake/flake/flakeref.cc b/src/libflake/flake/flakeref.cc
-index 1580c2846..6e95eb767 100644
---- a/src/libflake/flake/flakeref.cc
-+++ b/src/libflake/flake/flakeref.cc
-@@ -39,7 +39,7 @@ FlakeRef FlakeRef::resolve(
-     ref<Store> store,
-     const fetchers::RegistryFilter & filter) const
- {
--    auto [input2, extraAttrs] = lookupInRegistries(store, input, filter);
-+    auto [input2, extraAttrs] = lookupInRegistries(store, input);
-     return FlakeRef(std::move(input2), fetchers::maybeGetStrAttr(extraAttrs, "dir").value_or(subdir));
- }
- 
-diff --git a/tests/functional/flakes/flakes.sh b/tests/functional/flakes/flakes.sh
-index b67a0964a..d8c9f254d 100755
---- a/tests/functional/flakes/flakes.sh
-+++ b/tests/functional/flakes/flakes.sh
-@@ -220,13 +220,6 @@ nix store gc
- nix registry list --flake-registry "file://$registry" --refresh | grepQuiet flake3
- mv "$registry.tmp" "$registry"
- 
--# Ensure that locking ignores the user registry.
--mkdir -p "$TEST_HOME/.config/nix"
--ln -sfn "$registry" "$TEST_HOME/.config/nix/registry.json"
--nix flake metadata flake1
--expectStderr 1 nix flake update --flake-registry '' --flake "$flake3Dir" | grepQuiet "cannot find flake 'flake:flake1' in the flake registries"
--rm "$TEST_HOME/.config/nix/registry.json"
--
- # Test whether flakes are registered as GC roots for offline use.
- # FIXME: use tarballs rather than git.
- rm -rf "$TEST_HOME/.cache"
--- 
-2.49.0
-

From 7fd4e73000eb673fcca138f6c794e719a6016628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 Apr 2025 21:56:34 +0200
Subject: [PATCH 10/45] nix: update nix-fallback-paths to 2.28.3

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 062db2ac3b9d..55a0c46237ed 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,8 +1,8 @@
 {
-  x86_64-linux = "/nix/store/pzwdmrz94mya45m1jnsf294c0g3cwy9m-nix-2.28.2";
-  i686-linux = "/nix/store/vzqxry2dwq9nzr2y0jk1q7qv3ygv14m1-nix-2.28.2";
-  aarch64-linux = "/nix/store/52zak9psh00w8c8iz8x0ny33in5wwr83-nix-2.28.2";
-  riscv64-linux = "/nix/store/rkggav1j9wb55zc8jsl1vg81s831aqj8-nix-riscv64-unknown-linux-gnu-2.28.2";
-  x86_64-darwin = "/nix/store/afwsvhzqf936zx5v4i7ynqah2qhq7qyj-nix-2.28.2";
-  aarch64-darwin = "/nix/store/djcysgb0pgrigaqfnmraviv6nix786zi-nix-2.28.2";
+  x86_64-linux = "/nix/store/pfh6bq2wxbpp3xz5sinymmp44n505zh8-nix-2.28.3";
+  i686-linux = "/nix/store/nfxdfb9zcrm9sqkw8xhdqs7vcvrwp1k2-nix-2.28.3";
+  aarch64-linux = "/nix/store/7w6fj8s7h4pcmx38m1f51xd93ywizm4i-nix-2.28.3";
+  riscv64-linux = "/nix/store/nnynd5vfd6pf9jkp13bmj44rlrd61l3h-nix-riscv64-unknown-linux-gnu-2.28.3";
+  x86_64-darwin = "/nix/store/rdxbh5m09c9i2s7zkh7b8g6mnrpmaa19-nix-2.28.3";
+  aarch64-darwin = "/nix/store/wjrdsqbaial7pl9vfhqc7cpzd9lqcr6a-nix-2.28.3";
 }

From 5cfc32620958e566d59b1ef3892039691c33e64a Mon Sep 17 00:00:00 2001
From: Yethal <26117918+Yethal@users.noreply.github.com>
Date: Wed, 30 Apr 2025 09:10:51 +0200
Subject: [PATCH 11/45] nushell: 0.103.0 -> 0.104.0

---
 pkgs/shells/nushell/default.nix         | 6 +++---
 pkgs/shells/nushell/plugins/formats.nix | 3 +--
 pkgs/shells/nushell/plugins/gstat.nix   | 3 +--
 pkgs/shells/nushell/plugins/polars.nix  | 3 +--
 pkgs/shells/nushell/plugins/query.nix   | 3 +--
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index 60f1fefe8221..609e71efca8a 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -23,7 +23,7 @@
 }:
 
 let
-  version = "0.103.0";
+  version = "0.104.0";
 in
 
 rustPlatform.buildRustPackage {
@@ -34,11 +34,11 @@ rustPlatform.buildRustPackage {
     owner = "nushell";
     repo = "nushell";
     tag = version;
-    hash = "sha256-PqhZFzFkvOtznJV3h25X02ZgLLvlheMm9R0tibcBrbQ=";
+    hash = "sha256-F4nHCOpbcvmdXDX5KJc9MS3hIIrtMlZR8IjDU7Us/xs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY=";
+  cargoHash = "sha256-zem4HgxO0DD22Bxvs9KN3Zb5E991svV5qcw7MfDUOq4=";
 
   nativeBuildInputs =
     [ pkg-config ]
diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix
index 7581ed0cf2f0..a1c7a095528b 100644
--- a/pkgs/shells/nushell/plugins/formats.nix
+++ b/pkgs/shells/nushell/plugins/formats.nix
@@ -11,9 +11,8 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_formats";
-  inherit (nushell) version src;
+  inherit (nushell) version src cargoHash;
   useFetchCargoVendor = true;
-  cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix
index 458f57e1beb8..008113de79a8 100644
--- a/pkgs/shells/nushell/plugins/gstat.nix
+++ b/pkgs/shells/nushell/plugins/gstat.nix
@@ -11,9 +11,8 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_gstat";
-  inherit (nushell) version src;
+  inherit (nushell) version src cargoHash;
   useFetchCargoVendor = true;
-  cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix
index 31e8ec22b9b1..2bf100e5f8a7 100644
--- a/pkgs/shells/nushell/plugins/polars.nix
+++ b/pkgs/shells/nushell/plugins/polars.nix
@@ -12,10 +12,9 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_polars";
-  inherit (nushell) version src;
+  inherit (nushell) version src cargoHash;
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs =
diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix
index 880bbca3a64b..1e066c88b003 100644
--- a/pkgs/shells/nushell/plugins/query.nix
+++ b/pkgs/shells/nushell/plugins/query.nix
@@ -13,9 +13,8 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_query";
-  inherit (nushell) version src;
+  inherit (nushell) version src cargoHash;
   useFetchCargoVendor = true;
-  cargoHash = "sha256-8q/z0SmhTKsTlixze8Deej4rFsO4QyDce2OvIvE4AcY=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs =

From 75568b94f6a3a10d30e5b3ca0a67c1a95a8ec32f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 07:14:58 +0000
Subject: [PATCH 12/45] goreleaser: 2.8.2 -> 2.9.0

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

diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix
index d1c06ea578ad..08a7920fea6f 100644
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -10,16 +10,16 @@
 }:
 buildGoModule rec {
   pname = "goreleaser";
-  version = "2.8.2";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "goreleaser";
     rev = "v${version}";
-    hash = "sha256-F9gUntTqllTYrRTuUj4tWMrHArM8BflCROPBsOdIsFA=";
+    hash = "sha256-2nen0Bd7jBlRz9AbcQAiK1GdT0ZkP9gBu3TfbpXIX6M=";
   };
 
-  vendorHash = "sha256-MGBMPiya1mUBCYcLuTtMCwZ9e+LEtT7Xrb/WZf86IXE=";
+  vendorHash = "sha256-RN06Smr6HQGOUV3hQKxAbueDwI8ZlrnaF3vwrSesGOM=";
 
   ldflags = [
     "-s"

From bc2b4e77d888ff13effd7b244c37dc135bbc9b7c Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Tue, 22 Apr 2025 16:56:40 +0200
Subject: [PATCH 13/45] llvmPackages: add comments for all patches in LLVM and
 CLang

Co-Authored-By: Silvan Mosberger <silvan.mosberger@moduscreate.com>
---
 .../compilers/llvm/common/clang/default.nix       |  4 ++++
 .../compilers/llvm/common/llvm/default.nix        | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix
index c5565ca405b8..8a65d5750d53 100644
--- a/pkgs/development/compilers/llvm/common/clang/default.nix
+++ b/pkgs/development/compilers/llvm/common/clang/default.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation (
     patches =
       [
         (getVersionFile "clang/purity.patch")
+        # Remove extraneous ".a" suffix from baremetal clang_rt.builtins when compiling for baremetal.
         # https://reviews.llvm.org/D51899
         (getVersionFile "clang/gnu-install-dirs.patch")
       ]
@@ -76,6 +77,7 @@ stdenv.mkDerivation (
         else
           ./ignore-nostd-link-13.diff
       )
+      # Pass the correct path to libllvm
       ++ [
         (replaceVars
           (
@@ -112,6 +114,8 @@ stdenv.mkDerivation (
             stripLen = 1;
             hash = "sha256-Vs32kql7N6qtLqc12FtZHURcbenA7+N3E/nRRX3jdig=";
           })
+      # Fixes a bunch of lambda-related crashes
+      # https://github.com/llvm/llvm-project/pull/93206
       ++ lib.optional (lib.versions.major release_version == "18") (fetchpatch {
         name = "tweak-tryCaptureVariable-for-unevaluated-lambdas.patch";
         url = "https://github.com/llvm/llvm-project/commit/3d361b225fe89ce1d8c93639f27d689082bd8dad.patch";
diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index d2f9e711f653..d9a6f8087496 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -123,8 +123,14 @@ stdenv.mkDerivation (
     ];
 
     patches =
-      lib.optional (lib.versionOlder release_version "14") ./llvm-config-link-static.patch
+      lib.optional (lib.versionOlder release_version "14")
+        # When cross-compiling we configure llvm-config-native with an approximation
+        # of the flags used for the normal LLVM build. To avoid the need for building
+        # a native libLLVM.so (which would fail) we force llvm-config to be linked
+        # statically against the necessary LLVM components always.
+        ./llvm-config-link-static.patch
       ++ lib.optionals (lib.versions.major release_version == "12") [
+        # Fix llvm being miscompiled by some gccs. See https://github.com/llvm/llvm-project/issues/49955
         (getVersionFile "llvm/fix-llvm-issue-49955.patch")
 
         # On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test.
@@ -135,6 +141,9 @@ stdenv.mkDerivation (
           stripLen = 1;
         })
       ]
+      # Support custom installation dirs
+      # Originally based off https://reviews.llvm.org/D99484
+      # Latest state: https://github.com/llvm/llvm-project/pull/125376
       ++ [ (getVersionFile "llvm/gnu-install-dirs.patch") ]
       ++ lib.optionals (lib.versionAtLeast release_version "15") [
         # Running the tests involves invoking binaries (like `opt`) that depend on
@@ -241,7 +250,8 @@ stdenv.mkDerivation (
           ]
       ++
         lib.optional (lib.versions.major release_version == "17")
-          # resolves https://github.com/llvm/llvm-project/issues/75168
+          # Fixes a crash with -fzero-call-used-regs=used-gpr
+          # See also https://github.com/llvm/llvm-project/issues/75168
           (
             fetchpatch {
               name = "fix-fzero-call-used-regs.patch";
@@ -278,6 +288,7 @@ stdenv.mkDerivation (
             })
           ]
       ++ lib.optionals enablePolly [
+        # Just like the `gnu-install-dirs` patch, but for `polly`.
         (getVersionFile "llvm/gnu-install-dirs-polly.patch")
       ]
       ++

From 7a443c2232b666a1e7d979bf15cf5acf56b09d39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 08:17:06 +0000
Subject: [PATCH 14/45] inputplumber: 0.53.0 -> 0.56.0

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

diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix
index 76660af9bf6a..7e61ad7eff86 100644
--- a/pkgs/by-name/in/inputplumber/package.nix
+++ b/pkgs/by-name/in/inputplumber/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "inputplumber";
-  version = "0.53.0";
+  version = "0.56.0";
 
   src = fetchFromGitHub {
     owner = "ShadowBlip";
     repo = "InputPlumber";
     tag = "v${version}";
-    hash = "sha256-pb1vyXJh0nmW8kc6hp6dgr84419Qcm6rjatzkjC4QNY=";
+    hash = "sha256-LL7S6zlfSS/lhVp1iWtaoIXOv6xepta2reUpHpALNF0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-zUK73enMMvrF196ILLNIx77IkvaMtTdbMRJXd8fzMzQ=";
+  cargoHash = "sha256-0qoA0ZwPFNA4HYvkccOPRkLyf9a624Uij6bEsj6f5ZM=";
 
   nativeBuildInputs = [
     pkg-config

From 339d1d1cb1f669d534acdae9641185ea97b5970d Mon Sep 17 00:00:00 2001
From: uonr <dev@yuru.me>
Date: Wed, 30 Apr 2025 18:52:11 +0900
Subject: [PATCH 15/45] importNpmLock: handle "resolved" is null

---
 pkgs/build-support/node/import-npm-lock/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/node/import-npm-lock/default.nix b/pkgs/build-support/node/import-npm-lock/default.nix
index 7442d48bad16..d80643d60a32 100644
--- a/pkgs/build-support/node/import-npm-lock/default.nix
+++ b/pkgs/build-support/node/import-npm-lock/default.nix
@@ -27,7 +27,7 @@ let
       fetcherOpts,
     }:
     (
-      if module ? "resolved" then
+      if module ? "resolved" && module.resolved != null then
         (
           let
             # Parse scheme from URL

From f0df3d4d277136a94a60dfdc59f3774ca79bee29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 11:10:36 +0000
Subject: [PATCH 16/45] python312Packages.openstackdocstheme: 3.4.1 -> 3.5.0

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

diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix
index dd1ebe0a52d9..3674840098b6 100644
--- a/pkgs/development/python-modules/openstackdocstheme/default.nix
+++ b/pkgs/development/python-modules/openstackdocstheme/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "openstackdocstheme";
-  version = "3.4.1";
+  version = "3.5.0";
   pyproject = true;
 
   disabled = pythonAtLeast "3.13";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OPT2rGO967RlJ17iEm5oMuaxqZ8Y8ya+gKMzU0qaGzk=";
+    hash = "sha256-3h1dXtIMk1/CgbUP30ppUo+Q8qdb7PQtGIRD9eGWwJ8=";
   };
 
   postPatch = ''

From 2c51292032a374759eb5b52426426f9819ab4032 Mon Sep 17 00:00:00 2001
From: LoC <loc@locrealloc.de>
Date: Wed, 30 Apr 2025 13:58:24 +0200
Subject: [PATCH 17/45] netbird: 0.43.0 -> 0.43.1

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

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index f62bbd9e3c1e..2a1f77365015 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -31,16 +31,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird";
-  version = "0.43.0";
+  version = "0.43.1";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HmNd5MyplQ8iwpaxhEnomASIwx4VE3Qv70sURxqDzdo=";
+    hash = "sha256-otjdzt+RLjic3VyoRh/uneP6qChy8QaxkIQT9YFS1pY=";
   };
 
-  vendorHash = "sha256-/iqWVDqQOTFP5OZDrgq5gAH7NmHneQlf5+wAzIyoEPw=";
+  vendorHash = "sha256-/STnSegRtpdMhh9RaCqwc6dSXvt7UO5GVz7/M9JzamM=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
 

From 034802a5fef24f05b3db24325af3ea93592e0583 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 12:42:18 +0000
Subject: [PATCH 18/45] qdocumentview: 0.3.0 -> 0.3.0.1

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

diff --git a/pkgs/by-name/qd/qdocumentview/package.nix b/pkgs/by-name/qd/qdocumentview/package.nix
index ff6c6934942a..fc72f319be25 100644
--- a/pkgs/by-name/qd/qdocumentview/package.nix
+++ b/pkgs/by-name/qd/qdocumentview/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qdocumentview";
-  version = "0.3.0";
+  version = "0.3.0.1";
 
   src = fetchFromGitLab {
     owner = "extraqt";
     repo = "qdocumentview";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fGm19Bl3lSvMhau2jByZTTThwfWnsrm/Xx82J6ZJcVo=";
+    hash = "sha256-z5Z43fo6oemGBn5Gfmx5ndeOva+qSH6mwkUWClylChA=";
   };
 
   nativeBuildInputs = [

From 796bda512398473ca60f5383fcc9bdf959adabc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 12:45:28 +0000
Subject: [PATCH 19/45] ttdl: 4.10.0 -> 4.11.0

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

diff --git a/pkgs/by-name/tt/ttdl/package.nix b/pkgs/by-name/tt/ttdl/package.nix
index 4d577365b809..a2d37d182987 100644
--- a/pkgs/by-name/tt/ttdl/package.nix
+++ b/pkgs/by-name/tt/ttdl/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ttdl";
-  version = "4.10.0";
+  version = "4.11.0";
 
   src = fetchFromGitHub {
     owner = "VladimirMarkelov";
     repo = "ttdl";
     rev = "v${version}";
-    sha256 = "sha256-cCz2wxYvYAoI+Hmyll+Fn56NUCuWlIiJycmYvGyhkR4=";
+    sha256 = "sha256-REfk8m5ZYfms5hjzbYdqe27z3/qGzC0CLWQ/Cj3418Q=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-207Tmfs3LrZkwsAF/9qD5PN/zHwzCf0lq+87bFIP7y8=";
+  cargoHash = "sha256-dr/hT8mVUlO0pX/OGqIqPDevflNVPD88epLZsW772Os=";
 
   meta = with lib; {
     description = "CLI tool to manage todo lists in todo.txt format";

From 61dee0330f46127f8f8a63c21d640703a7a76eea Mon Sep 17 00:00:00 2001
From: Savchenko Dmitriy <apicalium@gmail.com>
Date: Wed, 30 Apr 2025 15:54:33 +0300
Subject: [PATCH 20/45] sherlock-launcher: init at 0.1.10

Sherlock is a GTK4 launcher for Wayland written in Rust;

Upstream homepage: https://github.com/Skxxtz/sherlock
---
 pkgs/by-name/sh/sherlock-launcher/package.nix | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/sh/sherlock-launcher/package.nix

diff --git a/pkgs/by-name/sh/sherlock-launcher/package.nix b/pkgs/by-name/sh/sherlock-launcher/package.nix
new file mode 100644
index 000000000000..c1202c021fcd
--- /dev/null
+++ b/pkgs/by-name/sh/sherlock-launcher/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  gtk4,
+  gtk4-layer-shell,
+  dbus,
+  glib,
+  wayland,
+  openssl,
+  sqlite,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "sherlock-launcher";
+  version = "0.1.10";
+
+  src = fetchFromGitHub {
+    owner = "Skxxtz";
+    repo = "sherlock";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-PCgnGRujbeQ2ckXYGAU38+WxGTpIayPVOL3ivnPYFwQ=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    glib
+  ];
+
+  buildInputs = [
+    gtk4
+    gtk4-layer-shell
+    dbus
+    openssl
+    sqlite
+    glib
+    wayland
+  ];
+
+  cargoHash = "sha256-053x0ChpE5MCYKzW/nJ29LzGnMgut2RLgb5KkTF17Vc=";
+
+  meta = {
+    description = "Lightweight and efficient application launcher for Wayland built with Rust and GTK4";
+    homepage = "https://github.com/Skxxtz/sherlock";
+    license = lib.licenses.cc-by-nc-40;
+    mainProgram = "sherlock";
+    maintainers = with lib.maintainers; [ agvantibo ];
+  };
+})

From 623472e4cbdf967ecf6771e8c846c5e1e8c64cd1 Mon Sep 17 00:00:00 2001
From: Savchenko Dmitriy <apicalium@gmail.com>
Date: Wed, 30 Apr 2025 08:41:19 +0300
Subject: [PATCH 21/45] maintainers: add agvantibo

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e18c09209be6..4ec984d7d35a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -772,6 +772,12 @@
     githubId = 1141462;
     name = "Vladyslav Pekker";
   };
+  agvantibo = {
+    email = "apicalium@gmail.com";
+    github = "agvantibo-again";
+    githubId = 207841739;
+    name = "Savchenko Dmitriy";
+  };
   aherrmann = {
     email = "andreash87@gmx.ch";
     github = "aherrmann";

From de2767ab06caba76cdccee2c17dddebd8880c3d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 12:57:12 +0000
Subject: [PATCH 22/45] reflection-cpp: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/by-name/re/reflection-cpp/package.nix b/pkgs/by-name/re/reflection-cpp/package.nix
index 6c0ed16764d9..0328d8b6716e 100644
--- a/pkgs/by-name/re/reflection-cpp/package.nix
+++ b/pkgs/by-name/re/reflection-cpp/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "reflection-cpp";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "contour-terminal";
     repo = "reflection-cpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-q0h8p6xJ1UectRe656B6mT5+QokxR9N8rqzvgwUBugg=";
+    hash = "sha256-3TVoJkM+4RmB+KwWEpGo7gvzqCASNBmDHT+AzkR5KKk=";
   };
 
   nativeBuildInputs = [ cmake ];

From 10e6b845e8c1b0a45fed569688a2323426003fda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 13:04:48 +0000
Subject: [PATCH 23/45] pmtiles: 1.27.2 -> 1.28.0

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

diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix
index 64ee66c85c0d..f47ca31492ad 100644
--- a/pkgs/by-name/pm/pmtiles/package.nix
+++ b/pkgs/by-name/pm/pmtiles/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "pmtiles";
-  version = "1.27.2";
+  version = "1.28.0";
 
   src = fetchFromGitHub {
     owner = "protomaps";
     repo = "go-pmtiles";
     tag = "v${version}";
-    hash = "sha256-yOQrwJZUUdknEB+/I/BeQjtQvQ9HoKOJOYL4TM4vpc8=";
+    hash = "sha256-g+QVsvf28LWkT2iEJUvG1f5eOjR444Xca5W5ImCQXvM=";
   };
 
   vendorHash = "sha256-kfEzpaFMf0W8Ygtl40LBy3AZQSL+9Uo+n2x9OTOavqk=";

From d9c296b4e596cb3f6ed6433fecd742763d4b101c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 13:37:32 +0000
Subject: [PATCH 24/45] jreleaser-cli: 1.17.0 -> 1.18.0

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

diff --git a/pkgs/by-name/jr/jreleaser-cli/package.nix b/pkgs/by-name/jr/jreleaser-cli/package.nix
index 3754e8577554..b171633980ae 100644
--- a/pkgs/by-name/jr/jreleaser-cli/package.nix
+++ b/pkgs/by-name/jr/jreleaser-cli/package.nix
@@ -7,11 +7,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "jreleaser-cli";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchurl {
     url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar";
-    hash = "sha256-V3RDSpoHLJxUImPf+8wQdfukFNftfsZI1L9k+sD4yZg=";
+    hash = "sha256-rJYFoPPz1tR7LgcVfiRPFJHf1tMLhlxNQXsmutHZs3Q=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 3fd9664e952d80dadedd1c62fe2bf2e34ab15d73 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Thu, 24 Apr 2025 13:07:23 +0200
Subject: [PATCH 25/45] electron-source.electron_34: 34.5.2 -> 34.5.3

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.3
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.2...v34.5.3
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index e2f7e7564b35..e2a8096c389f 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -57,10 +57,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-o/luH8qWEMxgigE9Uo6lhv/jNj1bEOCVTvdHU2EuTlw=",
+                    "hash": "sha256-EKqpKTuNmZhjrblE4TkDRrdieb6kNLfLubNU3hpfqLI=",
                     "owner": "electron",
                     "repo": "electron",
-                    "rev": "v34.5.2"
+                    "rev": "v34.5.3"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1274,7 +1274,7 @@
         "electron_yarn_hash": "10ny8cj2m8wn8zb5ljsfc8rpv6y4rp049zv5i5slyk3lj2zpgr6y",
         "modules": "132",
         "node": "20.19.0",
-        "version": "34.5.2"
+        "version": "34.5.3"
     },
     "35": {
         "chrome": "134.0.6998.205",

From 4e7466802afcedb02c3e17b722f71a6125c4c2c0 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Thu, 24 Apr 2025 13:22:59 +0200
Subject: [PATCH 26/45] electron-source.electron_35: 35.2.0 -> 35.2.1

- Changelog: https://github.com/electron/electron/releases/tag/v35.2.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.2.0...v35.2.1
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index e2a8096c389f..0015f35b807b 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1334,10 +1334,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-9svv7kEnZqgwyE9LnuBTIiUguZdgCHUkkupxtpUGcKQ=",
+                    "hash": "sha256-5+LqyQs8wC7EwmO3/YSGsvb+JNBPliycNSrLLUBeNnM=",
                     "owner": "electron",
                     "repo": "electron",
-                    "rev": "v35.2.0"
+                    "rev": "v35.2.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2583,6 +2583,6 @@
         "electron_yarn_hash": "0l38rbmlrcrgkw7ggj33xszcs7arm601gzq4c8v0rn3m5zp6yr77",
         "modules": "133",
         "node": "22.14.0",
-        "version": "35.2.0"
+        "version": "35.2.1"
     }
 }

From b3b5bb7aa1473e5384a8c89e0903e7e51e8fe086 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Fri, 25 Apr 2025 12:02:24 +0200
Subject: [PATCH 27/45] electron_34-bin: 34.5.2 -> 34.5.3

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.3
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.2...v34.5.3
---
 pkgs/development/tools/electron/binary/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 1b6af89e9202..41cc47e9f926 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "26cf72d9032fc99674a8404f6740df0cbba7599943feae82122c8d0b8c5cca43",
-            "aarch64-linux": "6d511e55631bf73d56729dd0798bc23d44aa16a78bc94e912cae465d54b749f7",
-            "armv7l-linux": "f119dbe8d4a3c0dac2683b82713bd8a3e65ab111bff6c2cf75ced2d52b1e00de",
+            "aarch64-darwin": "3b0cddd2b2255f59ef875fc637c2663f225f30233b6eb7ddf7fdf5222b5961f1",
+            "aarch64-linux": "a66671fefa3fd3fe9325c7c426abd06cbd33509095a598aa694247f3f6e0116f",
+            "armv7l-linux": "d1f70070aa7f5747a0e3e1f62c8c77ee122bc95519faeef3117dabd0f0dc9f41",
             "headers": "1z70qaping1fxsg9x130zjywcc6pirsnyrk0bg3jiirynpvpp5yq",
-            "x86_64-darwin": "6003dfdc608b2b2ef1591659e7360c723e9b446f852030931bb9c66fadb9c4c0",
-            "x86_64-linux": "878c958cda5e2e48de1e5a89203bd2e3031f2dbbb25453fb75a305446eb282d0"
+            "x86_64-darwin": "20b45d23c25c0c0d3ce86a53520fdaecb87ad98841714b694b4ef7182edbae33",
+            "x86_64-linux": "53ea5ac3faa44a1e5511ad67b1020833dc0e792f19158e3684d6b5d9e85da98b"
         },
-        "version": "34.5.2"
+        "version": "34.5.3"
     },
     "35": {
         "hashes": {

From 81a53fd87bc3bb52a4d284c50f23a07ad4556e9a Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Fri, 25 Apr 2025 12:02:27 +0200
Subject: [PATCH 28/45] electron-chromedriver_34: 34.5.2 -> 34.5.3

- Changelog: https://github.com/electron/electron/releases/tag/v34.5.3
- Diff: https://github.com/electron/electron/compare/refs/tags/v34.5.2...v34.5.3
---
 .../tools/electron/chromedriver/info.json            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 1444aa46244f..64a21a4a8684 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "34": {
         "hashes": {
-            "aarch64-darwin": "fe1c9cd744f4c2542750ed96f99aff9cd3b28e6a62a21e2302f67cc7d9925b73",
-            "aarch64-linux": "fdfe6945ed870a8eb96f6d5119ed8f5b1704391fe9acfd8c3fa110ab6f74844d",
-            "armv7l-linux": "f0f567ffdb31f57124ceda3e81545b1525f69ef8b722c3493f55effce7a3266e",
+            "aarch64-darwin": "8da5b77a10428ef5c8ea5a313ecc852e29d658bb01b2951e4912cdd7addeb4b1",
+            "aarch64-linux": "a3c62fb635bc97fec63ace981ed227dd3625bfa7f7ab942c3d90c9b9ba859906",
+            "armv7l-linux": "144db3d77d3ab45e4ccefd02d4009c06905879158b5d50ebb3c79edbfcb952cd",
             "headers": "1z70qaping1fxsg9x130zjywcc6pirsnyrk0bg3jiirynpvpp5yq",
-            "x86_64-darwin": "70d84569431b4cb108b8f0e5bec41160100b853e487d550171213b87b043d449",
-            "x86_64-linux": "18d685523669b6704d5af58515b91a39cd97e04e897806048178901241cc96e5"
+            "x86_64-darwin": "a8cdd232352e99a08d2ef767c46e3ea138145431c50dec9f5773220223194f6f",
+            "x86_64-linux": "b5dd9b7de7b5910dc371a45621cf456ebf3e953234c9ccbf2190ba2ca5c3b948"
         },
-        "version": "34.5.2"
+        "version": "34.5.3"
     },
     "35": {
         "hashes": {

From d3a043f379dd51cd981bda2c8f28c83408863121 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Fri, 25 Apr 2025 12:02:32 +0200
Subject: [PATCH 29/45] electron_35-bin: 35.2.0 -> 35.2.1

- Changelog: https://github.com/electron/electron/releases/tag/v35.2.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.2.0...v35.2.1
---
 pkgs/development/tools/electron/binary/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 41cc47e9f926..d5fb257bab02 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,13 +34,13 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "8a8e1cb09ace8eb46164fa6154bc4695f19eba5fe6a8374d1e0b2ba0e177a28c",
-            "aarch64-linux": "c3b5224bbaac7b69890dbf6f69d78ad6dc2622231fa7554e5cf32333623a6d74",
-            "armv7l-linux": "2525cd09e54c4b33f7a9bcb5381716f88a933ee497df5fd465c9f3ceab01b0aa",
+            "aarch64-darwin": "b58cf4bd40582986dfaf4e466788ebc6ea3187c348bf94a67a2c1ea1c1704d1e",
+            "aarch64-linux": "27fca86f64dacc20f4205346bca9a82071580575b254d4d37615a5907221ce0f",
+            "armv7l-linux": "4e31b1d737f560988023cf9e2449bee9177c6b4303eb74de6293c219c00a0d21",
             "headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
-            "x86_64-darwin": "022d90656d9b78f53e56329722c7209ed3711af443ccbbbcd50ada5176e72cf0",
-            "x86_64-linux": "c3bc0fefe238e092ab2a26276d6c4bd5d70b85d08d8bb298c5f7499a4456a119"
+            "x86_64-darwin": "6d2fad32fabf4cf664ffeef6c2f99af8465db5dfb6fc1a752ce5d9363235deff",
+            "x86_64-linux": "d346f416d061f38bc53f3d57e0f01c03d0febb00199e362f7ef2e1209f93817e"
         },
-        "version": "35.2.0"
+        "version": "35.2.1"
     }
 }

From a3e248ad6ba1645e2dcca511506619639f2ef643 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Fri, 25 Apr 2025 12:02:34 +0200
Subject: [PATCH 30/45] electron-chromedriver_35: 35.2.0 -> 35.2.1

- Changelog: https://github.com/electron/electron/releases/tag/v35.2.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v35.2.0...v35.2.1
---
 .../tools/electron/chromedriver/info.json            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 64a21a4a8684..63db686f3eee 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,13 +34,13 @@
     },
     "35": {
         "hashes": {
-            "aarch64-darwin": "88d20f3398a8850ee7b7004e4f301e15705783e8860ca8f0de4ddc652e1cab4b",
-            "aarch64-linux": "4eae05fab28c9f0afff609bb13cfe1c999f02a0cf3539c715823a6bda327e1c6",
-            "armv7l-linux": "3bd32c34321e853d38453f30eb4a0ddabb278d95921e55abf01c22f53f074f4b",
+            "aarch64-darwin": "59d58226ead49715eb0628eef19609291f842e5dc3f452c2d8e61bebcc3f9c3a",
+            "aarch64-linux": "1ed6010947742c8be7c049597f1849be71182a03de27c83b8ff763312b372f1d",
+            "armv7l-linux": "9845085c0259b22b7b31abcf98c918701b580e5c35cc3fc1d969dd2a177efc08",
             "headers": "1la2xfr8lyvq7dc4mxllj3qksrrwxmz3nc2fnr2h0l08bfn2y1ay",
-            "x86_64-darwin": "852430a5121e3f4032845d2e562be78a0de87c616076cedc53505f3906921276",
-            "x86_64-linux": "702fdee68152c1baaf3d8fbbbdd16cceecd0b8989e223918714c56f7bea8f34a"
+            "x86_64-darwin": "0adfea59a90f8c47f4f14a6011ed566944babf5b04ac977fa7ff118a8b3c58bc",
+            "x86_64-linux": "d1f1027d1d01a0ce6cfdf60fffa64d64ebe75d0c54e9a5acff51f1c8005f6ef4"
         },
-        "version": "35.2.0"
+        "version": "35.2.1"
     }
 }

From a30bf0fc8017cc1715a8afa8e5e80010a8ddd663 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 28 Apr 2025 16:23:35 +0200
Subject: [PATCH 31/45] electron-chromedriver_33: 33.4.10 -> 33.4.11

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.11
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.10...v33.4.11
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 63db686f3eee..bbc6d135e685 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,14 +12,14 @@
     },
     "33": {
         "hashes": {
-            "aarch64-darwin": "7673d1e80d42cea706a36af275c1a42061c7baa36e79e738671907f865c70725",
-            "aarch64-linux": "12c30544df2cfc2d678451dc62c8007d482394df08d6824fb91ccabf1a3bc794",
-            "armv7l-linux": "b96563ecb3433e28a2ea50a3d9e4ef0c8c349e8264a118558c5b5927d394330a",
-            "headers": "178h07gjjxdx4kjcwp9ywnwc0qxh5gh70jj07n2xb9cp5whvfn0p",
-            "x86_64-darwin": "77cd5f40655a709a5eecfb9fe2fe4421bcd527a45ae0f02a2b34c71feae25f5c",
-            "x86_64-linux": "d932f18b72949832b13c446faddb2f56a16dfff08286251f14d69315c5f2dc9b"
+            "aarch64-darwin": "8cccbac5a1922f47bff65734ea05cf4a5a96938bc6696c2bdb8d8ce4b9f4a3eb",
+            "aarch64-linux": "edbe9af31a18cef622386ba95cffd4f0d61fff386313297d204c06fad798134e",
+            "armv7l-linux": "da1077bf00682a01b02fa580e51f4df681016be0d58e981094463b818561c213",
+            "headers": "0gwin292x5ryx41kw0c801b4ipin9q1agnigdv31vcd4y0na2p3s",
+            "x86_64-darwin": "9056e5f4e7d7e6b99e22f4739668cf8425d44c21431b7218bda1720ee207593a",
+            "x86_64-linux": "acbebfaa77f32ff1c524f0f326f5f36cf35a3875d8a81f22c3b5c4664e34f7c7"
         },
-        "version": "33.4.10"
+        "version": "33.4.11"
     },
     "34": {
         "hashes": {

From 58072cb5f4d7991df7c609898bd3d951573c87a4 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 28 Apr 2025 16:23:31 +0200
Subject: [PATCH 32/45] electron_33-bin: 33.4.10 -> 33.4.11

- Changelog: https://github.com/electron/electron/releases/tag/v33.4.11
- Diff: https://github.com/electron/electron/compare/refs/tags/v33.4.10...v33.4.11
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index d5fb257bab02..3579686a3efa 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,14 +12,14 @@
     },
     "33": {
         "hashes": {
-            "aarch64-darwin": "3baba8bb35cd193be1fa7b46c4e0e2191cc345f599894d1e117353a7abdf429c",
-            "aarch64-linux": "436bfb19fc298c852327db5636e28cb1607cb8c2c714b3d289097373bf0cf418",
-            "armv7l-linux": "3944193d4984e983cee5f678e43b957ef760f07d5a8fe34d3f0ac94fbe18c650",
-            "headers": "178h07gjjxdx4kjcwp9ywnwc0qxh5gh70jj07n2xb9cp5whvfn0p",
-            "x86_64-darwin": "ec6bafaac0e422ebf6784c544b2623e8bb0c3c751a333df6a7e7a5ae6a2c8823",
-            "x86_64-linux": "4c49cb0a17e6b74efbf2066fd41a3c1d4a27a476f6b7e45f610a9d41afae2838"
+            "aarch64-darwin": "9c763751c280b20ec93cecdc7f369bed876fc6728863a9ba5d7435096401f048",
+            "aarch64-linux": "e865132767e0930f5fef8ee146b9dd83c7f8fb95ed533c4de99e7057d5de5b61",
+            "armv7l-linux": "c7bc11f757cb123ce7647af593d09b60ddc87338b47c7053c2719522ddc6515c",
+            "headers": "0gwin292x5ryx41kw0c801b4ipin9q1agnigdv31vcd4y0na2p3s",
+            "x86_64-darwin": "67f3b851e7583309e7bbe3e3e819b1e1c6033ab57207d838bc4ed4982ccef456",
+            "x86_64-linux": "212d431c7c916292311c797cd91f84467c5abd6e6983cf24b162efff64cee8a9"
         },
-        "version": "33.4.10"
+        "version": "33.4.11"
     },
     "34": {
         "hashes": {

From 0a4b3ab0420ff8561fecce151bd0721b4840445d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Apr 2025 14:54:19 +0000
Subject: [PATCH 33/45] copilot-language-server: 1.304.0 -> 1.311.0

---
 pkgs/by-name/co/copilot-language-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index 7cdc2a195941..c61f3de0d60a 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -45,11 +45,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.304.0";
+  version = "1.311.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-native-${finalAttrs.version}.zip";
-    hash = "sha256-F0urL3bMlNcxHTrePYsagEx2664C7USYAcnhCCzB/rA=";
+    hash = "sha256-wiEaQpdDyJ3K3BgFlpf8LtgRmRXSpdBGSnC5HAelrdc=";
     stripRoot = false;
   };
 

From 04a0ec047a0eb25d2aa14710bc0dfc7f5b19cda0 Mon Sep 17 00:00:00 2001
From: "\"Craig Furman\"" <"craig@craigfurman.dev">
Date: Wed, 30 Apr 2025 16:00:38 +0100
Subject: [PATCH 34/45] vimPlugins.tinted-vim: init at 2025-04-27

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 0c9f08a6bd77..51cedb444466 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -14480,6 +14480,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  tinted-vim = buildVimPlugin {
+    pname = "tinted-vim";
+    version = "2025-04-27";
+    src = fetchFromGitHub {
+      owner = "tinted-theming";
+      repo = "tinted-vim";
+      rev = "e9b507ef9e88f364777d5982912ada3821e84200";
+      sha256 = "1glyhckl36m7a0z1il1r95gfglvyw65ig7vq53kfph6xxvr3hkmk";
+    };
+    meta.homepage = "https://github.com/tinted-theming/tinted-vim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   tiny-devicons-auto-colors-nvim = buildVimPlugin {
     pname = "tiny-devicons-auto-colors.nvim";
     version = "2025-01-03";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 6ce6a62962f5..aac6e5d81bfd 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1111,6 +1111,7 @@ https://github.com/ron89/thesaurus_query.vim/,,
 https://github.com/itchyny/thumbnail.vim/,,
 https://github.com/vim-scripts/timestamp.vim/,,
 https://github.com/levouh/tint.nvim/,HEAD,
+https://github.com/tinted-theming/tinted-vim/,HEAD,
 https://github.com/rachartier/tiny-devicons-auto-colors.nvim/,HEAD,
 https://github.com/rachartier/tiny-inline-diagnostic.nvim/,HEAD,
 https://github.com/tomtom/tinykeymap_vim/,,tinykeymap

From 1b3e9d962903ce14aab822349cc122f47df51046 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 19 Apr 2025 20:13:59 -0700
Subject: [PATCH 35/45] alan: modernize

---
 pkgs/development/compilers/alan/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/alan/default.nix b/pkgs/development/compilers/alan/default.nix
index 3a3fcfef81f2..7e60a031a796 100644
--- a/pkgs/development/compilers/alan/default.nix
+++ b/pkgs/development/compilers/alan/default.nix
@@ -8,15 +8,15 @@
   which,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "alan";
   version = "3.0beta8";
 
   src = fetchFromGitHub {
     owner = "alan-if";
     repo = "alan";
-    rev = "v${version}";
-    sha256 = "0zfg1frmb4yl39hk8h733bmlwk4rkikzfhvv7j34cxpdpsp7spzl";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-9F99rr7tdkaGPHtD92ecmUxO6xrjQDRhGtSTVbMLz30=";
   };
 
   postPatch = ''
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin $out/share/alan/examples
     # Build the release tarball
     make package
@@ -37,6 +39,8 @@ stdenv.mkDerivation rec {
     mv $out/share/alan/{alan,arun} $out/bin
     # a2a3 isn't included in the release tarball
     cp bin/a2a3 $out/bin
+
+    runHook postInstall
   '';
 
   nativeBuildInputs = [
@@ -46,11 +50,11 @@ stdenv.mkDerivation rec {
     which
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.alanif.se/";
     description = "Alan interactive fiction language";
-    license = licenses.artistic2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ neilmayhew ];
+    license = lib.licenses.artistic2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ neilmayhew ];
   };
-}
+})

From 1a3bd1ba740b883999a00c484e225a185e8f160c Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 19 Apr 2025 20:14:37 -0700
Subject: [PATCH 36/45] alan_2: unbreak on gcc 14

---
 pkgs/development/compilers/alan/2.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/alan/2.nix b/pkgs/development/compilers/alan/2.nix
index 5833cc8ea79a..1a566c3c13f7 100644
--- a/pkgs/development/compilers/alan/2.nix
+++ b/pkgs/development/compilers/alan/2.nix
@@ -17,9 +17,15 @@ stdenv.mkDerivation {
 
   makefile = "Makefile.unix";
 
-  # Add a workarounf for -fno-common tollchains like upstream gcc-10.
-  # alan-3 is already fixed, but the backport is nontrivial.
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
+  env.NIX_CFLAGS_COMPILE = toString [
+    # Add a workaround for -fno-common toolchains like upstream gcc-10.
+    # alan-3 is already fixed, but the backport is nontrivial.
+    "-fcommon"
+    # smScSema.c:142:11: error: assignment to 'unsigned char *' from incompatible pointer type 'unsigned char **' [-Wincompatible-pointer-types]
+    "-Wno-error=incompatible-pointer-types"
+    # smScSema.c:183:10: error: implicit declaration of function 'read'; did you mean 'fread'? [-Wimplicit-function-declaration]
+    "-Wno-error=implicit-function-declaration"
+  ];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/alan2

From c65dd72f0010b5d4f04b1389301ef0226981ac2f Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 19 Apr 2025 20:14:44 -0700
Subject: [PATCH 37/45] alan_2: modernize

---
 pkgs/development/compilers/alan/2.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/alan/2.nix b/pkgs/development/compilers/alan/2.nix
index 1a566c3c13f7..fe6530446584 100644
--- a/pkgs/development/compilers/alan/2.nix
+++ b/pkgs/development/compilers/alan/2.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "alan-if";
     repo = "alan";
     rev = "71f23ec79f7f5d66aa5ae9fd3f9b8dae41a89f15";
-    sha256 = "066jknqz1v6sismvfxjfffl35h14v8qwgcq99ibhp08dy2fwraln";
+    hash = "sha256-lqrMnfANgQtXTAmzxzHaJMAyqHNOdrerjtrs8LGd0hg=";
   };
 
   makefile = "Makefile.unix";
@@ -28,17 +28,21 @@ stdenv.mkDerivation {
   ];
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin $out/share/alan2
     cp compiler/alan $out/bin/alan2
     cp interpreter/arun $out/bin/arun2
     cp alan.readme ChangeLog $out/share/alan2
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.alanif.se/";
     description = "Alan interactive fiction language (legacy version)";
-    license = licenses.artistic2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ neilmayhew ];
+    license = lib.licenses.artistic2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ neilmayhew ];
   };
 }

From 9656f3ca923aa1c5123c3a12b303f66c0ad80e14 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 19 Apr 2025 20:16:41 -0700
Subject: [PATCH 38/45] alan: move to by-name

---
 .../compilers/alan/default.nix => by-name/al/alan/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/compilers/alan/default.nix => by-name/al/alan/package.nix} (100%)

diff --git a/pkgs/development/compilers/alan/default.nix b/pkgs/by-name/al/alan/package.nix
similarity index 100%
rename from pkgs/development/compilers/alan/default.nix
rename to pkgs/by-name/al/alan/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 548a6291147d..dd67fee295a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5803,8 +5803,6 @@ with pkgs;
     jdk = jdk8;
   };
 
-  alan = callPackage ../development/compilers/alan { };
-
   alan_2 = callPackage ../development/compilers/alan/2.nix { };
 
   armips = callPackage ../development/compilers/armips {

From f5d30316a7be7796fb3509f4942f69026b1e1cd0 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 19 Apr 2025 20:17:13 -0700
Subject: [PATCH 39/45] alan_2: move to by-name

---
 .../compilers/alan/2.nix => by-name/al/alan_2/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/compilers/alan/2.nix => by-name/al/alan_2/package.nix} (100%)

diff --git a/pkgs/development/compilers/alan/2.nix b/pkgs/by-name/al/alan_2/package.nix
similarity index 100%
rename from pkgs/development/compilers/alan/2.nix
rename to pkgs/by-name/al/alan_2/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd67fee295a4..acab188bb29e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5803,8 +5803,6 @@ with pkgs;
     jdk = jdk8;
   };
 
-  alan_2 = callPackage ../development/compilers/alan/2.nix { };
-
   armips = callPackage ../development/compilers/armips {
     stdenv = gcc10Stdenv;
   };

From 52d385c37a6792aa5a91184dad896225e927df74 Mon Sep 17 00:00:00 2001
From: Craig Furman <craig@craigfurman.dev>
Date: Mon, 28 Apr 2025 19:20:52 +0100
Subject: [PATCH 40/45] bluesnooze: init at 1.2

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

diff --git a/pkgs/by-name/bl/bluesnooze/package.nix b/pkgs/by-name/bl/bluesnooze/package.nix
new file mode 100644
index 000000000000..7fa0017646c4
--- /dev/null
+++ b/pkgs/by-name/bl/bluesnooze/package.nix
@@ -0,0 +1,40 @@
+{
+  fetchurl,
+  lib,
+  stdenv,
+  unzip,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bluesnooze";
+  version = "1.2";
+  src = fetchurl {
+    url = "https://github.com/odlp/bluesnooze/releases/download/v${finalAttrs.version}/Bluesnooze.zip";
+    hash = "sha256-B1qLfPj2bU9AAsYqGYWl0/sEPj3wnn/UBeiM4kqW/rA=";
+  };
+
+  # Needed to avoid the binary becoming corrupted and mac refusing to open it. I
+  # don't know why.
+  dontFixup = true;
+
+  # "unpack" phase does the unzipping automatically
+  nativeBuildInputs = [ unzip ];
+  sourceRoot = "."; # squash "unpacker produced multiple directories" error
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications"
+    cp -r Bluesnooze.app $out/Applications/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Bluesnooze prevents your sleeping Mac from connecting to Bluetooth accessories";
+    homepage = "https://github.com/odlp/bluesnooze";
+    changelog = "https://github.com/odlp/bluesnooze/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ craigf ];
+    platforms = lib.platforms.darwin;
+  };
+})

From 921ee2aca2dbdf417a21ab8156e6a8210655303a Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Wed, 30 Apr 2025 16:56:46 +0100
Subject: [PATCH 41/45] google-chrome: 135.0.7049.114 -> 136.0.7103.59

---
 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 4fcb674e635d..b27741a77de1 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 = "135.0.7049.114";
+    version = "136.0.7103.59";
 
     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-1YdXtlEY6icyPMngvfthLdhSaMGbpI0lifFkZSZc2a4=";
+      hash = "sha256-dki7Ci91OpqMtgS84ynsxBWoB862t+eWFlxHvZUAUjc=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -274,11 +274,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "135.0.7049.115";
+    version = "136.0.7103.49";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/ba5pqpswpjr5iyzekrawihvjey_135.0.7049.115/GoogleChrome-135.0.7049.115.dmg";
-      hash = "sha256-0J1qJ8i141RsmDGGcMM4UvVlT9tBtyn3cOFTz1XIxSk=";
+      url = "http://dl.google.com/release2/chrome/dz4uae22obgiqcnhey5k6wspvu_136.0.7103.49/GoogleChrome-136.0.7103.49.dmg";
+      hash = "sha256-4eGfwVdts+tW4ouUKZg1EvnSYOu6CCBRMYie2hz2y00=";
     };
 
     dontPatch = true;

From 8bbd1a2ba8a07f1e500b639e032f87694d5a24d3 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 28 Apr 2025 12:01:32 -0700
Subject: [PATCH 42/45] python3Packages.langchain-community: 0.3.20 -> 0.3.22

Diff: https://github.com/langchain-ai/langchain/compare/langchain-community%3D%3D0.3.20...langchain-community%3D%3D0.3.22
---
 .../langchain-community/default.nix           | 25 +++++--------
 .../langchain-community/rm-blockbuster.patch  | 37 -------------------
 2 files changed, 9 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/development/python-modules/langchain-community/rm-blockbuster.patch

diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix
index 56eba2b3cb10..8de6a934e53c 100644
--- a/pkgs/development/python-modules/langchain-community/default.nix
+++ b/pkgs/development/python-modules/langchain-community/default.nix
@@ -22,6 +22,7 @@
   tenacity,
 
   # tests
+  blockbuster,
   httpx,
   langchain-tests,
   lark,
@@ -37,25 +38,20 @@
 
 buildPythonPackage rec {
   pname = "langchain-community";
-  version = "0.3.20";
+  version = "0.3.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-community==${version}";
-    hash = "sha256-6YLy7G1kZIqHAGMUIQoGCfDO2ZuVgNEtpkOI1o8eFvc=";
+    hash = "sha256-fotu3vUCWnAVyjFjsIUjk1If81yQ3/YLj26PksmnvGE=";
   };
 
   sourceRoot = "${src.name}/libs/community";
 
   build-system = [ pdm-backend ];
 
-  patches = [
-    # Remove dependency on blockbuster (not available in nixpkgs due to dependency on forbiddenfruit)
-    ./rm-blockbuster.patch
-  ];
-
   pythonRelaxDeps = [
     # Each component release requests the exact latest langchain and -core.
     # That prevents us from updating individul components.
@@ -66,10 +62,6 @@ buildPythonPackage rec {
     "tenacity"
   ];
 
-  pythonRemoveDeps = [
-    "blockbuster"
-  ];
-
   dependencies = [
     aiohttp
     dataclasses-json
@@ -87,6 +79,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "langchain_community" ];
 
   nativeCheckInputs = [
+    blockbuster
     httpx
     langchain-tests
     lark
@@ -108,8 +101,6 @@ buildPythonPackage rec {
     # Test require network access
     "test_ovhcloud_embed_documents"
     "test_yandex"
-    # duckdb-engine needs python-wasmer which is not yet available in Python 3.12
-    # See https://github.com/NixOS/nixpkgs/pull/326337 and https://github.com/wasmerio/wasmer-python/issues/778
     "test_table_info"
     "test_sql_database_run"
     # pydantic.errors.PydanticUserError: `SQLDatabaseToolkit` is not fully defined; you should define `BaseCache`, then call `SQLDatabaseToolkit.model_rebuild()`.
@@ -118,19 +109,21 @@ buildPythonPackage rec {
     "test_proper_inputs"
     # pydantic.errors.PydanticUserError: `NatBotChain` is not fully defined; you should define `BaseCache`, then call `NatBotChain.model_rebuild()`.
     "test_variable_key_naming"
-    # Fails due to the lack of blockbuster
-    "test_group_dependencies"
+    # Tests against magic values in dict
+    "test_serializable_mapping"
   ];
 
   disabledTestPaths = [
     # ValueError: Received unsupported arguments {'strict': None}
     "tests/unit_tests/chat_models/test_cloudflare_workersai.py"
+    # depends on Pydantic v1 notations, will not load
+    "tests/unit_tests/document_loaders/test_gitbook.py"
   ];
 
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex"
-      "^langchain-community==(.*)"
+      "langchain-community==([0-9.]+)"
     ];
   };
 
diff --git a/pkgs/development/python-modules/langchain-community/rm-blockbuster.patch b/pkgs/development/python-modules/langchain-community/rm-blockbuster.patch
deleted file mode 100644
index a8d4011210aa..000000000000
--- a/pkgs/development/python-modules/langchain-community/rm-blockbuster.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
-index 63f3a83e0..61c2d6ce3 100644
---- a/tests/unit_tests/conftest.py
-+++ b/tests/unit_tests/conftest.py
-@@ -5,22 +5,22 @@ from importlib import util
- from typing import Dict, Sequence
- 
- import pytest
--from blockbuster import blockbuster_ctx
-+# from blockbuster import blockbuster_ctx
- from pytest import Config, Function, Parser
- 
- 
--@pytest.fixture(autouse=True)
--def blockbuster() -> Iterator[None]:
--    with blockbuster_ctx("langchain_community") as bb:
--        (
--            bb.functions["os.stat"]
--            .can_block_in("langchain_community/utils/openai.py", "is_openai_v1")
--            .can_block_in("httpx/_client.py", "_init_transport")
--        )
--        bb.functions["os.path.abspath"].can_block_in(
--            "sqlalchemy/dialects/sqlite/pysqlite.py", "create_connect_args"
--        )
--        yield
-+# @pytest.fixture(autouse=True)
-+# def blockbuster() -> Iterator[None]:
-+#     with blockbuster_ctx("langchain_community") as bb:
-+#         (
-+#             bb.functions["os.stat"]
-+#             .can_block_in("langchain_community/utils/openai.py", "is_openai_v1")
-+#             .can_block_in("httpx/_client.py", "_init_transport")
-+#         )
-+#         bb.functions["os.path.abspath"].can_block_in(
-+#             "sqlalchemy/dialects/sqlite/pysqlite.py", "create_connect_args"
-+#         )
-+#         yield

From ee2126ca56592aaa4b3249c8956abd8a9fd38799 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 28 Apr 2025 12:31:05 -0700
Subject: [PATCH 43/45] python3Packages.langchain: 0.3.21 -> 0.3.24

Diff: https://github.com/langchain-ai/langchain/compare/langchain%3D%3D0.3.21...langchain%3D%3D0.3.24
---
 .../python-modules/langchain/default.nix      | 15 ++--
 .../langchain/rm-blockbuster.patch            | 68 -------------------
 2 files changed, 4 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/development/python-modules/langchain/rm-blockbuster.patch

diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index 92a4c7d67001..cb67f1450edd 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -25,6 +25,7 @@
   tenacity,
 
   # tests
+  blockbuster,
   freezegun,
   httpx,
   lark,
@@ -41,7 +42,7 @@
 
 buildPythonPackage rec {
   pname = "langchain";
-  version = "0.3.21";
+  version = "0.3.24";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -53,11 +54,6 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/libs/langchain";
 
-  patches = [
-    # blockbuster isn't supported in nixpkgs
-    ./rm-blockbuster.patch
-  ];
-
   build-system = [ pdm-backend ];
 
   buildInputs = [ bash ];
@@ -70,10 +66,6 @@ buildPythonPackage rec {
     "tenacity"
   ];
 
-  pythonRemoveDeps = [
-    "blockbuster"
-  ];
-
   dependencies = [
     aiohttp
     langchain-core
@@ -92,6 +84,7 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
+    blockbuster
     freezegun
     httpx
     lark
@@ -151,7 +144,7 @@ buildPythonPackage rec {
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex"
-      "^langchain==([0-9.]+)$"
+      "langchain==([0-9.]+)"
     ];
   };
 
diff --git a/pkgs/development/python-modules/langchain/rm-blockbuster.patch b/pkgs/development/python-modules/langchain/rm-blockbuster.patch
deleted file mode 100644
index 4022f17a9323..000000000000
--- a/pkgs/development/python-modules/langchain/rm-blockbuster.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
-index fed8dbec5..6144ad7b8 100644
---- a/tests/unit_tests/conftest.py
-+++ b/tests/unit_tests/conftest.py
-@@ -5,36 +5,36 @@ from importlib import util
- from typing import Dict, Sequence
- 
- import pytest
--from blockbuster import blockbuster_ctx
-+# from blockbuster import blockbuster_ctx
- from pytest import Config, Function, Parser
- 
- 
--@pytest.fixture(autouse=True)
--def blockbuster() -> Iterator[None]:
--    with blockbuster_ctx("langchain") as bb:
--        bb.functions["io.TextIOWrapper.read"].can_block_in(
--            "langchain/__init__.py", "<module>"
--        )
--
--        for func in ["os.stat", "os.path.abspath"]:
--            (
--                bb.functions[func]
--                .can_block_in("langchain_core/runnables/base.py", "__repr__")
--                .can_block_in(
--                    "langchain_core/beta/runnables/context.py", "aconfig_with_context"
--                )
--            )
--
--        for func in ["os.stat", "io.TextIOWrapper.read"]:
--            bb.functions[func].can_block_in(
--                "langsmith/client.py", "_default_retry_config"
--            )
--
--        for bb_function in bb.functions.values():
--            bb_function.can_block_in(
--                "freezegun/api.py", "_get_cached_module_attributes"
--            )
--        yield
-+# @pytest.fixture(autouse=True)
-+# def blockbuster() -> Iterator[None]:
-+#     with blockbuster_ctx("langchain") as bb:
-+#         bb.functions["io.TextIOWrapper.read"].can_block_in(
-+#             "langchain/__init__.py", "<module>"
-+#         )
-+
-+#         for func in ["os.stat", "os.path.abspath"]:
-+#             (
-+#                 bb.functions[func]
-+#                 .can_block_in("langchain_core/runnables/base.py", "__repr__")
-+#                 .can_block_in(
-+#                     "langchain_core/beta/runnables/context.py", "aconfig_with_context"
-+#                 )
-+#             )
-+
-+#         for func in ["os.stat", "io.TextIOWrapper.read"]:
-+#             bb.functions[func].can_block_in(
-+#                 "langsmith/client.py", "_default_retry_config"
-+#             )
-+
-+#         for bb_function in bb.functions.values():
-+#             bb_function.can_block_in(
-+#                 "freezegun/api.py", "_get_cached_module_attributes"
-+#             )
-+#         yield
- 
- 
- def pytest_addoption(parser: Parser) -> None:

From 048ae19dfee189a59459555824e6b0feabe6fc8a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 28 Apr 2025 17:05:08 -0700
Subject: [PATCH 44/45] python3Packages.fireworks-ai: init at 0.15.12

---
 .../python-modules/fireworks-ai/default.nix   | 79 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 81 insertions(+)
 create mode 100644 pkgs/development/python-modules/fireworks-ai/default.nix

diff --git a/pkgs/development/python-modules/fireworks-ai/default.nix b/pkgs/development/python-modules/fireworks-ai/default.nix
new file mode 100644
index 000000000000..cea3bd3ef9b9
--- /dev/null
+++ b/pkgs/development/python-modules/fireworks-ai/default.nix
@@ -0,0 +1,79 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+  versioneer,
+
+  # dependencies
+  httpx,
+  httpx-ws,
+  httpx-sse,
+  pydantic,
+  pillow,
+
+  # optional dependencies
+  fastapi,
+  gitignore-parser,
+  openapi-spec-validator,
+  prance,
+  safetensors,
+  tabulate,
+  torch,
+  tqdm,
+}:
+
+buildPythonPackage rec {
+  pname = "fireworks-ai";
+  version = "0.15.12";
+  pyproject = true;
+
+  # no source available
+  src = fetchPypi {
+    pname = "fireworks_ai";
+    inherit version;
+    hash = "sha256-I4ClPZIkTGCP05j42XuXOA2Jnz/3EAkfS1CRe3URnsI=";
+  };
+
+  build-system = [
+    setuptools
+    versioneer
+  ];
+
+  dependencies = [
+    httpx
+    httpx-ws
+    httpx-sse
+    pydantic
+    pillow
+  ];
+
+  optional-dependencies = {
+    flumina = [
+      fastapi
+      gitignore-parser
+      openapi-spec-validator
+      prance
+      safetensors
+      tabulate
+      torch
+      tqdm
+    ];
+  };
+
+  # no tests available
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "fireworks"
+  ];
+
+  meta = {
+    description = "Client library for the Fireworks.ai platform";
+    homepage = "https://pypi.org/project/fireworks-ai/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sarahec ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f055b73bc97..bc58713588ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4930,6 +4930,8 @@ self: super: with self; {
 
   firetv = callPackage ../development/python-modules/firetv { };
 
+  fireworks-ai = callPackage ../development/python-modules/fireworks-ai { };
+
   first = callPackage ../development/python-modules/first { };
 
   fissix = callPackage ../development/python-modules/fissix { };

From b33937b00f85e88d081efbd914c49ab121b5240a Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 30 Apr 2025 18:44:20 +0100
Subject: [PATCH 45/45] python3Packages.whisperx: init at 3.3.2

---
 pkgs/by-name/wh/whisperx/package.nix          |  1 +
 .../python-modules/whisperx/default.nix       | 87 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  5 ++
 3 files changed, 93 insertions(+)
 create mode 100644 pkgs/by-name/wh/whisperx/package.nix
 create mode 100644 pkgs/development/python-modules/whisperx/default.nix

diff --git a/pkgs/by-name/wh/whisperx/package.nix b/pkgs/by-name/wh/whisperx/package.nix
new file mode 100644
index 000000000000..c5b60fb97af6
--- /dev/null
+++ b/pkgs/by-name/wh/whisperx/package.nix
@@ -0,0 +1 @@
+{ python3Packages }: with python3Packages; toPythonApplication whisperx
diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix
new file mode 100644
index 000000000000..c97e62afe913
--- /dev/null
+++ b/pkgs/development/python-modules/whisperx/default.nix
@@ -0,0 +1,87 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  ctranslate2,
+  faster-whisper,
+  nltk,
+  pandas,
+  pyannote-audio,
+  torch,
+  torchaudio,
+  transformers,
+
+  # native packages
+  ffmpeg,
+  ctranslate2-cpp, # alias for `pkgs.ctranslate2`, required due to colliding with the `ctranslate2` Python module.
+
+  # enable GPU support
+  cudaSupport ? torch.cudaSupport,
+}:
+
+let
+  ctranslate = ctranslate2.override {
+    ctranslate2-cpp = ctranslate2-cpp.override {
+      withCUDA = cudaSupport;
+      withCuDNN = cudaSupport;
+    };
+  };
+in
+buildPythonPackage rec {
+  pname = "whisperx";
+  version = "3.3.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "m-bain";
+    repo = "whisperX";
+    tag = "v${version}";
+    hash = "sha256-JJa8gUQjIcgJ5lug3ULGkHxkl66qnXkiUA3SwwUVpqk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    ctranslate
+    faster-whisper
+    nltk
+    pandas
+    pyannote-audio # Missing from pyproject.toml, but used in `whisperx/vad.py`
+    torch
+    torchaudio
+    transformers
+  ];
+
+  # As `makeWrapperArgs` does not apply to the module, and whisperx depends on `ffmpeg`,
+  # we replace the `"ffmpeg"` string in `subprocess.run` with the full path to the binary.
+  # This works for both the program and the module.
+  # Every update, the codebase should be checked for further instances of `ffmpeg` calls.
+  postPatch = ''
+    substituteInPlace whisperx/audio.py --replace-fail \
+      '"ffmpeg"' '"${lib.getExe ffmpeg}"'
+  '';
+
+  # > Checking runtime dependencies for whisperx-3.3.2-py3-none-any.whl
+  # >   - faster-whisper==1.1.0 not satisfied by version 1.1.1
+  # This has been updated on main, so we expect this clause to be removed upon the next update.
+  pythonRelaxDeps = [ "faster-whisper" ];
+
+  pythonImportsCheck = [ "whisperx" ];
+
+  # No tests in repository
+  doCheck = false;
+
+  meta = {
+    mainProgram = "whisperx";
+    description = "Automatic Speech Recognition with Word-level Timestamps (& Diarization)";
+    homepage = "https://github.com/m-bain/whisperX";
+    changelog = "https://github.com/m-bain/whisperX/releases/tag/${src.tag}";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.bengsparks ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6d1b37581114..b609c222e5a8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18756,6 +18756,11 @@ self: super: with self; {
 
   whispers = callPackage ../development/python-modules/whispers { };
 
+  whisperx = callPackage ../development/python-modules/whisperx {
+    inherit (pkgs) ffmpeg;
+    ctranslate2-cpp = pkgs.ctranslate2;
+  };
+
   whitenoise = callPackage ../development/python-modules/whitenoise { };
 
   whodap = callPackage ../development/python-modules/whodap { };