diff --git a/custom/overlays/override.nix b/custom/overlays/override.nix index eaa3ee8..3ee392d 100644 --- a/custom/overlays/override.nix +++ b/custom/overlays/override.nix @@ -11,13 +11,13 @@ final: prev: { pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ (pyFinal: pyPrev: { haystack-ai = pyPrev.haystack-ai.overridePythonAttrs (old: rec { - version = "2.23.0"; + version = "2.24.1"; src = final.fetchFromGitHub { owner = "deepset-ai"; repo = "haystack"; rev = "v${version}"; - hash = "sha256-KFgRKdhbHgjtpiuAeFq+0t0EUKKLOavbVplb0QnI/r8="; + hash = "sha256-tlQ3Bp+HcIsmoUoOMkm2APUSgNcdsujMUnSx+un/r8c="; }; propagatedBuildInputs = diff --git a/custom/pkgs/by-category/python3Packages/ha/haystack-experimental/default.nix b/custom/pkgs/by-category/python3Packages/ha/haystack-experimental/default.nix index 517bffc..444c632 100644 --- a/custom/pkgs/by-category/python3Packages/ha/haystack-experimental/default.nix +++ b/custom/pkgs/by-category/python3Packages/ha/haystack-experimental/default.nix @@ -2,7 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, - # hatchling, + hatchling, + hatch-vcs, + # haystack-ai, # boilerpy3, # events, # httpx, @@ -15,7 +17,7 @@ # platformdirs, # posthog, # prompthub-py, - pydantic, + # pydantic, # quantulum3, # rank-bm25, # requests, @@ -98,7 +100,7 @@ buildPythonPackage rec { owner = "deepset-ai"; repo = "haystack-experimental"; tag = "v${version}"; - hash = ""; + hash = "sha256-G3rmlIApgG3CEpIG/9/wgTIMIrD35hZZMJCKdlwKpxA="; }; # nativeBuildInputs = [ @@ -110,7 +112,12 @@ buildPythonPackage rec { # "faiss-cpu" # ]; + dontCheckRuntimeDeps = true; + propagatedBuildInputs = [ + hatchling + hatch-vcs + # haystack-ai # boilerpy3 # events # httpx @@ -267,6 +274,6 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; # https://github.com/deepset-ai/haystack/issues/5304 - broken = lib.versionAtLeast pydantic.version "2"; + # broken = false; }; } diff --git a/flake.nix b/flake.nix index 6a045b8..727bb4f 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,7 @@ nixpkgs.overlays = [ intel-hw.overlays.default (import ./custom/overlays/default.nix) - (import custom/overlays/override.nix) + (import ./custom/overlays/override.nix) # (final: prev: { # llama-cpp = prev.llama-cpp.overrideAttrs (old: { # src = prev.fetchFromGitHub { diff --git a/home.nix b/home.nix index a8adc55..5d21665 100644 --- a/home.nix +++ b/home.nix @@ -76,7 +76,7 @@ # kdePackages.kdenlive python312 - # python314Packages.haystack-ai # TODO + python313Packages.haystack-ai # TODO # anything-llm ### NEVER USE THIS GARBAGE